@webiny/cli 5.17.4 → 5.18.0-beta.3

package/CHANGELOG.md

@@ -3,6 +3,62 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.18.0-beta.3](https://github.com/webiny/webiny-js/compare/v5.18.0-beta.2...v5.18.0-beta.3) (2021-11-22)
+
+
+### Bug Fixes
+
+* remove context ([ec4566a](https://github.com/webiny/webiny-js/commit/ec4566af26fe67cc7cb26728e7f65e54e7f16968))
+
+
+
+
+
+# [5.18.0-beta.2](https://github.com/webiny/webiny-js/compare/v5.18.0-beta.1...v5.18.0-beta.2) (2021-11-21)
+
+**Note:** Version bump only for package @webiny/cli
+
+
+
+
+
+# [5.18.0-beta.1](https://github.com/webiny/webiny-js/compare/v5.18.0-beta.0...v5.18.0-beta.1) (2021-11-19)
+
+
+### Bug Fixes
+
+* improve logging ([2dd751f](https://github.com/webiny/webiny-js/commit/2dd751fffb52a407cb5679bb7395e7601dea9463))
+
+
+
+
+
+# [5.18.0-beta.0](https://github.com/webiny/webiny-js/compare/v5.17.4...v5.18.0-beta.0) (2021-11-19)
+
+
+### Bug Fixes
+
+* adjust messaging ([3c867c6](https://github.com/webiny/webiny-js/commit/3c867c6b0ca59ad579f8a605afe5f94f8bccfef9))
+* adjust messaging ([ce0cfd6](https://github.com/webiny/webiny-js/commit/ce0cfd65552552370053855567782e2847b3f956))
+* determine target upgrade version using `package.json` / `semver` ([4a3e10f](https://github.com/webiny/webiny-js/commit/4a3e10fafbe63fe3a822083ecf52a95c714e9f61))
+* remove old upgrade scripts ([c34f40a](https://github.com/webiny/webiny-js/commit/c34f40ab76d4c7c85087553884b64813b0b9e4eb))
+* remove unneeded dependencies ([dabf981](https://github.com/webiny/webiny-js/commit/dabf98163bbc5c6cf4a382c3197cf64ea6337a25))
+* update dependencies ([d69c6be](https://github.com/webiny/webiny-js/commit/d69c6be8ac22ad732012b9f81a035e93d3df674d))
+* use "blueBright" for info ([e0b96fd](https://github.com/webiny/webiny-js/commit/e0b96fdb5939d6a0b9dac359a57e2ed3f4c42fd5))
+* use debug function instead of chalk ([dc94492](https://github.com/webiny/webiny-js/commit/dc94492056e1882b15800209d844fd5b5ab212b1))
+* use fast-glob lib ([eff106b](https://github.com/webiny/webiny-js/commit/eff106b3e6a3f2e806df86209596b2672f81949f))
+
+
+### Features
+
+* add "packages" getter ([77dc207](https://github.com/webiny/webiny-js/commit/77dc207b90dc9b85d3f516d18df9505f12ecf3d3))
+* add packageJson ([204135a](https://github.com/webiny/webiny-js/commit/204135aaa8021b8fc3e91dd73d2b8b338ea1f728))
+* run upgrade scripts from a remote code repository ([3c0cc49](https://github.com/webiny/webiny-js/commit/3c0cc490b155a1331c5132dbe0f0fca0af0a4e58))
+
+
+
+
+
 ## [5.17.4](https://github.com/webiny/webiny-js/compare/v5.17.4-beta.1...v5.17.4) (2021-11-19)
 
 **Note:** Version bump only for package @webiny/cli

package/commands/upgrade/index.js

@@ -1,5 +1,6 @@
 const { red } = require("chalk");
 const execa = require("execa");
+const semver = require("semver");
 
 module.exports = [
     {
@@ -16,6 +17,16 @@ module.exports = [
                         type: "boolean",
                         default: false
                     });
+                    yargs.option("debug", {
+                        default: false,
+                        describe: `Turn on debug logs`,
+                        type: "boolean"
+                    });
+                    yargs.option("use-version", {
+                        describe:
+                            "Use upgrade script for a specific version. Should only be used for development/testing purposes.",
+                        type: "string"
+                    });
                 },
                 async argv => {
                     if (!argv.skipChecks) {
@@ -45,20 +56,50 @@ module.exports = [
                         }
                     }
 
-                    const { canUpgrade, upgrade } = require("./upgrades/upgrade");
-                    if (typeof canUpgrade === "function" && !argv.skipChecks) {
-                        try {
-                            const canPerformUpgrade = await canUpgrade(argv, context);
-                            if (canPerformUpgrade === false) {
-                                throw new Error();
+                    const defaultUpgradeTargetVersion = semver.coerce(context.version).version;
+
+                    const command = [
+                        "https://github.com/webiny/webiny-upgrades",
+                        argv.useVersion || defaultUpgradeTargetVersion
+                    ];
+
+                    if (yargs.argv.debug) {
+                        context.debug("npx", ...command);
+                    }
+
+                    const npx = execa("npx", command, {
+                        env: {
+                            FORCE_COLOR: true
+                        }
+                    });
+
+                    npx.stdout.on("data", data => {
+                        const lines = data.toString().replace(/\n$/, "").split("\n");
+                        for (let i = 0; i < lines.length; i++) {
+                            const line = lines[i];
+                            try {
+                                const json = JSON.parse(line);
+                                if (json.type === "error") {
+                                    context.error(
+                                        "An error occurred while performing the upgrade."
+                                    );
+                                    console.log(json.message);
+                                    if (yargs.argv.debug) {
+                                        context.debug(json.data.stack);
+                                    }
+                                }
+                            } catch {
+                                // Not JSON, let's just print the line then.
+                                console.log(line);
                             }
-                        } catch (ex) {
-                            const msg = ex.message || "unknown";
-                            throw new Error(`Upgrade failed. Reason: ${msg}`);
                         }
-                    }
+                    });
+
+                    npx.stderr.on("data", data => {
+                        console.log(data.toString());
+                    });
 
-                    await upgrade(argv, context);
+                    await npx;
                 }
             );
         }

package/context.js

@@ -1,6 +1,5 @@
 const fs = require("fs");
 const path = require("path");
-const chalk = require("chalk");
 const { importModule, getProject, PluginsContainer, log, localStorage } = require("./utils");
 
 const project = getProject();
@@ -117,7 +116,7 @@ class Context {
         }
 
         if (!fs.existsSync(filePath)) {
-            debug && this.info(chalk.yellow(`No environment file found on ${filePath}.`));
+            debug && this.debug(`No environment file found on ${this.debug.hl(filePath)}.`);
             return;
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/cli",
-	"version": "5.17.4",
+	"version": "5.18.0-beta.3",
 	"main": "index.js",
 	"bin": {
 		"webiny": "./bin.js"
@@ -13,7 +13,7 @@
 	"author": "Pavel Denisjuk <pavel@webiny.com>",
 	"description": "A tool to bootstrap a Webiny project.",
 	"dependencies": {
-		"@webiny/telemetry": "5.17.4",
+		"@webiny/telemetry": "5.18.0-beta.3",
 		"boolean": "3.1.4",
 		"camelcase": "5.3.1",
 		"chalk": "4.1.2",
@@ -21,24 +21,12 @@
 		"execa": "2.1.0",
 		"fast-glob": "3.2.7",
 		"find-up": "5.0.0",
-		"fs-extra": "7.0.1",
-		"load-json-file": "6.2.0",
-		"ncp": "2.0.0",
 		"pirates": "4.0.1",
-		"prettier": "2.4.1",
-		"replace-in-path": "1.1.0",
-		"rimraf": "3.0.2",
 		"semver": "7.3.4",
-		"ts-morph": "11.0.3",
 		"typescript": "4.1.3",
 		"uniqid": "5.4.0",
-		"write-json-file": "4.3.0",
 		"yargs": "14.2.3"
 	},
-	"devDependencies": {
-		"@webiny/handler": "^5.17.4",
-		"@webiny/plugins": "^5.17.4"
-	},
 	"license": "MIT",
 	"publishConfig": {
 		"access": "public",
@@ -56,6 +44,7 @@
 				"@webiny/project-utils",
 				"@webiny/api-file-manager",
 				"@webiny/cli-plugin-deploy-pulumi",
+				"@webiny/handler",
 				"@webiny/handler-http",
 				"@webiny/handler-args",
 				"@webiny/handler-client",
@@ -71,5 +60,5 @@
 			]
 		}
 	},
-	"gitHead": "bdfaa377704bf7f51d73561b4c6129f682bf24d2"
+	"gitHead": "9c86670476a62348ce391b091bf768e425ab6ee9"
 }

package/utils/getProjectApplication.js

@@ -1,7 +1,8 @@
-const { dirname, basename } = require("path");
+const { dirname, basename, join } = require("path");
 const findUp = require("find-up");
 const getProject = require("./getProject");
 const { importModule } = require("./importModule");
+const glob = require("fast-glob");
 
 const appConfigs = ["webiny.application.js", "webiny.application.ts"];
 
@@ -35,6 +36,28 @@ module.exports = args => {
         name,
         root: applicationRoot,
         config: applicationConfig,
-        project: getProject(args)
+        project: getProject(args),
+        get packages() {
+            const webinyConfigs = glob.sync(
+                join(applicationRoot, "**/webiny.config*.{ts,js}").replace(/\\/g, "/")
+            );
+
+            return webinyConfigs.map(config => {
+                const dirPath = dirname(config);
+                const packageJson = require(join(dirPath, "package.json"));
+                return {
+                    name: packageJson.name,
+                    paths: {
+                        root: dirname(config),
+                        packageJson: join(dirPath, "package.json"),
+                        config
+                    },
+                    packageJson,
+                    get config() {
+                        return require(config).default || require(config);
+                    }
+                };
+            });
+        }
     };
 };

package/utils/log.js

@@ -5,7 +5,7 @@ const getLogType = type => {
         case "log":
             return type;
         case "info":
-            return `${chalk.blue(type)}`;
+            return `${chalk.blueBright(type)}`;
         case "error":
             return `${chalk.red(type)}`;
         case "warning":
@@ -56,7 +56,7 @@ const functions = {
 functions.log.highlight = chalk.highlight;
 functions.log.hl = chalk.highlight;
 functions.info.highlight = chalk.blue;
-functions.info.hl = chalk.blue;
+functions.info.hl = chalk.blueBright;
 functions.success.highlight = chalk.green;
 functions.success.hl = chalk.green;
 functions.debug.highlight = chalk.gray;

package/commands/upgrade/upgrades/5.10.0/index.js

@@ -1,123 +0,0 @@
-const path = require("path");
-const targetVersion = "5.10.0";
-
-/**
- * @type {CliUpgradePlugin}
- */
-module.exports = {
-    name: "upgrade-5.10.0",
-    type: "cli-upgrade",
-    version: targetVersion,
-    /**
-     * @param options {CliUpgradePluginOptions}
-     * @param context {CliContext}
-     * @returns {Promise<boolean>}
-     */
-    async canUpgrade(options, context) {
-        if (context.version === targetVersion) {
-            return true;
-        } else if (
-            context.version.match(
-                new RegExp(
-                    /**
-                     * This is for beta testing.
-                     */
-                    `^${targetVersion}-`
-                )
-            )
-        ) {
-            return true;
-        }
-        throw new Error(
-            `Upgrade must be on Webiny CLI version "${targetVersion}". Current CLI version is "${context.version}".`
-        );
-    },
-
-    /**
-     * @param options {CliUpgradePluginOptions}
-     * @param context {CliContext}
-     * @returns {Promise<void>}
-     */
-    async upgrade(options, context) {
-        const { info } = context;
-        const glob = require("fast-glob");
-        const { upgradeLambdaConfig } = require("./upgradeLambdaConfig");
-        const {
-            upgradeGraphQLIndex,
-            upgradeHeadlessCMSIndex,
-            upgradeDynamoDbToElasticIndex
-        } = require("./upgradeApiFileManager");
-        const { upgradeDeliveryPath } = require("./upgradeDeliveryPath");
-        const { upgradeApolloCachePlugins } = require("./upgradeApolloCachePlugins");
-
-        const {
-            createMorphProject,
-            addPackagesToDependencies,
-            yarnInstall,
-            prettierFormat
-        } = require("../utils");
-
-        const files = await glob(
-            [
-                "api/pulumi/**/*.ts",
-                ...Object.values(upgradeGraphQLIndex.files),
-                ...Object.values(upgradeHeadlessCMSIndex.files),
-                ...Object.values(upgradeDynamoDbToElasticIndex.files),
-                ...Object.values(upgradeApolloCachePlugins.files)
-            ],
-            {
-                cwd: context.project.root,
-                onlyFiles: true,
-                ignore: ["**/node_modules/**"]
-            }
-        );
-
-        const project = createMorphProject(files);
-        await upgradeLambdaConfig(project, context);
-
-        /**
-         * Upgrade the graphql with new packages.
-         */
-        await upgradeGraphQLIndex(project, context);
-        /**
-         * Upgrade the headless cms with new packages.
-         */
-        await upgradeHeadlessCMSIndex(project, context);
-        /**
-         * Upgrade the dynamodbToElastic with new packages.
-         */
-        await upgradeDynamoDbToElasticIndex(project, context);
-
-        info("Adding dependencies...");
-
-        addPackagesToDependencies(path.resolve(process.cwd(), "api/code/graphql"), {
-            "@webiny/api-file-manager-ddb-es": targetVersion
-        });
-
-        /**
-         * Adds the Apollo Cache plugin to the Website's React application.
-         * Also, makes sure that both...
-         * packages/cwp-template-aws/template/apps/website/code/src/components/apolloClient.ts
-         * packages/cwp-template-aws/template/apps/admin/code/src/components/apolloClient.ts
-         *
-         * ... are using `plugins.byType<ApolloCacheObjectIdPlugin>` when setting `dataIdFromObject`
-         */
-        await upgradeApolloCachePlugins(project, context);
-
-        // Changes "/static-*" to "/static/*", in delivery.ts Pulumi file.
-        // Not using TS Morph, but a simple replace-in-path approach.
-        upgradeDeliveryPath({ context });
-
-        info("Writing changes...");
-        await project.save();
-
-        await prettierFormat(files, context);
-
-        /**
-         * Install new packages.
-         */
-        await yarnInstall({
-            context
-        });
-    }
-};

package/commands/upgrade/upgrades/5.10.0/upgradeApiFileManager.js

@@ -1,111 +0,0 @@
-const { Node } = require("ts-morph");
-const importPath = "@webiny/api-file-manager-ddb-es";
-const importedVariableName = "fileManagerDynamoDbElasticPlugins";
-
-const FM_FILES = { index: "api/code/graphql/src/index.ts" };
-const CMS_FILES = { index: "api/code/headlessCMS/src/index.ts" };
-const DDB2ES_FILES = { index: "api/code/dynamoToElastic/src/index.ts" };
-
-const pluginElasticsearchClientImportPath = "@webiny/api-plugin-elastic-search-client";
-
-const isFileManagerPlugins = node => {
-    return Node.isCallExpression(node) && node.getExpression().getText() === "fileManagerPlugins";
-};
-
-const upgradeGraphQLIndex = async (project, context) => {
-    const { info } = context;
-    info(`Upgrading ${info.hl(FM_FILES.index)}`);
-
-    const source = project.getSourceFile(FM_FILES.index);
-
-    const fileManagerDynamoDbElasticPluginsImport = source.getImportDeclaration(importPath);
-    if (fileManagerDynamoDbElasticPluginsImport) {
-        info(`Import ${info.hl(importPath)} already exists in ${info.hl(FM_FILES.index)}.`);
-        return;
-    }
-    const lastImport = source.getImportDeclarations().pop();
-    if (lastImport) {
-        source.insertImportDeclaration(lastImport.getChildIndex() + 1, {
-            defaultImport: importedVariableName,
-            moduleSpecifier: importPath
-        });
-    }
-
-    // Try fetching plugins from handler config object
-    const plugins = source.getFirstDescendant(
-        node => Node.isPropertyAssignment(node) && node.getName() === "plugins"
-    );
-
-    /**
-     * Add new the DynamoDB/Elasticsearch plugins to the array of plugins.
-     */
-    if (plugins) {
-        // New "createHandler" syntax
-        const fileManagerPlugins = plugins
-            .getInitializer()
-            .getElements()
-            .findIndex(isFileManagerPlugins);
-
-        if (fileManagerPlugins > -1) {
-            plugins
-                .getInitializer()
-                .insertElement(fileManagerPlugins + 1, `${importedVariableName}()`);
-        }
-    } else {
-        // Old "createHandler" syntax
-        const plugins = file.getFirstDescendant(
-            node =>
-                Node.isCallExpression(node) && node.getExpression().getText() === "createHandler"
-        );
-
-        const fileManagerPlugins = plugins.getArguments().findIndex(isFileManagerPlugins);
-        if (fileManagerPlugins > -1) {
-            plugins.insertArgument(fileManagerPlugins + 1, `${importedVariableName}()`);
-        }
-    }
-
-    /**
-     * Find the position of the file manager plugins in the createHandler.plugins array.
-     */
-
-    replaceElasticsearchImportDeclarationPath(source);
-};
-
-const upgradeHeadlessCMSIndex = async (project, context) => {
-    const { info } = context;
-    info(`Upgrading ${info.hl(CMS_FILES.index)}`);
-
-    const source = project.getSourceFile(CMS_FILES.index);
-    replaceElasticsearchImportDeclarationPath(source);
-};
-
-const upgradeDynamoDbToElasticIndex = async (project, context) => {
-    const { info } = context;
-    info(`Upgrading ${info.hl(DDB2ES_FILES.index)}`);
-
-    const source = project.getSourceFile(DDB2ES_FILES.index);
-    replaceElasticsearchImportDeclarationPath(source);
-};
-
-const replaceElasticsearchImportDeclarationPath = source => {
-    /**
-     * Find the old package and replace it with the "api-elasticsearch".
-     */
-    const elasticsearchImportDeclaration = source.getImportDeclaration(
-        pluginElasticsearchClientImportPath
-    );
-
-    if (elasticsearchImportDeclaration) {
-        elasticsearchImportDeclaration.setModuleSpecifier("@webiny/api-elasticsearch");
-    }
-};
-
-upgradeGraphQLIndex.files = FM_FILES;
-upgradeHeadlessCMSIndex.files = CMS_FILES;
-upgradeDynamoDbToElasticIndex.files = DDB2ES_FILES;
-
-module.exports = {
-    upgradeGraphQLIndex,
-    upgradeHeadlessCMSIndex,
-    upgradeDynamoDbToElasticIndex
-};

package/commands/upgrade/upgrades/5.10.0/upgradeApolloCachePlugins.js

@@ -1,114 +0,0 @@
-const { Node } = require("ts-morph");
-
-const FILES = {
-    websitePbPlugins: "apps/website/code/src/plugins/pageBuilder.ts",
-    websiteApolloClient: "apps/website/code/src/components/apolloClient.ts"
-};
-
-const upgradeApolloCachePlugins = async (tsmProject, context) => {
-    const { info } = context;
-
-    info(`Updating ${info.hl(upgradeApolloCachePlugins.files.websitePbPlugins)}`);
-
-    // 1. Update Apollo Clients...
-    {
-        let source = tsmProject.getSourceFile(FILES.websiteApolloClient);
-        const dataIdFromObjectProperty = source.getFirstDescendant(node => {
-            if (Node.isPropertyAssignment(node) && node.getName() === "dataIdFromObject") {
-                return node;
-            }
-        });
-
-        dataIdFromObjectProperty.setInitializer(dataIdFromObjectValueInitializer);
-
-        const pluginsImport = source.getImportDeclaration("@webiny/plugins");
-        const index = source.getImportDeclarations().pop().getChildIndex() + 1;
-        if (!pluginsImport) {
-            source.insertImportDeclaration(index, {
-                defaultImport: "{ plugins }",
-                moduleSpecifier: "@webiny/plugins"
-            });
-        }
-
-        const apolloCachePluginImport = source.getImportDeclaration(
-            "@webiny/app/plugins/ApolloCacheObjectIdPlugin"
-        );
-
-        if (!apolloCachePluginImport) {
-            source.insertImportDeclaration(index + 1, {
-                defaultImport: "{ ApolloCacheObjectIdPlugin }",
-                moduleSpecifier: "@webiny/app/plugins/ApolloCacheObjectIdPlugin"
-            });
-        }
-
-        // Remove old `if` statement
-        const ifStatement = source.getFirstDescendant(
-            node => Node.isIfStatement(node) && node.getFullText().includes("REACT_APP_ENV")
-        );
-
-        if (ifStatement) {
-            ifStatement.remove();
-        }
-
-        // Remove `isProduction` variable
-        const isProduction = source.getFirstDescendant(
-            node => Node.isVariableDeclaration(node) && node.getName() === "isProduction"
-        );
-
-        if (isProduction) {
-            isProduction.remove();
-        }
-    }
-
-    // 2. Update "apps/website/code/src/plugins/pageBuilder.ts"...
-    {
-        let source = tsmProject.getSourceFile(FILES.websitePbPlugins);
-
-        const apolloCachePluginImport = source.getImportDeclaration(
-            "@webiny/app-page-builder/render/plugins/apolloCacheObjectId"
-        );
-
-        if (!apolloCachePluginImport) {
-            const index = source.getImportDeclarations().pop().getChildIndex() + 1;
-
-            source.insertImportDeclaration(index, {
-                defaultImport: "apolloCacheObjectId",
-                moduleSpecifier: "@webiny/app-page-builder/render/plugins/apolloCacheObjectId"
-            });
-
-            const defaultExport = source.getFirstDescendant(node => Node.isExportAssignment(node));
-            const exportedArray = defaultExport.getFirstDescendant(node =>
-                Node.isArrayLiteralExpression(node)
-            );
-            exportedArray.addElement("apolloCacheObjectId");
-        }
-    }
-};
-
-upgradeApolloCachePlugins.files = FILES;
-
-module.exports = {
-    upgradeApolloCachePlugins
-};
-
-const dataIdFromObjectValueInitializer = `obj => {
-            /**
-             * Since every data type coming from API can have a different data structure,
-             * we cannot rely on having an \`id\` field.
-             */
-            const getters = plugins.byType<ApolloCacheObjectIdPlugin>(
-                ApolloCacheObjectIdPlugin.type
-            );
-
-            for (let i = 0; i < getters.length; i++) {
-                const id = getters[i].getObjectId(obj);
-                if (typeof id !== "undefined") {
-                    return id;
-                }
-            }
-
-            /**
-             * As a fallback, try getting object's \`id\`.
-             */
-            return obj.id || null;
-        }`;

package/commands/upgrade/upgrades/5.10.0/upgradeDeliveryPath.js

@@ -1,19 +0,0 @@
-const { replaceInPath } = require("replace-in-path");
-const path = require("path");
-
-const upgradeDeliveryPath = ({ context }) => {
-    const { info } = context;
-    info(`Updating ${info.hl("delivery")} CloudFront distribution's cache behaviours...`);
-
-    const replacement = {
-        find: `pathPattern: "\\/static-\\*"`,
-        replaceWith: `pathPattern: "/static/*"`
-    };
-
-    replaceInPath(path.join(context.project.root, "apps", "site", "**/*.ts"), replacement);
-    replaceInPath(path.join(context.project.root, "apps", "website", "**/*.ts"), replacement);
-};
-
-module.exports = {
-    upgradeDeliveryPath
-};

package/commands/upgrade/upgrades/5.10.0/upgradeLambdaConfig.js

@@ -1,30 +0,0 @@
-const { Node, SyntaxKind } = require("ts-morph");
-
-module.exports.upgradeLambdaConfig = (project, context) => {
-    context.info("Updating Lambda runtime and layers...");
-
-    const sourceFiles = project.getSourceFiles("api/pulumi/**/*.ts");
-    for (const file of sourceFiles) {
-        file.getDescendantsOfKind(SyntaxKind.PropertyAccessExpression)
-            .filter(node => node.getText() === "aws.lambda.Function")
-            .forEach(lambda => {
-                lambda.getParent().forEachDescendant(node => {
-                    // Update runtime
-                    if (Node.isPropertyAssignment(node) && node.getName() === "runtime") {
-                        const string = node.getInitializer();
-                        if (string.getLiteralValue() === "nodejs10.x") {
-                            string.setLiteralValue("nodejs12.x");
-                        }
-                    }
-
-                    // Update layer
-                    if (
-                        Node.isStringLiteral(node) &&
-                        node.getLiteralValue() === "webiny-v4-sharp"
-                    ) {
-                        node.setLiteralValue("sharp");
-                    }
-                });
-            });
-    }
-};