lowdefy 4.0.0-alpha.7 → 4.0.0-alpha.8

package/dist/commands/build/build.js

@@ -12,27 +12,43 @@
   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 getServer from '../../utils/getServer.js';
-import installServer from './installServer.js';
-import runLowdefyBuild from './runLowdefyBuild.js';
-import runNextBuild from './runNextBuild.js';
+*/ import addCustomPluginsAsDeps from '../../utils/addCustomPluginsAsDeps.js';
+import copyPluginsFolder from '../../utils/copyPluginsFolder.js';
+import getServer from '../../utils/getServer.js';
+import installServer from '../../utils/installServer.js';
+import runLowdefyBuild from '../../utils/runLowdefyBuild.js';
+import runNextBuild from '../../utils/runNextBuild.js';
 async function build({ context  }) {
     context.print.info('Starting build.');
+    const directory = context.directories.server;
     await getServer({
         context,
-        packageName: '@lowdefy/server'
+        packageName: '@lowdefy/server',
+        directory
+    });
+    await copyPluginsFolder({
+        context,
+        directory
+    });
+    await addCustomPluginsAsDeps({
+        context,
+        directory
     });
     await installServer({
-        context
+        context,
+        directory
     });
     await runLowdefyBuild({
-        context
+        context,
+        directory
     });
     await installServer({
-        context
+        context,
+        directory
     });
     await runNextBuild({
-        context
+        context,
+        directory
     });
     await context.sendTelemetry({
         sendTypes: true

package/dist/commands/dev/dev.js

@@ -12,21 +12,35 @@
   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 installServer from './installServer.js';
+*/ import addCustomPluginsAsDeps from '../../utils/addCustomPluginsAsDeps.js';
+import copyPluginsFolder from '../../utils/copyPluginsFolder.js';
+import installServer from '../../utils/installServer.js';
 import runDevServer from './runDevServer.js';
 import getServer from '../../utils/getServer.js';
 async function dev({ context  }) {
+    const directory = context.directories.dev;
     context.print.info('Starting development server.');
     await getServer({
         context,
-        packageName: '@lowdefy/server-dev'
+        packageName: '@lowdefy/server-dev',
+        directory
+    });
+    await copyPluginsFolder({
+        context,
+        directory
+    });
+    await addCustomPluginsAsDeps({
+        context,
+        directory
     });
     await installServer({
-        context
+        context,
+        directory
     });
     context.sendTelemetry();
     await runDevServer({
-        context
+        context,
+        directory
     });
 }
 export default dev;

package/dist/commands/dev/runDevServer.js

@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { spawnProcess } from '@lowdefy/node-utils';
-async function runDevServer({ context  }) {
+async function runDevServer({ context , directory  }) {
     await spawnProcess({
         logger: context.print,
         args: [
@@ -22,7 +22,7 @@ async function runDevServer({ context  }) {
         ],
         command: context.packageManager,
         processOptions: {
-            cwd: context.directories.dev,
+            cwd: directory,
             env: {
                 ...process.env,
                 LOWDEFY_BUILD_REF_RESOLVER: context.options.refResolver,

package/dist/commands/start/runStart.js

@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { spawnProcess } from '@lowdefy/node-utils';
-async function runStart({ context  }) {
+async function runStart({ context , directory  }) {
     context.print.spin(`Running "${context.packageManager} run start".`);
     await spawnProcess({
         logger: context.print,
@@ -23,7 +23,7 @@ async function runStart({ context  }) {
         ],
         command: context.packageManager,
         processOptions: {
-            cwd: context.directories.server,
+            cwd: directory,
             env: {
                 ...process.env,
                 LOWDEFY_DIRECTORY_CONFIG: context.directories.config,

package/dist/commands/start/start.js

@@ -20,7 +20,8 @@ async function build({ context  }) {
         sendTypes: true
     });
     await runStart({
-        context
+        context,
+        directory: context.directories.server
     });
 }
 export default build;

package/dist/utils/addCustomPluginsAsDeps.js

@@ -0,0 +1,32 @@
+/*
+  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 path from 'path';
+import { readFile, writeFile } from '@lowdefy/node-utils';
+async function addCustomPluginsAsDeps({ context , directory  }) {
+    const packageJsonPath = path.join(directory, 'package.json');
+    const packageJson = JSON.parse(await readFile(packageJsonPath));
+    const devDependencies = packageJson.devDependencies;
+    Object.values(context.plugins).forEach((plugin)=>{
+        devDependencies[plugin.name] = plugin.version;
+    });
+    // Sort dependencies
+    packageJson.devDependencies = {};
+    Object.keys(devDependencies).sort().forEach((name)=>{
+        packageJson.devDependencies[name] = devDependencies[name];
+    });
+    const newPackageJsonContent = JSON.stringify(packageJson, null, 2).concat('\n');
+    await writeFile(packageJsonPath, newPackageJsonContent);
+}
+export default addCustomPluginsAsDeps;

package/dist/utils/copyPluginsFolder.js

@@ -0,0 +1,23 @@
+/*
+  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 path from 'path';
+import fs from 'fs';
+import { copyDirectory } from '@lowdefy/node-utils';
+async function copyPluginsFolder({ context , directory  }) {
+    if (context.directories.config === directory) return;
+    if (!fs.existsSync(path.resolve(context.directories.config, 'plugins'))) return;
+    await copyDirectory(path.resolve(context.directories.config, 'plugins'), path.resolve(directory, 'plugins'));
+}
+export default copyPluginsFolder;

package/dist/utils/getLowdefyYaml.js

@@ -17,9 +17,9 @@ import { get, type } from '@lowdefy/helpers';
 import { readFile } from '@lowdefy/node-utils';
 import YAML from 'yaml';
 async function getLowdefyYaml({ configDirectory , command  }) {
-    let lowdefyYaml = await readFile(path.resolve(configDirectory, 'lowdefy.yaml'));
+    let lowdefyYaml = await readFile(path.join(configDirectory, 'lowdefy.yaml'));
     if (!lowdefyYaml) {
-        lowdefyYaml = await readFile(path.resolve(configDirectory, 'lowdefy.yml'));
+        lowdefyYaml = await readFile(path.join(configDirectory, 'lowdefy.yml'));
     }
     if (!lowdefyYaml) {
         if (![
@@ -43,10 +43,14 @@ async function getLowdefyYaml({ configDirectory , command  }) {
     if (!type.isString(lowdefy.lowdefy)) {
         throw new Error(`Version number specified in "lowdefy.yaml" file should be a string. Received ${JSON.stringify(lowdefy.lowdefy)}.`);
     }
+    // TODO: Validate plugins
     return {
         lowdefyVersion: lowdefy.lowdefy,
         cliConfig: get(lowdefy, 'cli', {
             default: {}
+        }),
+        plugins: get(lowdefy, 'plugins', {
+            default: []
         })
     };
 }

package/dist/utils/getServer.js

@@ -16,30 +16,30 @@
 import path from 'path';
 import { cleanDirectory, readFile } from '@lowdefy/node-utils';
 import fetchNpmTarball from './fetchNpmTarball.js';
-async function getServer({ context , packageName  }) {
+async function getServer({ context , packageName , directory  }) {
     if (context.lowdefyVersion === 'local') {
         context.print.warn(`Running local ${packageName}.`);
         return;
     }
     let fetchServer = false;
-    const serverExists = fs.existsSync(path.join(context.directories.server, 'package.json'));
+    const serverExists = fs.existsSync(path.join(directory, 'package.json'));
     if (!serverExists) fetchServer = true;
     if (serverExists) {
-        const serverPackageConfig = JSON.parse(await readFile(path.join(context.directories.server, 'package.json')));
+        const serverPackageConfig = JSON.parse(await readFile(path.join(directory, 'package.json')));
         if (serverPackageConfig.version !== context.lowdefyVersion) {
             fetchServer = true;
-            context.print.warn(`Removing @lowdefy/server with version ${serverPackageConfig.version}`);
-            await cleanDirectory(context.directories.server);
+            context.print.warn(`Removing ${packageName} with version ${serverPackageConfig.version}`);
+            await cleanDirectory(directory);
         }
     }
     if (fetchServer) {
-        context.print.spin('Fetching @lowdefy/server from npm.');
+        context.print.spin(`Fetching ${packageName} from npm.`);
         await fetchNpmTarball({
             packageName,
             version: context.lowdefyVersion,
-            directory: context.directories.server
+            directory: directory
         });
-        context.print.log('Fetched @lowdefy/server from npm.');
+        context.print.log(`Fetched ${packageName} from npm.`);
     }
 }
 export default getServer;

package/dist/{commands/dev → utils}/installServer.js

@@ -22,7 +22,7 @@ const args = {
         'install'
     ]
 };
-async function installServer({ context  }) {
+async function installServer({ context , directory  }) {
     context.print.spin(`Running ${context.packageManager} install.`);
     try {
         await spawnProcess({
@@ -30,7 +30,7 @@ async function installServer({ context  }) {
             command: context.packageManager,
             args: args[context.packageManager],
             processOptions: {
-                cwd: context.directories.dev
+                cwd: directory
             },
             silent: false
         });

package/dist/{commands/build → utils}/runLowdefyBuild.js

@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { spawnProcess } from '@lowdefy/node-utils';
-async function runLowdefyBuild({ context  }) {
+async function runLowdefyBuild({ context , directory  }) {
     context.print.log('Running Lowdefy build.');
     try {
         await spawnProcess({
@@ -24,7 +24,7 @@ async function runLowdefyBuild({ context  }) {
                 'build:lowdefy'
             ],
             processOptions: {
-                cwd: context.directories.server,
+                cwd: directory,
                 env: {
                     ...process.env,
                     LOWDEFY_BUILD_REF_RESOLVER: context.options.refResolver,

package/dist/{commands/build → utils}/runNextBuild.js

@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { spawnProcess } from '@lowdefy/node-utils';
-async function runNextBuild({ context  }) {
+async function runNextBuild({ context , directory  }) {
     context.print.log('Running Next build.');
     try {
         await spawnProcess({
@@ -24,7 +24,7 @@ async function runNextBuild({ context  }) {
                 'build:next'
             ],
             processOptions: {
-                cwd: context.directories.server
+                cwd: directory
             },
             silent: false
         });

package/dist/utils/startUp.js

@@ -27,9 +27,10 @@ async function startUp({ context , options ={} , command  }) {
     context.commandLineOptions = options;
     context.print = createPrint();
     context.configDirectory = path.resolve(options.configDirectory || process.cwd());
-    const { cliConfig , lowdefyVersion  } = await getLowdefyYaml(context);
+    const { cliConfig , lowdefyVersion , plugins  } = await getLowdefyYaml(context);
     context.cliConfig = cliConfig;
     context.lowdefyVersion = lowdefyVersion;
+    context.plugins = plugins;
     const { appId  } = await getCliJson(context);
     context.appId = appId;
     context.options = getOptions(context);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowdefy",
-  "version": "4.0.0-alpha.7",
+  "version": "4.0.0-alpha.8",
   "license": "Apache-2.0",
   "description": "Lowdefy CLI",
   "homepage": "https://lowdefy.com",
@@ -40,8 +40,8 @@
     "test": "FORCE_COLOR=3 yarn node --experimental-vm-modules $(yarn bin jest)"
   },
   "dependencies": {
-    "@lowdefy/helpers": "4.0.0-alpha.7",
-    "@lowdefy/node-utils": "4.0.0-alpha.7",
+    "@lowdefy/helpers": "4.0.0-alpha.8",
+    "@lowdefy/node-utils": "4.0.0-alpha.8",
     "axios": "0.25.0",
     "chalk": "4.1.2",
     "commander": "9.0.0",
@@ -61,5 +61,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "52ec14639d00de910cf9b8ab25bf933ca891cff5"
+  "gitHead": "9d56b83cf45e868afe3a1eeba750fe826eb74c8c"
 }

package/dist/commands/build/installServer.js

@@ -1,43 +0,0 @@
-/*
-  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 { spawnProcess } from '@lowdefy/node-utils';
-const args = {
-    npm: [
-        'install',
-        '--legacy-peer-deps'
-    ],
-    yarn: [
-        'install'
-    ]
-};
-async function installServer({ context  }) {
-    context.print.spin(`Running ${context.packageManager} install.`);
-    try {
-        await spawnProcess({
-            logger: context.print,
-            command: context.packageManager,
-            args: args[context.packageManager],
-            processOptions: {
-                cwd: context.directories.server
-            },
-            silent: false
-        });
-    } catch (error) {
-        console.log(error);
-        throw new Error(`${context.packageManager} install failed.`);
-    }
-    context.print.log(`${context.packageManager} install successful.`);
-}
-export default installServer;