@lowdefy/server 4.0.0-alpha.33 → 4.0.0-alpha.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/server",
-  "version": "4.0.0-alpha.33",
+  "version": "4.0.0-alpha.35",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -43,17 +43,17 @@
     "next": "next"
   },
   "dependencies": {
-    "@lowdefy/actions-core": "4.0.0-alpha.33",
-    "@lowdefy/api": "4.0.0-alpha.33",
-    "@lowdefy/blocks-antd": "4.0.0-alpha.33",
-    "@lowdefy/blocks-basic": "4.0.0-alpha.33",
-    "@lowdefy/blocks-loaders": "4.0.0-alpha.33",
-    "@lowdefy/client": "4.0.0-alpha.33",
-    "@lowdefy/helpers": "4.0.0-alpha.33",
-    "@lowdefy/layout": "4.0.0-alpha.33",
-    "@lowdefy/node-utils": "4.0.0-alpha.33",
-    "@lowdefy/operators-js": "4.0.0-alpha.33",
-    "@lowdefy/plugin-next-auth": "4.0.0-alpha.33",
+    "@lowdefy/actions-core": "4.0.0-alpha.35",
+    "@lowdefy/api": "4.0.0-alpha.35",
+    "@lowdefy/blocks-antd": "4.0.0-alpha.35",
+    "@lowdefy/blocks-basic": "4.0.0-alpha.35",
+    "@lowdefy/blocks-loaders": "4.0.0-alpha.35",
+    "@lowdefy/client": "4.0.0-alpha.35",
+    "@lowdefy/helpers": "4.0.0-alpha.35",
+    "@lowdefy/layout": "4.0.0-alpha.35",
+    "@lowdefy/node-utils": "4.0.0-alpha.35",
+    "@lowdefy/operators-js": "4.0.0-alpha.35",
+    "@lowdefy/plugin-next-auth": "4.0.0-alpha.35",
     "next": "12.3.1",
     "next-auth": "4.10.3",
     "process": "0.11.10",
@@ -62,7 +62,7 @@
     "react-icons": "4.3.1"
   },
   "devDependencies": {
-    "@lowdefy/build": "4.0.0-alpha.33",
+    "@lowdefy/build": "4.0.0-alpha.35",
     "@next/eslint-plugin-next": "12.1.6",
     "less": "4.1.2",
     "less-loader": "11.0.0",
@@ -75,5 +75,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0aa1d1126108b835a6e3e3f57bbef53658777f21"
+  "gitHead": "d1cfcdb0b425ca9eb1259bdabe9cdf51df7f900c"
 }

package/pages/404.js

@@ -16,11 +16,15 @@
 import path from 'path';
 import { createApiContext, getPageConfig, getRootConfig } from '@lowdefy/api';
 
+import config from '../build/config.json';
 import Page from '../lib/Page.js';
 
 export async function getStaticProps() {
   // Important to give absolute path so Next can trace build files
-  const apiContext = await createApiContext({ buildDirectory: path.join(process.cwd(), 'build') });
+  const apiContext = createApiContext({
+    buildDirectory: path.join(process.cwd(), 'build'),
+    config,
+  });
 
   const [rootConfig, pageConfig] = await Promise.all([
     getRootConfig(apiContext),

package/pages/[pageId].js

@@ -17,6 +17,7 @@
 import path from 'path';
 import { createApiContext, getPageConfig, getRootConfig } from '@lowdefy/api';
 
+import config from '../build/config.json';
 import getServerSession from '../lib/auth/getServerSession.js';
 import Page from '../lib/Page.js';
 
@@ -24,8 +25,9 @@ export async function getServerSideProps(context) {
   const { pageId } = context.params;
   const session = await getServerSession(context);
   // Important to give absolute path so Next can trace build files
-  const apiContext = await createApiContext({
+  const apiContext = createApiContext({
     buildDirectory: path.join(process.cwd(), 'build'),
+    config,
     logger: console,
     session,
   });

package/pages/api/auth/[...nextauth].js

@@ -15,16 +15,20 @@
 */
 
 import NextAuth from 'next-auth';
-import { getNextAuthConfig } from '@lowdefy/api';
+import { createApiContext, getNextAuthConfig } from '@lowdefy/api';
 
 import authJson from '../../../build/auth.json';
+import config from '../../../build/config.json';
 import adapters from '../../../build/plugins/auth/adapters.js';
 import callbacks from '../../../build/plugins/auth/callbacks.js';
 import events from '../../../build/plugins/auth/events.js';
 import providers from '../../../build/plugins/auth/providers.js';
 
 export const authOptions = getNextAuthConfig(
-  { logger: console }, // TODO: make createApiContext synchronous
+  createApiContext({
+    config,
+    logger: console,
+  }),
   { authJson, plugins: { adapters, callbacks, events, providers } }
 );
 

package/pages/api/request/[pageId]/[requestId].js

@@ -18,9 +18,9 @@ import path from 'path';
 import { callRequest, createApiContext } from '@lowdefy/api';
 import { getSecretsFromEnv } from '@lowdefy/node-utils';
 
-import getServerSession from '../../../../lib/auth/getServerSession.js';
-
+import config from '../../../../build/config.json';
 import connections from '../../../../build/plugins/connections.js';
+import getServerSession from '../../../../lib/auth/getServerSession.js';
 import operators from '../../../../build/plugins/operators/server.js';
 
 export default async function handler(req, res) {
@@ -30,8 +30,9 @@ export default async function handler(req, res) {
     }
     const session = await getServerSession({ req, res });
     // Important to give absolute path so Next can trace build files
-    const apiContext = await createApiContext({
+    const apiContext = createApiContext({
       buildDirectory: path.join(process.cwd(), 'build'),
+      config,
       connections,
       // logger: console,
       logger: { debug: () => {} },

package/pages/index.js

@@ -17,6 +17,7 @@
 import path from 'path';
 import { createApiContext, getPageConfig, getRootConfig } from '@lowdefy/api';
 
+import config from '../build/config.json';
 import getServerSession from '../lib/auth/getServerSession.js';
 import Page from '../lib/Page.js';
 
@@ -24,8 +25,9 @@ export async function getServerSideProps(context) {
   const session = await getServerSession(context);
 
   // Important to give absolute path so Next can trace build files
-  const apiContext = await createApiContext({
+  const apiContext = createApiContext({
     buildDirectory: path.join(process.cwd(), 'build'),
+    config,
     logger: console,
     session,
   });