Merge remote-tracking branch 'origin/main' into stable

niledatabase · Apr 5, 2024 · a68e8d5 · a68e8d5
2 parents f3fcc24 + 4402b71
commit a68e8d5
Show file tree

Hide file tree

Showing 28 changed files with 165 additions and 156 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.1-alpha.0](https://github.com/niledatabase/nile-js/compare/v2.2.0...v2.2.1-alpha.0) (2024-04-05)
+
+### Bug Fixes
+
+- **react:** relagate theming to storybook alone ([5318b19](https://github.com/niledatabase/nile-js/commit/5318b197e3b766afc05801a4334469afd69d227f))
+- **server:** export for cjs, better logging for config ([11fc06e](https://github.com/niledatabase/nile-js/commit/11fc06ec1f33e5a12bf2e8d4db0f9115dc8ca2da))
+
 # [2.2.0](https://github.com/niledatabase/nile-js/compare/v2.2.0-alpha.3...v2.2.0) (2024-04-04)
 
 **Note:** Version bump only for package @niledatabase/packages

diff --git a/lerna.json b/lerna.json
@@ -5,7 +5,7 @@
     "packages/browser",
     "packages/server"
   ],
-  "version": "2.2.0",
+  "version": "2.2.1-alpha.0",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {

diff --git a/packages/browser/CHANGELOG.md b/packages/browser/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.1-alpha.0](https://github.com/niledatabsae/nile-js/compare/v2.2.0...v2.2.1-alpha.0) (2024-04-05)
+
+**Note:** Version bump only for package @niledatabase/browser
+
 # [2.2.0](https://github.com/niledatabsae/nile-js/compare/v2.2.0-alpha.3...v2.2.0) (2024-04-04)
 
 **Note:** Version bump only for package @niledatabase/browser

diff --git a/packages/browser/package.json b/packages/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@niledatabase/browser",
-  "version": "2.2.0",
+  "version": "2.2.1-alpha.0",
   "license": "MIT",
   "main": "./dist/index.js",
   "module": "./dist/browser.esm.js",

diff --git a/packages/edge/CHANGELOG.md b/packages/edge/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.1-alpha.0](https://github.com/niledatabase/nile-js/compare/v2.2.0...v2.2.1-alpha.0) (2024-04-05)
+
+**Note:** Version bump only for package @niledatabase/edge
+
 # [2.2.0](https://github.com/niledatabase/nile-js/compare/v2.2.0-alpha.3...v2.2.0) (2024-04-04)
 
 **Note:** Version bump only for package @niledatabase/edge

diff --git a/packages/edge/package.json b/packages/edge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@niledatabase/edge",
-  "version": "2.2.0",
+  "version": "2.2.1-alpha.0",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/edge.esm.js",

diff --git a/packages/react/src/context/config.ts → packages/react/.storybook/themeConfig.ts b/packages/react/src/context/config.ts → packages/react/.storybook/themeConfig.ts
@@ -128,4 +128,12 @@ mergedTheme.unstable_sxConfig = {
   ...muiSxConfig,
   ...joySxConfig,
 };
-export default mergedTheme;
+
+export default {
+  theme: mergedTheme,
+  slotProps: {
+    provider: {
+      defaultMode: 'dark',
+    },
+  },
+};
diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.1-alpha.0](https://github.com/niledatabase/nile-js/compare/v2.2.0...v2.2.1-alpha.0) (2024-04-05)
+
+### Bug Fixes
+
+- **react:** relagate theming to storybook alone ([5318b19](https://github.com/niledatabase/nile-js/commit/5318b197e3b766afc05801a4334469afd69d227f))
+
 # [2.2.0](https://github.com/niledatabase/nile-js/compare/v2.2.0-alpha.3...v2.2.0) (2024-04-04)
 
 **Note:** Version bump only for package @niledatabase/react

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@niledatabase/react",
-  "version": "2.2.0",
+  "version": "2.2.1-alpha.0",
   "license": "MIT",
   "main": "./dist/index.js",
   "module": "./dist/react.esm.js",
@@ -65,6 +65,7 @@
     "@storybook/blocks": "^8.0.0",
     "@storybook/react": "^8.0.0",
     "@storybook/react-webpack5": "^8.0.0",
+    "@storybook/test": "^8.0.0",
     "@storybook/theming": "^8.0.4",
     "@svgr/rollup": "^8.1.0",
     "@svgr/webpack": "^8.1.0",
@@ -76,6 +77,7 @@
     "@typescript-eslint/parser": "^6.12.0",
     "babel-jest": "29.7.0",
     "babel-loader": "^9.1.3",
+    "dts-cli": "^2.0.3",
     "eslint": "^8.54.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-config-react-app": "^7.0.1",
@@ -98,16 +100,11 @@
     "@mui/icons-material": "^5.14.18",
     "@mui/joy": "5.0.0-beta.15",
     "@mui/material": "5.14.18",
-    "@mui/utils": "^5.15.14",
     "@mui/x-data-grid": "^7.0.0",
-    "@mui/x-date-pickers": "^7.0.0",
-    "@niledatabase/browser": "^2.2.0",
-    "@storybook/test": "^8.0.0",
+    "@niledatabase/browser": "^2.2.1-alpha.0",
     "@tanstack/react-query": "^4.36.1",
-    "dts-cli": "^2.0.3",
     "lodash": "^4.17.21",
     "react": "^18.2.0",
-    "react-chartjs-2": "^5.2.0",
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.48.2",
     "react-is": "^18.2.0"

diff --git a/packages/react/src/GoogleLoginButton/GoogleLoginButton.stories.tsx b/packages/react/src/GoogleLoginButton/GoogleLoginButton.stories.tsx
@@ -4,6 +4,7 @@ import Stack from '@mui/joy/Stack';
 import Input from '@mui/joy/Input';
 
 import { NileProvider } from '../context';
+import theme from '../../.storybook/themeConfig';
 
 import GoogleLoginButton from './GoogleLoginButton';
 
@@ -17,7 +18,7 @@ export default meta;
 
 export function Basic() {
   return (
-    <NileProvider>
+    <NileProvider {...theme}>
       <div style={{ maxWidth: '20rem', margin: '0 auto' }}>
         <GoogleLoginButton />
       </div>
@@ -28,7 +29,7 @@ export function Basic() {
 export function BasicWithTenantNameProvider() {
   const [newTenant, setNewTenant] = React.useState<string | undefined>();
   return (
-    <NileProvider>
+    <NileProvider {...theme}>
       <div style={{ maxWidth: '20rem', margin: '0 auto' }}>
         <Stack gap={2}>
           <Stack>
@@ -57,7 +58,7 @@ export function AlphaVersionWithOutProvider() {
 
 export function AlphaVersionWithProvider() {
   return (
-    <NileProvider>
+    <NileProvider {...theme}>
       <div style={{ maxWidth: '20rem', margin: '0 auto' }}>
         <GoogleLoginButton />
       </div>

diff --git a/packages/react/src/LoginForm/UserLoginForm.stories.tsx b/packages/react/src/LoginForm/UserLoginForm.stories.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { Meta } from '@storybook/react';
 import Stack from '@mui/joy/Stack';
 
+import theme from '../../.storybook/themeConfig';
 import LoginForm from '../../src/LoginForm';
 import { NileProvider } from '../../src/context';
 
@@ -14,8 +15,12 @@ export default meta;
 
 export function Basic() {
   return (
-    <NileProvider>
-      <Stack sx={{ maxWidth: '20rem', margin: '0 auto' }} spacing={2}>
+    <NileProvider {...theme}>
+      <Stack
+        sx={{ maxWidth: '20rem', margin: '0 auto' }}
+        spacing={2}
+        data-joy-color-scheme="dark"
+      >
         <LoginForm onSuccess={() => alert('success!')} />
       </Stack>
     </NileProvider>

diff --git a/packages/react/src/SSO/SSO.stories.tsx b/packages/react/src/SSO/SSO.stories.tsx
@@ -1,7 +1,9 @@
 import React from 'react';
+import Typography from '@mui/joy/Typography';
 import { Meta } from '@storybook/react';
 
 import { NileProvider } from '../context';
+import theme from '../../.storybook/themeConfig';
 
 import BaseSSOForm, { Okta } from '.';
 
@@ -14,9 +16,16 @@ export default meta;
 
 export function BasicSSO() {
   return (
-    <NileProvider>
-      <div style={{ maxWidth: '20rem', margin: '0 auto' }}>
+    <NileProvider {...theme}>
+      <div
+        style={{ maxWidth: '20rem', margin: '0 auto' }}
+        data-joy-color-scheme="dark"
+      >
+        <Typography>Some kind of cool explaination</Typography>
         <BaseSSOForm
+          configurationGuide={
+            <Typography>Some kind of cool explaination</Typography>
+          }
           providerName="placeholder"
           onSuccess={() => alert('success!')}
         />
@@ -26,8 +35,11 @@ export function BasicSSO() {
 }
 export function OktaSSO() {
   return (
-    <NileProvider>
-      <div style={{ maxWidth: '20rem', margin: '0 auto' }}>
+    <NileProvider {...theme}>
+      <div
+        style={{ maxWidth: '20rem', margin: '0 auto' }}
+        data-joy-color-scheme="dark"
+      >
         <Okta
           onSuccess={() => {
             alert('success!');

diff --git a/packages/react/src/SignUpForm/NewUserSignUp.stories.tsx b/packages/react/src/SignUpForm/NewUserSignUp.stories.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { Meta } from '@storybook/react';
 
 import { NileProvider } from '../context';
+import theme from '../../.storybook/themeConfig';
 
 import SignUpForm from '.';
 
@@ -14,8 +15,11 @@ export default meta;
 
 export function Basic() {
   return (
-    <NileProvider>
-      <div style={{ maxWidth: '20rem', margin: '0 auto' }}>
+    <NileProvider {...theme}>
+      <div
+        style={{ maxWidth: '20rem', margin: '0 auto' }}
+        data-joy-color-scheme="dark"
+      >
         <SignUpForm onSuccess={() => alert('success!')} />
       </div>
     </NileProvider>

diff --git a/packages/react/src/UserTenantList/UserList.stories.tsx b/packages/react/src/UserTenantList/UserList.stories.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { Meta } from '@storybook/react';
 
 import { NileProvider } from '../context';
+import theme from '../../.storybook/themeConfig';
 
 import UserList from '.';
 
@@ -22,7 +23,7 @@ const users = [
 ];
 export function Basic() {
   return (
-    <NileProvider tenantId="tenantId">
+    <NileProvider {...theme} tenantId="tenantId" data-joy-color-scheme="dark">
       <UserList data={users} />
     </NileProvider>
   );

diff --git a/packages/react/src/context/index.tsx b/packages/react/src/context/index.tsx
@@ -34,6 +34,7 @@ export const NileProvider = (props: NileProviderProps) => {
   const {
     children,
     theme,
+    slotProps,
     tenantId,
     QueryProvider = BaseQueryProvider,
     basePath = 'https://api.thenile.dev',
@@ -55,7 +56,7 @@ export const NileProvider = (props: NileProviderProps) => {
 
   return (
     <QueryProvider>
-      <ThemeProvider theme={theme}>
+      <ThemeProvider slotProps={slotProps?.provider} theme={theme}>
         <Provider value={values}>{children}</Provider>
       </ThemeProvider>
     </QueryProvider>

diff --git a/packages/react/src/context/theme.tsx b/packages/react/src/context/theme.tsx
@@ -4,17 +4,17 @@ import CssBaseline from '@mui/material/CssBaseline';
 import { Theme } from '@mui/joy/styles';
 import { CssVarsProvider as JoyCssVarsProvider } from '@mui/joy/styles';
 
-import defaultTheme from './config';
-
 export default function Themer({
   theme,
   children,
+  slotProps,
 }: {
   theme?: Theme;
   children: JSX.Element;
+  slotProps?: Record<string, string>;
 }) {
   return (
-    <JoyCssVarsProvider theme={theme ?? defaultTheme} defaultMode="dark">
+    <JoyCssVarsProvider {...slotProps} theme={theme}>
       <CssBaseline enableColorScheme />
       {children}
     </JoyCssVarsProvider>

diff --git a/packages/react/src/context/types.ts b/packages/react/src/context/types.ts
@@ -14,6 +14,9 @@ export type NileContext = NileReactConfig & {
 export type NileProviderProps = NileReactConfig & {
   children: JSX.Element | JSX.Element[];
   theme?: Theme;
+  slotProps?: {
+    provider?: Record<string, string>;
+  };
   QueryProvider?: (props: { children: JSX.Element }) => JSX.Element;
   api?: Browser;
 };
diff --git a/packages/react/src/lib/SimpleForm/index.tsx b/packages/react/src/lib/SimpleForm/index.tsx
@@ -164,9 +164,6 @@ export default function SimpleForm(props: {
                           endDecorator={
                             field.value ? options[0].label : options[1].label
                           }
-                          sx={{
-                            '--Switch-thumbSize': '28px',
-                          }}
                         />
                       );
                     }}

diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig",
   // see https://www.typescriptlang.org/tsconfig to better understand tsconfigs
-  "include": ["src/**/*", "test", "src/**/*.stories.tsx"],
+  "include": ["src/**/*", "test", "src/**/*.stories.tsx", ".storybook/config.ts"],
   "compilerOptions": {
     "jsx": "react",
     "lib": ["dom", "esnext"],

diff --git a/packages/server/CHANGELOG.md b/packages/server/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.1-alpha.0](https://github.com/niledatabase/nile-js/compare/v2.2.0...v2.2.1-alpha.0) (2024-04-05)
+
+### Bug Fixes
+
+- **server:** export for cjs, better logging for config ([11fc06e](https://github.com/niledatabase/nile-js/commit/11fc06ec1f33e5a12bf2e8d4db0f9115dc8ca2da))
+
 # [2.2.0](https://github.com/niledatabase/nile-js/compare/v2.2.0-alpha.3...v2.2.0) (2024-04-04)
 
 **Note:** Version bump only for package @niledatabase/server

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@niledatabase/server",
-  "version": "2.2.0",
+  "version": "2.2.1-alpha.0",
   "license": "MIT",
   "main": "./dist/index.js",
   "module": "./dist/server.esm.js",

diff --git a/packages/server/src/db/NileInstance.ts b/packages/server/src/db/NileInstance.ts
@@ -6,6 +6,8 @@ import { evictPool } from '../utils/Event';
 import { AfterCreate } from '../types';
 import Logger from '../utils/Logger';
 
+import { createProxyForPool } from './PoolProxy';
+
 class NileDatabase {
   pool: Pool;
   tenantId?: undefined | null | string;
@@ -29,7 +31,7 @@ class NileDatabase {
     this.config = config;
     info(this.config);
 
-    this.pool = new Pool(remaining);
+    this.pool = createProxyForPool(new Pool(remaining), this.config);
 
     if (typeof afterCreate === 'function') {
       warn(