@lowdefy/server 4.0.0-alpha.5 → 4.0.0-alpha.6

package/README.md

@@ -1,5 +1,21 @@
 # @lowdefy/server
 
+## Development
+
+To run the server in locally as a development server, run the following:
+
+- Run `yarn && yarn build` at the root of the repository.
+- Add a `lowdefy.yaml` file in the server directory (`packages/server`).
+- run `yarn dev` in the server directory.
+
+To run the server in locally as a development server, with a next production build, run the following:
+
+- Run `yarn && yarn build` at the root of the repository.
+- Add a `lowdefy.yaml` file in the server directory (`packages/server`).
+- run `yarn dev:prod` in the server directory.
+
+> When running a development server, the `package.json` file is updated with the plugins used in the Lowdefy app. Please do not commit the changes made to the `package.json`, `.pnp.cjs` and `yarn.lock` files.
+
 ## Licence
 
-[Apache-2.0](https://github.com/lowdefy/lowdefy/blob/main/LICENSE)
+[Apache-2.0](https://github.com/lowdefy/lowdefy/blob/main/LICENSE)

package/next.config.js

@@ -1,10 +1,10 @@
 const withLess = require('next-with-less');
-const appConfig = require('./build/app.json');
+const lowdefyConfig = require('./build/config.json');
 
 module.exports = withLess({
   lessLoaderOptions: {
     lessOptions: {
-      modifyVars: appConfig.styles.lessVariables,
+      modifyVars: lowdefyConfig.theme.lessVariables,
     },
   },
   reactStrictMode: true,
@@ -17,7 +17,7 @@ module.exports = withLess({
         events: false,
         fs: false,
         path: false,
-        process: false,
+        process: require.resolve('process/browser'),
         util: false,
       };
     }
@@ -28,4 +28,7 @@ module.exports = withLess({
   // experimental: {
   //   concurrentFeatures: true,
   // },
+  eslint: {
+    ignoreDuringBuilds: true,
+  },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/server",
-  "version": "4.0.0-alpha.5",
+  "version": "4.0.0-alpha.6",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -27,32 +27,36 @@
   },
   "files": [
     "src/*",
+    "public/*",
     "next.config.js",
     ".eslintrc.yaml"
   ],
   "scripts": {
     "build:lowdefy": "lowdefy-build",
     "build:next": "next build",
-    "dev": "next dev",
+    "dev": "yarn build:lowdefy && yarn && next dev",
+    "dev:prod": "yarn build:lowdefy && yarn && yarn build:next && next start",
     "start": "next start",
     "lint": "next lint",
     "next": "next"
   },
   "dependencies": {
-    "@lowdefy/api": "4.0.0-alpha.5",
-    "@lowdefy/block-utils": "4.0.0-alpha.5",
-    "@lowdefy/engine": "4.0.0-alpha.5",
-    "@lowdefy/helpers": "4.0.0-alpha.5",
-    "@lowdefy/layout": "4.0.0-alpha.5",
-    "@lowdefy/operators-js": "4.0.0-alpha.5",
+    "@lowdefy/api": "4.0.0-alpha.6",
+    "@lowdefy/block-utils": "4.0.0-alpha.6",
+    "@lowdefy/engine": "4.0.0-alpha.6",
+    "@lowdefy/helpers": "4.0.0-alpha.6",
+    "@lowdefy/layout": "4.0.0-alpha.6",
+    "@lowdefy/node-utils": "4.0.0-alpha.6",
+    "@lowdefy/operators-js": "4.0.0-alpha.6",
     "next": "12.0.3",
     "next-auth": "4.0.0-beta.6",
+    "process": "0.11.10",
     "react": "18.0.0-alpha-327d5c484-20211106",
     "react-dom": "18.0.0-alpha-327d5c484-20211106",
     "react-icons": "4.3.1"
   },
   "devDependencies": {
-    "@lowdefy/build": "4.0.0-alpha.5",
+    "@lowdefy/build": "4.0.0-alpha.6",
     "@next/eslint-plugin-next": "12.0.4",
     "less": "4.1.2",
     "less-loader": "10.2.0",
@@ -61,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "995fcdb020927f3cdc626fc99c15a2e4137bd962"
+  "gitHead": "2530e31af795b6a3c75ac8f72c8dbe0ab5d1251b"
 }

package/src/components/block/CategorySwitch.js

@@ -69,7 +69,7 @@ const CategorySwitch = ({ block, Blocks, context, lowdefy }) => {
             blockId={block.blockId}
             components={lowdefy._internal.components}
             events={block.eval.events}
-            homePageId={lowdefy.homePageId}
+            homePageId={lowdefy.home.pageId}
             key={block.blockId}
             loading={block.loading}
             menus={lowdefy.menus}
@@ -102,7 +102,7 @@ const CategorySwitch = ({ block, Blocks, context, lowdefy }) => {
             blockId={block.blockId}
             components={lowdefy._internal.components}
             events={block.eval.events}
-            homePageId={lowdefy.homePageId}
+            homePageId={lowdefy.home.pageId}
             key={block.blockId}
             loading={block.loading}
             menus={lowdefy.menus}

package/src/components/block/Container.js

@@ -70,7 +70,7 @@ const Container = ({ block, Blocks, Component, context, lowdefy }) => {
         components={lowdefy._internal.components}
         content={content}
         events={block.eval.events}
-        homePageId={lowdefy.homePageId}
+        homePageId={lowdefy.home.pageId}
         key={block.blockId}
         loading={block.loading}
         menus={lowdefy.menus}

package/src/components/block/List.js

@@ -76,7 +76,7 @@ const List = ({ block, Blocks, Component, context, lowdefy }) => {
         blockId={block.blockId}
         components={lowdefy._internal.components}
         events={block.eval.events}
-        homePageId={lowdefy.homePageId}
+        homePageId={lowdefy.home.pageId}
         key={block.blockId}
         list={contentList}
         loading={block.loading}

package/src/pages/404.js

@@ -0,0 +1,38 @@
+/*
+  Copyright 2020-2021 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+import { createApiContext, getPageConfig, getRootConfig } from '@lowdefy/api';
+
+import Page from '../components/Page.js';
+
+export async function getStaticProps() {
+  // TODO: get the right api context options
+  const apiContext = await createApiContext({ buildDirectory: './build' });
+
+  const [rootConfig, pageConfig] = await Promise.all([
+    getRootConfig(apiContext),
+    getPageConfig(apiContext, { pageId: '404' }),
+  ]);
+
+  return {
+    props: {
+      pageConfig,
+      rootConfig,
+    },
+  };
+}
+
+export default Page;

package/src/pages/_document.js

@@ -0,0 +1,38 @@
+/*
+  Copyright 2020-2021 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+import React from 'react';
+import Document, { Html, Head, Main, NextScript } from 'next/document';
+
+class LowdefyDocument extends Document {
+  render() {
+    return (
+      <Html>
+        <Head>
+          <link rel="manifest" href="/manifest.webmanifest" />
+          <link rel="icon" type="image/svg+xml" href="/icon.svg" />
+          <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
+        </Head>
+        <body>
+          <Main />
+          <NextScript />
+        </body>
+      </Html>
+    );
+  }
+}
+
+export default LowdefyDocument;

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

@@ -15,6 +15,7 @@
 */
 
 import { callRequest, createApiContext } from '@lowdefy/api';
+import { getSecretsFromEnv } from '@lowdefy/node-utils';
 import connections from '../../../../../build/plugins/connections.js';
 import operators from '../../../../../build/plugins/operatorsServer.js';
 
@@ -30,8 +31,7 @@ export default async function handler(req, res) {
       // TODO: use a logger like pino
       logger: console,
       operators,
-      // TODO: get secrets
-      secrets: {},
+      secrets: getSecretsFromEnv(),
     });
     const { pageId, requestId } = req.query;
     const { payload } = req.body;

package/src/pages/index.js

@@ -14,14 +14,14 @@
   limitations under the License.
 */
 
-import { createApiContext, getHome, getPageConfig, getRootConfig } from '@lowdefy/api';
+import { createApiContext, getPageConfig, getRootConfig } from '@lowdefy/api';
 
 import Page from '../components/Page.js';
 
 export async function getServerSideProps() {
   const apiContext = await createApiContext({ buildDirectory: './build' });
-  const home = await getHome(apiContext);
-  console.log(home);
+  const rootConfig = await getRootConfig(apiContext);
+  const { home } = rootConfig;
   if (home.configured === false) {
     return {
       redirect: {
@@ -30,12 +30,7 @@ export async function getServerSideProps() {
       },
     };
   }
-
-  const [rootConfig, pageConfig] = await Promise.all([
-    getRootConfig(apiContext),
-    getPageConfig(apiContext, { pageId: home.pageId }),
-  ]);
-
+  const pageConfig = await getPageConfig(apiContext, { pageId: home.pageId });
   if (!pageConfig) {
     return {
       redirect: {
@@ -44,7 +39,6 @@ export async function getServerSideProps() {
       },
     };
   }
-
   return {
     props: {
       pageConfig,