lowdefy 4.0.0-alpha.1 → 4.0.0-alpha.4

package/dist/commands/build/build.js

@@ -12,29 +12,28 @@
   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 fse from 'fs-extra';
-import getFederatedModule from '../../utils/getFederatedModule';
+*/ import getServer from './getServer.js';
+import installServer from './installServer.js';
+import runLowdefyBuild from './runLowdefyBuild.js';
+import runNextBuild from './runNextBuild.js';
 async function build({ context  }) {
-    const { default: buildScript  } = await getFederatedModule({
-        module: 'build',
-        packageName: '@lowdefy/build',
-        version: context.lowdefyVersion,
+    context.print.info('Starting build.');
+    await getServer({
         context
     });
-    context.print.log(`Cleaning block meta cache at "${path.resolve(context.cacheDirectory, './meta')}".`);
-    await fse.emptyDir(path.resolve(context.cacheDirectory, './meta'));
-    context.print.info('Starting build.');
-    await buildScript({
-        blocksServerUrl: context.options.blocksServerUrl,
-        buildDirectory: context.buildDirectory,
-        cacheDirectory: context.cacheDirectory,
-        configDirectory: context.baseDirectory,
-        logger: context.print,
-        refResolver: context.options.refResolver
+    await installServer({
+        context
+    });
+    await runLowdefyBuild({
+        context
+    });
+    await installServer({
+        context
+    });
+    await runNextBuild({
+        context
     });
     await context.sendTelemetry();
-    context.print.log(`Build artifacts saved at ${context.buildDirectory}.`);
     context.print.succeed(`Build successful.`);
 }
 export default build;

package/dist/commands/build/getServer.js

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

package/dist/commands/build/installServer.js

@@ -0,0 +1,43 @@
+/*
+  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 '../../utils/spawnProcess.js';
+const args = {
+    npm: [
+        'install',
+        '--legacy-peer-deps'
+    ],
+    yarn: [
+        'install'
+    ]
+};
+async function installServer({ context  }) {
+    context.print.spin(`Running ${context.packageManager} install.`);
+    try {
+        await spawnProcess({
+            context,
+            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;

package/dist/commands/build/runLowdefyBuild.js

@@ -0,0 +1,41 @@
+/*
+  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 '../../utils/spawnProcess.js';
+async function runLowdefyBuild({ context  }) {
+    context.print.log('Running Lowdefy build.');
+    try {
+        await spawnProcess({
+            context,
+            command: context.packageManager,
+            args: [
+                'run',
+                'build:lowdefy'
+            ],
+            processOptions: {
+                cwd: context.directories.server,
+                env: {
+                    ...process.env,
+                    LOWDEFY_BUILD_DIRECTORY: context.directories.build,
+                    LOWDEFY_CONFIG_DIRECTORY: context.directories.base
+                }
+            },
+            silent: false
+        });
+    } catch (error) {
+        throw new Error('Lowdefy build failed.');
+    }
+    context.print.log('Lowdefy build successful.');
+}
+export default runLowdefyBuild;

package/dist/commands/build/runNextBuild.js

@@ -0,0 +1,36 @@
+/*
+  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 '../../utils/spawnProcess.js';
+async function runNextBuild({ context  }) {
+    context.print.log('Running Next build.');
+    try {
+        await spawnProcess({
+            context,
+            command: context.packageManager,
+            args: [
+                'run',
+                'build:next'
+            ],
+            processOptions: {
+                cwd: context.directories.server
+            },
+            silent: false
+        });
+    } catch (error) {
+        throw new Error('Next build failed.');
+    }
+    context.print.log('Next build successful.');
+}
+export default runNextBuild;

package/dist/index.js

@@ -14,35 +14,16 @@
   limitations under the License.
 */ import { readFile } from '@lowdefy/node-utils';
 import program from 'commander';
-// import build from './commands/build/build.js';
+import build from './commands/build/build.js';
 // import dev from './commands/dev/dev.js';
 import init from './commands/init/init.js';
 import runCommand from './utils/runCommand.js';
 const packageJson = JSON.parse(await readFile(new URL('../package.json', import.meta.url).pathname));
 const { description , version  } = packageJson;
 program.name('lowdefy').description(description).version(version, '-v, --version');
-// program
-//   .command('build')
-//   .description('Build a Lowdefy deployment.')
-//   .usage(`[options]`)
-//   .option(
-//     '--base-directory <base-directory>',
-//     'Change base directory. Default is the current working directory.'
-//   )
-//   .option(
-//     '--blocks-server-url <blocks-server-url>',
-//     'The URL from where Lowdefy blocks will be served.'
-//   )
-//   .option('--disable-telemetry', 'Disable telemetry.')
-//   .option(
-//     '--output-directory <output-directory>',
-//     'Change the directory to which build artifacts are saved. Default is "<base-directory>/.lowdefy/build".'
-//   )
-//   .option(
-//     '--ref-resolver <ref-resolver-function-path>',
-//     'Path to a JavaScript file containing a _ref resolver function to be used as the app default _ref resolver.'
-//   )
-//   .action(runCommand(build));
+program.command('build').description('Build a Lowdefy deployment.').usage(`[options]`).option('--base-directory <base-directory>', 'Change base directory. Default is the current working directory.').option('--blocks-server-url <blocks-server-url>', 'The URL from where Lowdefy blocks will be served.').option('--disable-telemetry', 'Disable telemetry.').option('--output-directory <output-directory>', 'Change the directory to which build artifacts are saved. Default is "<base-directory>/.lowdefy/build".').option('--package-manager <package-manager>', 'The package manager to user. Options are "npm" or "yarn".').option('--ref-resolver <ref-resolver-function-path>', 'Path to a JavaScript file containing a _ref resolver function to be used as the app default _ref resolver.').action(runCommand({
+    cliVersion: version
+})(build));
 // program
 //   .command('dev')
 //   .description('Start a Lowdefy development server.')
@@ -69,7 +50,7 @@ program.name('lowdefy').description(description).version(version, '-v, --version
 //     '--watch-ignore <paths...>',
 //     'A list of paths to files or directories that should be ignored by the file watcher. Globs are supported.'
 //   )
-//   .action(runCommand(dev));
+//   .action(runCommand({ cliVersion: version })(dev));
 program.command('init').description('Initialize a Lowdefy project.').usage(`[options]`).action(runCommand({
     cliVersion: version
 })(init));

package/dist/utils/checkForUpdatedVersions.js

@@ -14,6 +14,14 @@
   limitations under the License.
 */ import axios from 'axios';
 async function checkForUpdatedVersions({ cliVersion , lowdefyVersion , print  }) {
+    if (isExperimentalVersion(cliVersion) || isExperimentalVersion(lowdefyVersion)) {
+        print.warn(`
+---------------------------------------------------
+  You are using an experimental version of Lowdefy.
+  Features may change at any time.
+---------------------------------------------------`);
+        return;
+    }
     const registryUrl = 'https://registry.npmjs.org/lowdefy';
     try {
         const packageInfo = await axios.get(registryUrl);
@@ -39,4 +47,7 @@ async function checkForUpdatedVersions({ cliVersion , lowdefyVersion , print  })
         print.warn('Failed to check for latest Lowdefy version.');
     }
 }
+function isExperimentalVersion(version) {
+    return version.includes('alpha') || version.includes('beta') || version.includes('rc');
+}
 export default checkForUpdatedVersions;

package/dist/utils/fetchNpmTarball.js

@@ -49,7 +49,8 @@ async function fetchNpmTarball({ packageName , version , directory  }) {
     await decompress(tarball.data, directory, {
         plugins: [
             decompressTargz()
-        ]
+        ],
+        strip: 1
     });
 }
 export default fetchNpmTarball;

package/dist/utils/getDirectories.js

@@ -14,14 +14,17 @@
   limitations under the License.
 */ import path from 'path';
 function getDirectories({ baseDirectory , options  }) {
-    let buildDirectory;
+    let dotLowdefy;
     if (options.outputDirectory) {
-        buildDirectory = path.resolve(options.outputDirectory);
+        dotLowdefy = path.resolve(options.outputDirectory);
     } else {
-        buildDirectory = path.resolve(baseDirectory, './.lowdefy/build');
+        dotLowdefy = path.resolve(baseDirectory, '.lowdefy');
     }
     return {
-        buildDirectory
+        base: baseDirectory,
+        build: path.join(dotLowdefy, 'server', 'build'),
+        dotLowdefy,
+        server: path.join(dotLowdefy, 'server')
     };
 }
 export default getDirectories;

package/dist/utils/getLowdefyYaml.js

@@ -41,8 +41,8 @@ async function getLowdefyYaml({ baseDirectory , command  }) {
     if (!lowdefy.lowdefy) {
         throw new Error(`No version specified in "lowdefy.yaml" file. Specify a version in the "lowdefy" field.`);
     }
-    if (!type.isString(lowdefy.lowdefy) || !lowdefy.lowdefy.match(/\d+\.\d+\.\d+(-\w+\.\d+)?/)) {
-        throw new Error(`Version number specified in "lowdefy.yaml" file is not valid. Received ${JSON.stringify(lowdefy.lowdefy)}.`);
+    if (!type.isString(lowdefy.lowdefy)) {
+        throw new Error(`Version number specified in "lowdefy.yaml" file should be a string. Received ${JSON.stringify(lowdefy.lowdefy)}.`);
     }
     return {
         lowdefyVersion: lowdefy.lowdefy,

package/dist/utils/getPackageManager.js

@@ -0,0 +1,54 @@
+/*
+  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.
+*/ // Source https://github.com/vercel/next.js/blob/canary/packages/create-next-app/helpers/should-use-yarn.ts
+/*
+The MIT License (MIT)
+
+Copyright (c) 2021 Vercel, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/ import { execSync } from 'child_process';
+function getPackageManager({ options  }) {
+    if (options.packageManager) return options.packageManager;
+    try {
+        const userAgent = process.env.npm_config_user_agent;
+        if (userAgent && userAgent.startsWith('yarn')) {
+            return 'yarn';
+        }
+        execSync('yarnpkg --version', {
+            stdio: 'ignore'
+        });
+        return 'yarn';
+    } catch (e) {
+        return 'npm';
+    }
+}
+export default getPackageManager;

package/dist/utils/print.js

@@ -60,6 +60,7 @@ function createBasicPrint() {
 // Memoise print so that error handler can get the same spinner object
 let print;
 function createPrint() {
+    // TODO: Add debug
     if (print) return print;
     if (process.env.CI === 'true') {
         print = createBasicPrint();

package/dist/utils/spawnProcess.js

@@ -0,0 +1,49 @@
+/*
+  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 { spawn } from 'child_process';
+async function spawnProcess({ context , command , args , processOptions , silent  }) {
+    return new Promise((resolve, reject)=>{
+        const process = spawn(command, args, processOptions);
+        process.stdout.on('data', (data)=>{
+            if (!silent) {
+                data.toString('utf8').split('\n').forEach((line)=>{
+                    if (line) {
+                        context.print.log(line);
+                    }
+                });
+            }
+        });
+        process.stderr.on('data', (data)=>{
+            if (!silent) {
+                data.toString('utf8').split('\n').forEach((line)=>{
+                    if (line) {
+                        context.print.warn(line);
+                    }
+                });
+            }
+        });
+        process.on('error', (error)=>{
+            console.log(error);
+            reject(error);
+        });
+        process.on('exit', (code)=>{
+            if (code !== 0) {
+                reject(new Error(`${command} exited with code ${code}`));
+            }
+            resolve();
+        });
+    });
+}
+export default spawnProcess;

package/dist/utils/startUp.js

@@ -19,6 +19,7 @@ import getCliJson from './getCliJson.js';
 import getDirectories from './getDirectories.js';
 import getLowdefyYaml from './getLowdefyYaml.js';
 import getOptions from './getOptions.js';
+import getPackageManager from './getPackageManager.js';
 import getSendTelemetry from './getSendTelemetry.js';
 import createPrint from './print.js';
 async function startUp({ context , options ={
@@ -33,8 +34,8 @@ async function startUp({ context , options ={
     const { appId  } = await getCliJson(context);
     context.appId = appId;
     context.options = getOptions(context);
-    const { buildDirectory  } = getDirectories(context);
-    context.buildDirectory = buildDirectory;
+    context.directories = getDirectories(context);
+    context.packageManager = getPackageManager(context);
     await checkForUpdatedVersions(context);
     context.sendTelemetry = getSendTelemetry(context);
     if (type.isNone(lowdefyVersion)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowdefy",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-alpha.4",
   "license": "Apache-2.0",
   "description": "Lowdefy CLI",
   "homepage": "https://lowdefy.com",
@@ -40,8 +40,8 @@
     "test": "FORCE_COLOR=3 jest --coverage"
   },
   "dependencies": {
-    "@lowdefy/helpers": "4.0.0-alpha.1",
-    "@lowdefy/node-utils": "4.0.0-alpha.1",
+    "@lowdefy/helpers": "4.0.0-alpha.4",
+    "@lowdefy/node-utils": "4.0.0-alpha.4",
     "axios": "0.24.0",
     "chalk": "4.1.2",
     "chokidar": "3.5.2",
@@ -64,5 +64,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c97a8fa6b5a641e7d50df09f5601a9c586eeb65a"
+  "gitHead": "537d166ba3f6e017b8a61c2a7e5c12fd0a48bf67"
 }

package/dist/utils/checkChildProcessError.js

@@ -1,21 +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.
-*/ function checkChildProcessError({ context , processOutput , message  }) {
-    if (processOutput.status === 1) {
-        context.print.error(processOutput.stderr.toString('utf8'));
-        throw new Error(message);
-    }
-}
-export default checkChildProcessError;