@webiny/cli 5.17.4-beta.1 → 5.18.0-beta.2

package/commands/upgrade/upgrades/5.13.0/createTypesTsFiles.js

@@ -1,101 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-
-const createTypesTsFiles = async context => {
-    const { info, project, version } = context;
-
-    const { addPackagesToDependencies } = require("../utils");
-
-    info(`Creating new ${info.hl("types.ts")} files...`);
-
-    {
-        const src = path.join(__dirname, "files", "types", "graphql.ts");
-        const destFolder = path.join(project.root, "api", "code", "graphql", "src");
-        const dest = path.join(destFolder, "types.ts");
-
-        if (fs.existsSync(destFolder)) {
-            fs.copyFileSync(src, dest);
-            info(`${info.hl(dest)} created.`);
-
-            // These types.ts include additional packages. Let's add them to dependencies.
-            const packageJsonFolder = path.join(project.root, "api", "code", "graphql");
-
-            info(`Updating dependencies in ${info.hl(packageJsonFolder)}...`);
-
-            if (fs.existsSync(packageJsonFolder)) {
-                const packages = {
-                    "@webiny/handler": version,
-                    "@webiny/handler-http": version,
-                    "@webiny/handler-args": version,
-                    "@webiny/handler-client": version,
-                    "@webiny/api-elasticsearch": version,
-                    "@webiny/api-tenancy": version,
-                    "@webiny/api-security": version,
-                    "@webiny/api-i18n": version,
-                    "@webiny/api-i18n-content": version,
-                    "@webiny/api-page-builder": version,
-                    "@webiny/api-prerendering-service": version,
-                    "@webiny/api-file-manager": version,
-                    "@webiny/api-form-builder": version
-                };
-
-                addPackagesToDependencies(packageJsonFolder, packages);
-                info(`Dependencies in ${info.hl(packageJsonFolder)} successfully updated.`);
-            } else {
-                info(
-                    `Could not update dependencies in ${info.hl(
-                        packageJsonFolder
-                    )} - file does not exist.`
-                );
-            }
-        } else {
-            info(`Could not create ${info.hl(dest)}, folder does not exist.`);
-        }
-    }
-
-    {
-        const src = path.join(__dirname, "files", "types", "headlessCMS.ts");
-        const destFolder = path.join(project.root, "api", "code", "headlessCMS", "src");
-        const dest = path.join(destFolder, "types.ts");
-
-        if (fs.existsSync(destFolder)) {
-            fs.copyFileSync(src, dest);
-            info(`${info.hl(dest)} created.`);
-
-            // These types.ts include additional packages. Let's add them to dependencies.
-            const packageJsonFolder = path.join(project.root, "api", "code", "headlessCMS");
-
-            info(`Updating dependencies in ${info.hl(packageJsonFolder)}...`);
-
-            if (fs.existsSync(packageJsonFolder)) {
-                const packages = {
-                    "@webiny/handler": version,
-                    "@webiny/handler-http": version,
-                    "@webiny/handler-args": version,
-                    "@webiny/handler-client": version,
-                    "@webiny/api-elasticsearch": version,
-                    "@webiny/api-security": version,
-                    "@webiny/api-i18n": version,
-                    "@webiny/api-i18n-content": version,
-                    "@webiny/api-tenancy": version,
-                    "@webiny/api-headless-cms": version
-                };
-
-                addPackagesToDependencies(packageJsonFolder, packages);
-                info(`Dependencies in ${info.hl(packageJsonFolder)} successfully updated.`);
-            } else {
-                info(
-                    `Could not update dependencies in ${info.hl(
-                        packageJsonFolder
-                    )} - file does not exist.`
-                );
-            }
-        } else {
-            info(`Could not create ${info.hl(dest)}, folder does not exist.`);
-        }
-    }
-};
-
-module.exports = {
-    createTypesTsFiles
-};

package/commands/upgrade/upgrades/5.13.0/files/types/graphql.ts

@@ -1,34 +0,0 @@
-import { HandlerContext } from "@webiny/handler/types";
-import { HttpContext } from "@webiny/handler-http/types";
-import { ArgsContext } from "@webiny/handler-args/types";
-import { ClientContext } from "@webiny/handler-client/types";
-import { ElasticsearchContext } from "@webiny/api-elasticsearch/types";
-import { TenancyContext } from "@webiny/api-tenancy/types";
-import { SecurityContext } from "@webiny/api-security/types";
-import { I18NContext } from "@webiny/api-i18n/types";
-import { BaseI18NContentContext as I18NContentContext } from "@webiny/api-i18n-content/types";
-import { PbContext } from "@webiny/api-page-builder/graphql/types";
-import { PrerenderingServiceClientContext } from "@webiny/api-prerendering-service/client/types";
-import { FileManagerContext } from "@webiny/api-file-manager/types";
-import { FormBuilderContext } from "@webiny/api-form-builder/types";
-
-// When working with the `context` object (for example while defining a new GraphQL resolver function),
-// you can import this interface and assign it to it. This will give you full autocomplete functionality
-// and type safety. The easiest way to import it would be via the following import statement:
-// import { Context } from "~/types";
-// Feel free to extend it with additional context interfaces, if needed. Also, please do not change the
-// name of the interface, as existing scaffolding utilities may rely on it during the scaffolding process.
-export interface Context
-    extends HandlerContext,
-        HttpContext,
-        ArgsContext,
-        ClientContext,
-        ElasticsearchContext,
-        TenancyContext,
-        SecurityContext,
-        I18NContext,
-        I18NContentContext,
-        PbContext,
-        PrerenderingServiceClientContext,
-        FileManagerContext,
-        FormBuilderContext {}

package/commands/upgrade/upgrades/5.13.0/files/types/headlessCMS.ts

@@ -1,28 +0,0 @@
-import { HandlerContext } from "@webiny/handler/types";
-import { HttpContext } from "@webiny/handler-http/types";
-import { ArgsContext } from "@webiny/handler-args/types";
-import { ClientContext } from "@webiny/handler-client/types";
-import { ElasticsearchContext } from "@webiny/api-elasticsearch/types";
-import { SecurityContext } from "@webiny/api-security/types";
-import { I18NContext } from "@webiny/api-i18n/types";
-import { BaseI18NContentContext as I18NContentContext } from "@webiny/api-i18n-content/types";
-import { TenancyContext } from "@webiny/api-tenancy/types";
-import { CmsContext } from "@webiny/api-headless-cms/types";
-
-// When working with the `context` object (for example while defining a new GraphQL resolver function),
-// you can import this interface and assign it to it. This will give you full autocomplete functionality
-// and type safety. The easiest way to import it would be via the following import statement:
-// import { Context } from "~/types";
-// Feel free to extend it with additional context interfaces, if needed. Also, please do not change the
-// name of the interface, as existing scaffolding utilities may rely on it during the scaffolding process.
-export interface Context
-    extends HandlerContext,
-        HttpContext,
-        ArgsContext,
-        ClientContext,
-        TenancyContext,
-        ElasticsearchContext,
-        SecurityContext,
-        I18NContext,
-        I18NContentContext,
-        CmsContext {}

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

@@ -1,49 +0,0 @@
-const targetVersion = "5.13.0";
-
-module.exports = {
-    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}".`
-        );
-    },
-
-    async upgrade(options, context) {
-        const { createTypesTsFiles } = require("./createTypesTsFiles");
-        const { addNewScaffolds } = require("./addNewScaffolds");
-        const { addDotWebinyToGitIgnore } = require("./addDotWebinyToGitIgnore");
-
-        await addDotWebinyToGitIgnore(context);
-        await createTypesTsFiles(context);
-        await addNewScaffolds(context);
-
-        const { yarnInstall, prettierFormat } = require("../utils");
-
-        await yarnInstall({ context });
-
-        await prettierFormat(
-            [
-                "api/code/graphql/src/types.ts",
-                "api/code/graphql/package.json",
-                "api/code/headlessCMS/src/types.ts",
-                "api/code/headlessCMS/package.json",
-                "package.json",
-                "webiny.project.ts"
-            ],
-            context
-        );
-    }
-};

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

@@ -1,97 +0,0 @@
-const path = require("path");
-const glob = require("fast-glob");
-
-const {
-    createMorphProject,
-    addPackagesToDependencies,
-    yarnInstall,
-    prettierFormat
-} = require("../utils");
-
-const apiPageBuilderUpgrade = require("./upgradeApiPageBuilder");
-
-const targetVersion = "5.15.0";
-
-/**
- * @type {CliUpgradePlugin}
- */
-module.exports = {
-    name: `upgrade-${targetVersion}`,
-    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 files = await glob([
-            // add files here
-            ...Object.values(apiPageBuilderUpgrade.files)
-            //
-        ]);
-
-        const project = createMorphProject(files);
-        /**
-         * Upgrade the graphql with new page builder packages.
-         */
-        await apiPageBuilderUpgrade.upgradeGraphQLIndex(project, context);
-        /**
-         * Upgrade the page builder lambda with new packages.
-         */
-        await apiPageBuilderUpgrade.upgradePageBuilderIndex(project, context);
-
-        info("Adding dependencies...");
-
-        addPackagesToDependencies(context, path.resolve(process.cwd(), "api/code/graphql"), {
-            "@webiny/api-page-builder-so-ddb-es": context.version
-        });
-
-        addPackagesToDependencies(
-            context,
-            path.resolve(process.cwd(), "api/code/pageBuilder/updateSettings"),
-            {
-                "@webiny/api-page-builder-so-ddb-es": context.version
-            }
-        );
-
-        info("Writing changes...");
-        await project.save();
-
-        await prettierFormat(files, context);
-
-        /**
-         * Install new packages.
-         */
-        await yarnInstall({
-            context
-        });
-    }
-};

package/commands/upgrade/upgrades/5.15.0/upgradeApiPageBuilder.js

@@ -1,121 +0,0 @@
-const { addImportsToSource } = require("../utils");
-const tsMorph = require("ts-morph");
-const FILES = {
-    graphql: "api/code/graphql/src/index.ts",
-    pageBuilder: "api/code/pageBuilder/updateSettings/src/index.ts"
-};
-
-const { Node, VariableDeclarationKind } = tsMorph;
-
-const pageBuilderDdbEsPlugins = "pageBuilderDynamoDbElasticsearchPlugins";
-const pageBuilderPrerenderingPlugins = "pageBuilderPrerenderingPlugins";
-
-const upgradeGraphQLIndex = async (project, context) => {
-    const { info } = context;
-    const file = FILES.graphql;
-    info(`Upgrading ${info.hl(file)}`);
-
-    const source = project.getSourceFile(file);
-
-    addImportsToSource({
-        context,
-        source,
-        imports: [
-            {
-                elementName: pageBuilderDdbEsPlugins,
-                importPath: "@webiny/api-page-builder-so-ddb-es"
-            },
-            {
-                elementName: pageBuilderPrerenderingPlugins,
-                importPath: "@webiny/api-page-builder/prerendering"
-            }
-        ],
-        file
-    });
-};
-
-const upgradePageBuilderIndex = async (project, context) => {
-    const { info, error } = context;
-    const file = FILES.pageBuilder;
-    info(`Upgrading ${info.hl(file)}`);
-
-    const source = project.getSourceFile(file);
-    /**
-     * First we need to check for the existence of the debug flag
-     */
-    const debug = source.getFirstDescendant(
-        node => Node.isPropertyAssignment(node) && node.getName() === "debug"
-    );
-    if (!debug) {
-        /**
-         * Find last import declaration.
-         */
-        const importDeclarations = source
-            .getDescendants()
-            .filter(node => Node.isImportDeclaration(node));
-        if (importDeclarations.length > 0) {
-            /**
-             * We need to add the debug variable.
-             */
-            const lastDeclaration = importDeclarations[importDeclarations.length - 1];
-            const index = lastDeclaration.getChildIndex();
-            source.insertVariableStatement(index + 1, {
-                kind: tsMorph.VariableDeclaration,
-                declarationKind: VariableDeclarationKind.Const,
-                declarations: [
-                    {
-                        name: "debug",
-                        initializer: `process.env.DEBUG === "true"`,
-                        kind: "const"
-                    }
-                ]
-            });
-        } else {
-            error(`Missing import declarations. Cannot insert the "debug" variable.`);
-        }
-    }
-    /**
-     * Also, we need to check if we have the plugins in the createHandler.
-     */
-    const plugins = source.getFirstDescendant(
-        node => Node.isPropertyAssignment(node) && node.getName() === "plugins"
-    );
-    if (!plugins) {
-        const createHandler = source.getFirstDescendant(
-            node =>
-                Node.isCallExpression(node) && node.getExpression().getText() === "createHandler"
-        );
-        /**
-         * Get the arguments full text (function names + () )
-         */
-        const args = createHandler.getArguments().map(arg => {
-            return arg.getText();
-        });
-        /**
-         * Need to remove all existing arguments.
-         */
-        args.forEach(() => createHandler.removeArgument(0));
-        /**
-         * And in the end, add new argument that contains both plugins and http properties.
-         */
-        createHandler.addArgument(`{plugins: [${args.join(",")}], http: {debug}}`);
-    }
-
-    addImportsToSource({
-        context,
-        source,
-        imports: [
-            {
-                elementName: pageBuilderDdbEsPlugins,
-                importPath: "@webiny/api-page-builder-so-ddb-es"
-            }
-        ],
-        file
-    });
-};
-
-module.exports = {
-    upgradeGraphQLIndex,
-    upgradePageBuilderIndex,
-    files: FILES
-};

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

@@ -1,207 +0,0 @@
-/**
- * A new type of upgrade where we take the files from cwp-template-aws and copy them into required locations.
- * Old files are always backed up.
- */
-const {
-    prettierFormat,
-    yarnUp,
-    addWorkspaceToRootPackageJson,
-    removeWorkspaceToRootPackageJson
-} = require("../utils");
-const { copyFolders, copyFiles } = require("../fileUtils");
-const path = require("path");
-const fs = require("fs");
-const cliPackageJson = require("@webiny/cli/package.json");
-
-const targetVersion = cliPackageJson.version;
-
-/**
- *
- * @param context {CliContext}
- * @param initialTargets {{source: string, destination: string}[]}
- */
-const assignPackageVersions = (context, initialTargets) => {
-    const targets = initialTargets
-        .filter(target => target.destination.match(/package\.json$/) !== null)
-        .map(target => target.destination);
-    if (targets.length === 0) {
-        return;
-    }
-    context.info("Assigning proper package versions...");
-    for (const target of targets) {
-        const file = path.join(process.cwd(), target);
-        try {
-            const json = JSON.parse(fs.readFileSync(file).toString());
-            /**
-             *
-             * @type {{}}
-             */
-            json.dependencies = Object.keys(json.dependencies).reduce((dependencies, key) => {
-                if (key.match(/^@webiny\//) === null) {
-                    dependencies[key] = json.dependencies[key];
-                    return dependencies;
-                } else if (json.dependencies[key] === "latest") {
-                    dependencies[key] = `${targetVersion}`;
-                } else {
-                    dependencies[key] = json.dependencies[key];
-                }
-
-                return dependencies;
-            }, {});
-            /**
-             *
-             */
-            if (json.devDependencies) {
-                json.devDependencies = Object.keys(json.devDependencies).reduce(
-                    (dependencies, key) => {
-                        if (key.match(/^@webiny\//) === null) {
-                            dependencies[key] = json.devDependencies[key];
-                            return dependencies;
-                        } else if (json.devDependencies[key] === "latest") {
-                            dependencies[key] = `${targetVersion}`;
-                        } else {
-                            dependencies[key] = json.devDependencies[key];
-                        }
-
-                        return dependencies;
-                    },
-                    {}
-                );
-            }
-            fs.writeFileSync(file, JSON.stringify(json));
-        } catch (ex) {
-            console.error(ex.message);
-        }
-    }
-};
-
-/**
- * @type {CliUpgradePlugin}
- */
-module.exports = {
-    name: `upgrade-${targetVersion}`,
-    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;
-        }
-        /**
-         * We throw error here because it should not go further if version is not good.
-         */
-        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 targets = [
-            {
-                source: "node_modules/@webiny/cwp-template-aws/template/api/code/graphql/src/index.ts",
-                destination: "api/code/graphql/src/index.ts"
-            },
-            {
-                source: "node_modules/@webiny/cwp-template-aws/template/api/code/graphql/package.json",
-                destination: "api/code/graphql/package.json"
-            },
-            // Update cloud resources for "dev" environment
-            {
-                source: "node_modules/@webiny/cwp-template-aws/template/api/pulumi/dev/index.ts",
-                destination: "api/pulumi/dev/index.ts"
-            },
-            {
-                source: "node_modules/@webiny/cwp-template-aws/template/api/pulumi/dev/policies.ts",
-                destination: "api/pulumi/dev/policies.ts"
-            },
-            {
-                source: "node_modules/@webiny/cwp-template-aws/template/api/pulumi/dev/pageBuilder.ts",
-                destination: "api/pulumi/dev/pageBuilder.ts"
-            },
-            // Update cloud resources for "prod" environment
-            {
-                source: "node_modules/@webiny/cwp-template-aws/template/api/pulumi/prod/index.ts",
-                destination: "api/pulumi/prod/index.ts"
-            },
-            {
-                source: "node_modules/@webiny/cwp-template-aws/template/api/pulumi/prod/policies.ts",
-                destination: "api/pulumi/prod/policies.ts"
-            },
-            {
-                source: "node_modules/@webiny/cwp-template-aws/template/api/pulumi/prod/pageBuilder.ts",
-                destination: "api/pulumi/prod/pageBuilder.ts"
-            }
-        ];
-        /**
-         * Copy new files to their destinations.
-         */
-        copyFiles(context, targets);
-        /**
-         * Copy folders to their destinations.
-         */
-        copyFolders(context, [
-            {
-                source: "node_modules/@webiny/cwp-template-aws/template/api/code/pageBuilder/exportPages",
-                destination: "api/code/pageBuilder/exportPages"
-            },
-            {
-                source: "node_modules/@webiny/cwp-template-aws/template/api/code/pageBuilder/importPages",
-                destination: "api/code/pageBuilder/importPages"
-            }
-        ]);
-        /**
-         * If any package.json destinations, set the versions to current one.
-         */
-        assignPackageVersions(context, targets);
-
-        /**
-         * Update workspaces in root package.json.
-         */
-        context.info("Update workspaces in root package.json...");
-        const rootPackageJson = path.join(context.project.root, "package.json");
-        await addWorkspaceToRootPackageJson(rootPackageJson, [
-            "api/code/pageBuilder/updateSettings",
-            "api/code/pageBuilder/importPages/*",
-            "api/code/pageBuilder/exportPages/*"
-        ]);
-        await removeWorkspaceToRootPackageJson(rootPackageJson, ["api/code/pageBuilder/*"]);
-
-        await prettierFormat(
-            targets.map(t => t.destination),
-            context
-        );
-
-        /**
-         * Up the versions again and install the packages.
-         */
-        await yarnUp({
-            context,
-            targetVersion
-        });
-
-        context.info("\n");
-        context.info("Existing files were backed up and new ones created.");
-        context.info(
-            "You must transfer the custom parts of the code from the backed up files if you want everything to work properly."
-        );
-    }
-};