@lowdefy/server-dev 4.0.0-alpha.6 → 4.0.0-alpha.7

package/next.config.js

@@ -7,6 +7,7 @@ module.exports = withLess({
       modifyVars: lowdefyConfig.theme.lessVariables,
     },
   },
+  basePath: process.env.LOWDEFY_BASE_PATH || lowdefyConfig.basePath,
   // reactStrictMode: true,
   webpack: (config, { isServer }) => {
     if (!isServer) {
@@ -23,11 +24,12 @@ module.exports = withLess({
     }
     return config;
   },
+  swcMinify: true,
+  compress: false,
+  outputFileTracing: false,
   poweredByHeader: false,
-  // productionBrowserSourceMaps: true
-  // experimental: {
-  //   concurrentFeatures: true,
-  // },
+  generateEtags: false,
+  optimizeFonts: false,
   eslint: {
     ignoreDuringBuilds: true,
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/server-dev",
-  "version": "4.0.0-alpha.6",
+  "version": "4.0.0-alpha.7",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -40,45 +40,47 @@
     "next": "next"
   },
   "dependencies": {
-    "@lowdefy/api": "4.0.0-alpha.6",
-    "@lowdefy/block-utils": "4.0.0-alpha.6",
-    "@lowdefy/blocks-antd": "4.0.0-alpha.6",
-    "@lowdefy/blocks-basic": "4.0.0-alpha.6",
-    "@lowdefy/blocks-color-selectors": "4.0.0-alpha.6",
-    "@lowdefy/blocks-echarts": "4.0.0-alpha.6",
-    "@lowdefy/blocks-loaders": "4.0.0-alpha.6",
-    "@lowdefy/blocks-markdown": "4.0.0-alpha.6",
-    "@lowdefy/build": "4.0.0-alpha.6",
-    "@lowdefy/connection-axios-http": "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-change-case": "4.0.0-alpha.6",
-    "@lowdefy/operators-diff": "4.0.0-alpha.6",
-    "@lowdefy/operators-js": "4.0.0-alpha.6",
-    "@lowdefy/operators-mql": "4.0.0-alpha.6",
-    "@lowdefy/operators-nunjucks": "4.0.0-alpha.6",
-    "@lowdefy/operators-uuid": "4.0.0-alpha.6",
-    "@lowdefy/operators-yaml": "4.0.0-alpha.6",
-    "chokidar": "3.5.2",
-    "next": "12.0.3",
-    "next-auth": "4.0.0-beta.6",
+    "@lowdefy/api": "4.0.0-alpha.7",
+    "@lowdefy/block-utils": "4.0.0-alpha.7",
+    "@lowdefy/blocks-antd": "4.0.0-alpha.7",
+    "@lowdefy/blocks-basic": "4.0.0-alpha.7",
+    "@lowdefy/blocks-color-selectors": "4.0.0-alpha.7",
+    "@lowdefy/blocks-echarts": "4.0.0-alpha.7",
+    "@lowdefy/blocks-loaders": "4.0.0-alpha.7",
+    "@lowdefy/blocks-markdown": "4.0.0-alpha.7",
+    "@lowdefy/build": "4.0.0-alpha.7",
+    "@lowdefy/connection-axios-http": "4.0.0-alpha.7",
+    "@lowdefy/engine": "4.0.0-alpha.7",
+    "@lowdefy/helpers": "4.0.0-alpha.7",
+    "@lowdefy/layout": "4.0.0-alpha.7",
+    "@lowdefy/node-utils": "4.0.0-alpha.7",
+    "@lowdefy/operators-change-case": "4.0.0-alpha.7",
+    "@lowdefy/operators-diff": "4.0.0-alpha.7",
+    "@lowdefy/operators-js": "4.0.0-alpha.7",
+    "@lowdefy/operators-mql": "4.0.0-alpha.7",
+    "@lowdefy/operators-nunjucks": "4.0.0-alpha.7",
+    "@lowdefy/operators-uuid": "4.0.0-alpha.7",
+    "@lowdefy/operators-yaml": "4.0.0-alpha.7",
+    "chokidar": "3.5.3",
+    "dotenv": "15.0.0",
+    "js-yaml": "4.1.0",
+    "next": "12.0.10",
+    "next-auth": "4.1.2",
     "opener": "1.5.2",
-    "react": "18.0.0-alpha-327d5c484-20211106",
-    "react-dom": "18.0.0-alpha-327d5c484-20211106",
+    "react": "18.0.0-rc.0",
+    "react-dom": "18.0.0-rc.0",
     "react-icons": "4.3.1",
-    "swr": "1.0.1",
-    "yargs": "17.3.0"
+    "swr": "1.1.2",
+    "yargs": "17.3.1"
   },
   "devDependencies": {
-    "@next/eslint-plugin-next": "12.0.4",
+    "@next/eslint-plugin-next": "12.0.10",
     "less": "4.1.2",
     "less-loader": "10.2.0",
-    "next-with-less": "2.0.2"
+    "next-with-less": "2.0.4"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2530e31af795b6a3c75ac8f72c8dbe0ab5d1251b"
+  "gitHead": "52ec14639d00de910cf9b8ab25bf933ca891cff5"
 }

package/src/components/App.js

@@ -16,6 +16,7 @@
 
 import React from 'react';
 
+import { urlQuery } from '@lowdefy/helpers';
 import { useRouter } from 'next/router';
 
 import Page from './Page.js';
@@ -23,22 +24,23 @@ import Reload from './Reload.js';
 import setPageId from '../utils/setPageId.js';
 import setupLink from '../utils/setupLink.js';
 import useRootConfig from '../utils/useRootConfig.js';
+import createComponents from './createComponents.js';
 
 const App = ({ lowdefy }) => {
   const router = useRouter();
-  const { data: rootConfig } = useRootConfig();
+  const { data: rootConfig } = useRootConfig(router.basePath);
 
   window.lowdefy = lowdefy;
 
+  lowdefy._internal.router = router;
+  lowdefy._internal.link = setupLink(lowdefy);
+  lowdefy._internal.components = createComponents(lowdefy);
+
+  lowdefy.basePath = lowdefy._internal.router.basePath;
   lowdefy.home = rootConfig.home;
   lowdefy.lowdefyGlobal = rootConfig.lowdefyGlobal;
   lowdefy.menus = rootConfig.menus;
-
-  lowdefy._internal.basePath = router.basePath;
-  lowdefy._internal.pathname = router.pathname;
-  lowdefy._internal.query = router.query;
-  lowdefy._internal.router = router;
-  lowdefy._internal.link = setupLink({ lowdefy });
+  lowdefy.urlQuery = urlQuery.parse(window.location.search.slice(1));
 
   const redirect = setPageId(lowdefy);
   if (redirect) {

package/src/components/LowdefyContext.js

@@ -16,35 +16,35 @@
 
 import React from 'react';
 
+import actions from '../../build/plugins/actions.js';
 import callRequest from '../utils/callRequest.js';
 import blockComponents from '../../build/plugins/blocks.js';
 import operators from '../../build/plugins/operatorsClient.js';
-import components from './components.js';
 
-const LowdefyContext = ({ children }) => {
-  const lowdefy = {
-    _internal: {
+const LowdefyContext = ({ children, lowdefy }) => {
+  if (!lowdefy._internal) {
+    lowdefy._internal = {
+      actions,
       blockComponents,
       callRequest,
-      components,
+      components: {},
       document,
       operators,
       updaters: {},
       window,
       displayMessage: ({ content }) => {
-        alert(content);
+        console.log(content);
         return () => undefined;
       },
       link: () => undefined,
-    },
-    contexts: {},
-    inputs: {},
-    lowdefyGlobal: {},
-  };
+    };
+    lowdefy.contexts = {};
+    lowdefy.inputs = {};
+    lowdefy.lowdefyGlobal = {};
+  }
   lowdefy._internal.updateBlock = (blockId) =>
     lowdefy._internal.updaters[blockId] && lowdefy._internal.updaters[blockId]();
-
-  return <>{children(lowdefy)}</>;
+  return <>{children}</>;
 };
 
 export default LowdefyContext;

package/src/components/Page.js

@@ -24,9 +24,9 @@ import usePageConfig from '../utils/usePageConfig.js';
 const LoadingBlock = () => <div>Loading...</div>;
 
 const Page = ({ lowdefy }) => {
-  const { data: pageConfig } = usePageConfig(lowdefy.pageId);
+  const { data: pageConfig } = usePageConfig(lowdefy.pageId, lowdefy.basePath);
   if (!pageConfig) {
-    lowdefy._internal.router.push(`/404`);
+    lowdefy._internal.router.replace(`/404`);
     return <LoadingBlock />;
   }
   return (

package/src/components/Reload.js

@@ -20,9 +20,9 @@ import useMutateCache from '../utils/useMutateCache.js';
 import waitForRestartedServer from '../utils/waitForRestartedServer.js';
 
 const Reload = ({ children, lowdefy }) => {
-  const mutateCache = useMutateCache();
+  const mutateCache = useMutateCache(lowdefy.basePath);
   useEffect(() => {
-    const sse = new EventSource('/api/reload');
+    const sse = new EventSource(`${lowdefy.basePath}/api/reload`);
 
     sse.addEventListener('reload', () => {
       mutateCache();

package/src/components/block/CategorySwitch.js

@@ -64,12 +64,10 @@ const CategorySwitch = ({ block, Blocks, context, lowdefy }) => {
               setValue: block.setValue,
               triggerEvent: block.triggerEvent,
             })}
-            // TODO: React throws a  basePath warning
-            basePath={lowdefy._internal.basePath}
+            basePath={lowdefy.basePath}
             blockId={block.blockId}
             components={lowdefy._internal.components}
             events={block.eval.events}
-            homePageId={lowdefy.home.pageId}
             key={block.blockId}
             loading={block.loading}
             menus={lowdefy.menus}
@@ -98,11 +96,10 @@ const CategorySwitch = ({ block, Blocks, context, lowdefy }) => {
               registerMethod: block.registerMethod,
               triggerEvent: block.triggerEvent,
             })}
-            basePath={lowdefy._internal.basePath}
+            basePath={lowdefy.basePath}
             blockId={block.blockId}
             components={lowdefy._internal.components}
             events={block.eval.events}
-            homePageId={lowdefy.home.pageId}
             key={block.blockId}
             loading={block.loading}
             menus={lowdefy.menus}

package/src/components/block/Container.js

@@ -65,12 +65,11 @@ const Container = ({ block, Blocks, Component, context, lowdefy }) => {
           registerMethod: block.registerMethod,
           triggerEvent: block.triggerEvent,
         })}
-        basePath={lowdefy._internal.basePath}
+        basePath={lowdefy.basePath}
         blockId={block.blockId}
         components={lowdefy._internal.components}
         content={content}
         events={block.eval.events}
-        homePageId={lowdefy.home.pageId}
         key={block.blockId}
         loading={block.loading}
         menus={lowdefy.menus}

package/src/components/block/List.js

@@ -72,11 +72,10 @@ const List = ({ block, Blocks, Component, context, lowdefy }) => {
           triggerEvent: block.triggerEvent,
           unshiftItem: block.unshiftItem,
         })}
-        basePath={lowdefy._internal.basePath}
+        basePath={lowdefy.basePath}
         blockId={block.blockId}
         components={lowdefy._internal.components}
         events={block.eval.events}
-        homePageId={lowdefy.home.pageId}
         key={block.blockId}
         list={contentList}
         loading={block.loading}

package/src/components/{components.js → createComponents.js}

@@ -14,12 +14,16 @@
   limitations under the License.
 */
 
-import Link from 'next/link';
 import { createIcon } from '@lowdefy/block-utils';
 
+import createLinkComponent from './createLinkComponent.js';
 import icons from '../../build/plugins/icons.js';
 
-export default {
-  Link,
-  Icon: createIcon(icons),
+const createComponents = (lowdefy) => {
+  return {
+    Link: createLinkComponent(lowdefy),
+    Icon: createIcon(icons),
+  };
 };
+
+export default createComponents;

package/src/components/createLinkComponent.js

@@ -0,0 +1,97 @@
+import React from 'react';
+import NextLink from 'next/link';
+import { createLink } from '@lowdefy/engine';
+import { type } from '@lowdefy/helpers';
+
+const createLinkComponent = (lowdefy) => {
+  const backLink = ({ ariaLabel, children, className, id, rel }) => (
+    <a
+      id={id}
+      onClick={() => lowdefy._internal.router.back()}
+      className={className}
+      rel={rel}
+      aria-label={ariaLabel || 'back'}
+    >
+      {type.isFunction(children) ? children(id) : children}
+    </a>
+  );
+  const newOriginLink = ({
+    ariaLabel,
+    children,
+    className,
+    id,
+    newTab,
+    pageId,
+    query,
+    rel,
+    url,
+  }) => {
+    return (
+      <a
+        id={id}
+        aria-label={ariaLabel}
+        className={className}
+        href={`${url}${query ? `?${query}` : ''}`}
+        rel={rel || (newTab && 'noopener noreferrer')}
+        target={newTab && '_blank'}
+      >
+        {type.isFunction(children) ? children(pageId || url || id) : children}
+      </a>
+    );
+  };
+  const sameOriginLink = ({
+    ariaLabel,
+    children,
+    className,
+    id,
+    newTab,
+    pageId,
+    pathname,
+    query,
+    rel,
+    replace,
+    scroll,
+    setInput,
+    url,
+  }) => {
+    if (newTab) {
+      return (
+        // eslint-disable-next-line react/jsx-no-target-blank
+        <a
+          id={id}
+          aria-label={ariaLabel}
+          className={className}
+          href={`${window.location.origin}${lowdefy.basePath}${pathname}${
+            query ? `?${query}` : ''
+          }`}
+          rel={rel || 'noopener noreferrer'}
+          target="_blank"
+        >
+          {type.isFunction(children) ? children(pageId || url || id) : children}
+        </a>
+      );
+    }
+    return (
+      <NextLink href={{ pathname, query }} replace={replace} scroll={scroll}>
+        <a id={id} aria-label={ariaLabel} className={className} rel={rel} onClick={setInput}>
+          {type.isFunction(children) ? children(pageId || url || id) : children}
+        </a>
+      </NextLink>
+    );
+  };
+  const noLink = ({ className, children, id }) => (
+    <span id={id} className={className}>
+      {type.isFunction(children) ? children(id) : children}
+    </span>
+  );
+  return createLink({
+    backLink,
+    lowdefy,
+    newOriginLink,
+    sameOriginLink,
+    noLink,
+    disabledLink: noLink,
+  });
+};
+
+export default createLinkComponent;

package/src/manager/getContext.mjs

@@ -16,47 +16,62 @@
 /* eslint-disable no-console */
 
 import path from 'path';
+import { createRequire } from 'module';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 
+import initialBuild from './processes/initialBuild.mjs';
+import installPlugins from './processes/installPlugins.mjs';
 import lowdefyBuild from './processes/lowdefyBuild.mjs';
 import nextBuild from './processes/nextBuild.mjs';
-import installPlugins from './processes/installPlugins.mjs';
-import startServerProcess from './processes/startServerProcess.mjs';
+import readDotEnv from './processes/readDotEnv.mjs';
 import reloadClients from './processes/reloadClients.mjs';
+import restartServer from './processes/restartServer.mjs';
+import shutdownServer from './processes/shutdownServer.mjs';
+import startWatchers from './processes/startWatchers.mjs';
 
-const argv = yargs(hideBin(process.argv)).argv;
+const argv = yargs(hideBin(process.argv)).array('watch').array('watchIgnore').argv;
+const require = createRequire(import.meta.url);
 
 async function getContext() {
-  const { packageManager = 'npm', verbose = false } = argv;
+  const env = process.env;
+
   const context = {
+    bin: {
+      // TODO: The string replace is a little hacky and will fail if the location of the bin changes,
+      lowdefyBuild: require.resolve('@lowdefy/build').replace('index.js', 'scripts/run.js'),
+      next: require.resolve('next').replace('server/next.js', 'bin/next'),
+    },
     directories: {
       build: path.resolve(process.cwd(), './build'),
-      config: path.resolve(
-        argv.configDirectory || process.env.LOWDEFY_DIRECTORY_CONFIG || process.cwd()
-      ),
+      config: path.resolve(argv.configDirectory || env.LOWDEFY_DIRECTORY_CONFIG || process.cwd()),
       server: process.cwd(),
     },
-    packageManager,
-    restartServer: () => {
-      if (context.serverProcess) {
-        console.log('Restarting server...');
-        context.serverProcess.kill();
-        startServerProcess(context);
-      }
-    },
-    shutdownServer: () => {
-      if (context.serverProcess) {
-        console.log('Shutting down server...');
-        context.serverProcess.kill();
-      }
+    options: {
+      port: argv.port || env.PORT || 3000,
+      refResolver: argv.refResolver || env.LOWDEFY_BUILD_REF_RESOLVER,
+      watch:
+        argv.watch || env.LOWDEFY_SERVER_DEV_WATCH ? JSON.parse(env.LOWDEFY_SERVER_DEV_WATCH) : [],
+      watchIgnore:
+        argv.watchIgnore || env.LOWDEFY_SERVER_DEV_WATCH_IGNORE
+          ? JSON.parse(env.LOWDEFY_SERVER_DEV_WATCH_IGNORE)
+          : [],
+      // TODO: read option from from env
+      verbose: argv.verbose || false,
     },
-    verbose,
+    packageManager: argv.packageManager || env.LOWDEFY_PACKAGE_MANAGER || 'npm',
+    version: env.npm_package_version,
   };
+
+  context.initialBuild = initialBuild(context);
   context.installPlugins = installPlugins(context);
   context.lowdefyBuild = lowdefyBuild(context);
   context.nextBuild = nextBuild(context);
+  context.readDotEnv = readDotEnv(context);
   context.reloadClients = reloadClients(context);
+  context.restartServer = restartServer(context);
+  context.shutdownServer = shutdownServer(context);
+  context.startWatchers = startWatchers(context);
 
   return context;
 }

package/src/manager/{initialBuild.mjs → processes/initialBuild.mjs}

@@ -15,10 +15,13 @@
   limitations under the License.
 */
 
-async function initialBuild(context) {
-  await context.lowdefyBuild();
-  await context.installPlugins();
-  await context.nextBuild();
+function initialBuild(context) {
+  return async () => {
+    await context.lowdefyBuild();
+    await context.installPlugins();
+    await context.nextBuild();
+    await context.readDotEnv();
+  };
 }
 
 export default initialBuild;

package/src/manager/processes/installPlugins.mjs

@@ -21,14 +21,14 @@ const args = {
   yarn: ['install'],
 };
 
-function installPlugins({ packageManager, verbose }) {
+function installPlugins({ packageManager, options }) {
   return async () => {
     console.log('Installing plugins...');
     await spawnProcess({
       logger: console,
       command: packageManager, // npm or yarn
       args: args[packageManager],
-      silent: !verbose,
+      silent: !options.verbose,
     });
   };
 }

package/src/manager/processes/lowdefyBuild.mjs

@@ -16,15 +16,16 @@
 
 import { spawnProcess } from '@lowdefy/node-utils';
 
-function lowdefyBuild({ packageManager, directories }) {
+function lowdefyBuild({ bin, directories, options }) {
   return async () => {
     await spawnProcess({
+      command: 'node',
+      args: [bin.lowdefyBuild],
       logger: console,
-      args: ['run', 'build:lowdefy'],
-      command: packageManager,
       processOptions: {
         env: {
           ...process.env,
+          LOWDEFY_BUILD_REF_RESOLVER: options.refResolver,
           LOWDEFY_DIRECTORY_BUILD: directories.build,
           LOWDEFY_DIRECTORY_CONFIG: directories.config,
           LOWDEFY_DIRECTORY_SERVER: process.cwd(),

package/src/manager/processes/nextBuild.mjs

@@ -16,14 +16,14 @@
 
 import { spawnProcess } from '@lowdefy/node-utils';
 
-function nextBuild({ packageManager, verbose }) {
+function nextBuild({ bin, options }) {
   return async () => {
     console.log('Building app...');
     await spawnProcess({
       logger: console,
-      args: ['run', 'build:next'],
-      command: packageManager,
-      silent: !verbose,
+      command: 'node',
+      args: [bin.next, 'build'],
+      silent: !options.verbose,
     });
   };
 }

package/src/manager/{watchers/configWatcher.mjs → processes/readDotEnv.mjs}

@@ -14,15 +14,15 @@
   limitations under the License.
 */
 
-import setupWatcher from './setupWatcher.mjs';
+import path from 'path';
+import dotenv from 'dotenv';
+import { readFile } from '@lowdefy/node-utils';
 
-async function configWatcher(context) {
-  const callback = async () => {
-    await context.lowdefyBuild();
-    context.reloadClients();
+function readDotEnv(context) {
+  return async () => {
+    const dotEnv = await readFile(path.join(context.directories.config, '.env'));
+    context.serverEnv = dotenv.parse(dotEnv || '');
   };
-  // TODO: Add ignored and watch paths
-  return setupWatcher({ callback, watchPaths: [context.directories.config] });
 }
 
-export default configWatcher;
+export default readDotEnv;

package/src/manager/processes/reloadClients.mjs

@@ -19,7 +19,7 @@ import { writeFile } from '@lowdefy/node-utils';
 
 function reloadClients({ directories }) {
   return async () => {
-    await writeFile({ filePath: path.join(directories.build, 'reload'), content: `${Date.now()}` });
+    await writeFile(path.join(directories.build, 'reload'), `${Date.now()}`);
   };
 }
 

package/src/manager/processes/{startServerProcess.mjs → restartServer.mjs}

@@ -14,21 +14,14 @@
   limitations under the License.
 */
 
-import spawnProcess from '../spawnProcess.mjs';
+import startNextServer from './startNextServer.mjs';
 
-function startServerProcess(context) {
-  context.serverProcess = spawnProcess({
-    logger: console,
-    command: context.packageManager,
-    args: ['run', 'next', 'start'],
-    silent: false,
-  });
-  context.serverProcess.on('exit', (code) => {
-    if (code !== 0) {
-      context.serverProcessPromise.reject(new Error('Server error.'));
-    }
-    context.serverProcessPromise.resolve();
-  });
+function restartServer(context) {
+  return () => {
+    context.shutdownServer(); // Is this needed here?
+    console.log('Restarting server...');
+    startNextServer(context);
+  };
 }
 
-export default startServerProcess;
+export default restartServer;