@nx/web 0.0.0-pr-22179-271588f

package/src/generators/init/schema.d.ts

@@ -0,0 +1,5 @@
+export interface Schema {
+  skipFormat?: boolean;
+  skipPackageJson?: boolean;
+  keepExistingVersions?: boolean;
+}

package/src/generators/init/schema.json

@@ -0,0 +1,28 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "$id": "NxWebInit",
+  "cli": "nx",
+  "title": "Init Web Plugin",
+  "description": "Init Web Plugin.",
+  "type": "object",
+  "properties": {
+    "skipFormat": {
+      "description": "Skip formatting files",
+      "type": "boolean",
+      "default": false
+    },
+    "skipPackageJson": {
+      "description": "Do not add dependencies to `package.json`.",
+      "type": "boolean",
+      "default": false,
+      "x-priority": "internal"
+    },
+    "keepExistingVersions": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Keep existing dependencies versions",
+      "default": false
+    }
+  },
+  "required": []
+}

package/src/generators/static-serve/schema.json

@@ -0,0 +1,24 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "$id": "NxWebStaticServe",
+  "cli": "nx",
+  "title": "Static Serve Configuration",
+  "description": "Add a new serve target to serve a build apps static files. This allows for faster serving of the static build files by reusing the case. Helpful when reserving the app over and over again like in e2e tests.",
+  "type": "object",
+  "properties": {
+    "buildTarget": {
+      "type": "string",
+      "description": "Name of the build target to serve"
+    },
+    "outputPath": {
+      "type": "string",
+      "description": "Path to the directory of the built files. This is only needed if buildTarget doesn't specify an outputPath executor option."
+    },
+    "targetName": {
+      "type": "string",
+      "description": "Name of the serve target to add. Defaults to 'serve-static'.",
+      "default": "serve-static"
+    }
+  },
+  "required": ["buildTarget"]
+}

package/src/generators/static-serve/static-serve-configuration.d.ts

@@ -0,0 +1,8 @@
+import { Tree } from '@nx/devkit';
+interface WebStaticServeSchema {
+    buildTarget: string;
+    outputPath?: string;
+    targetName?: string;
+}
+export declare function webStaticServeGenerator(tree: Tree, options: WebStaticServeSchema): void;
+export default webStaticServeGenerator;

package/src/generators/static-serve/static-serve-configuration.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.webStaticServeGenerator = void 0;
+const devkit_1 = require("@nx/devkit");
+function webStaticServeGenerator(tree, options) {
+    const opts = normalizeOptions(tree, options);
+    addStaticConfig(tree, opts);
+}
+exports.webStaticServeGenerator = webStaticServeGenerator;
+function normalizeOptions(tree, options) {
+    const target = (0, devkit_1.parseTargetString)(options.buildTarget);
+    const opts = {
+        ...options,
+        targetName: options.targetName || 'serve-static',
+        projectName: target.project,
+    };
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, target.project);
+    const buildTargetConfig = projectConfig?.targets?.[target.target];
+    if (!buildTargetConfig) {
+        throw new Error((0, devkit_1.stripIndents) `Unable to read the target configuration for the provided build target, ${opts.buildTarget}
+Are you sure this target exists?`);
+    }
+    if (projectConfig.targets[opts.targetName]) {
+        throw new Error((0, devkit_1.stripIndents) `Project ${target.project} already has a '${opts.targetName}' target configured.
+Either rename or remove the existing '${opts.targetName}' target and try again.
+Optionally, you can provide a different name with the --target-name option other than '${opts.targetName}'`);
+    }
+    // NOTE: @nx/web:file-server only looks for the outputPath option
+    if (!buildTargetConfig.options?.outputPath && !opts.outputPath) {
+        // attempt to find the suiteable path from the outputs
+        let maybeOutputValue;
+        for (const o of buildTargetConfig?.outputs || []) {
+            const isInterpolatedOutput = o.trim().startsWith('{options.');
+            if (!isInterpolatedOutput) {
+                continue;
+            }
+            const noBracketParts = o.replace(/[{}]/g, '').split('.');
+            if (noBracketParts.length === 2 && noBracketParts?.[1]) {
+                const key = noBracketParts[1].trim();
+                const value = buildTargetConfig.options?.[key];
+                if (value) {
+                    maybeOutputValue = value;
+                    break;
+                }
+            }
+        }
+        // NOTE: outputDir is the storybook option.
+        opts.outputPath = buildTargetConfig.options?.outputDir || maybeOutputValue;
+        if (opts.outputPath) {
+            devkit_1.logger.warn(`Automatically detected the output path to be ${opts.outputPath}.
+If this is incorrect, the update the staticFilePath option in the ${target.project}:${opts.targetName} target configuration`);
+        }
+        else {
+            devkit_1.logger.warn((0, devkit_1.stripIndents) `${opts.buildTarget} did not have an outputPath property set and --output-path was not provided.
+Without either options, the static serve will most likely be unable to serve your project.
+It's recommend to provide a --output-path option in this case.`);
+        }
+    }
+    return opts;
+}
+function addStaticConfig(tree, opts) {
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, opts.projectName);
+    const staticServeOptions = {
+        executor: '@nx/web:file-server',
+        options: {
+            buildTarget: opts.buildTarget,
+            staticFilePath: opts.outputPath,
+        },
+    };
+    projectConfig.targets[opts.targetName] = staticServeOptions;
+    (0, devkit_1.updateProjectConfiguration)(tree, opts.projectName, projectConfig);
+}
+exports.default = webStaticServeGenerator;

package/src/migrations/update-15-0-0/add-babel-inputs.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-15-0-0/add-babel-inputs.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+const add_babel_inputs_1 = require("@nx/js/src/utils/add-babel-inputs");
+async function default_1(tree) {
+    (0, add_babel_inputs_1.addBabelInputs)(tree);
+    await (0, devkit_1.formatFiles)(tree);
+}
+exports.default = default_1;

package/src/migrations/update-15-0-0/update-rollup-executor.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function update(host: Tree): Promise<void>;

package/src/migrations/update-15-0-0/update-rollup-executor.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+async function update(host) {
+    const projects = (0, devkit_1.getProjects)(host);
+    for (const [name, config] of projects.entries()) {
+        let updated = false;
+        if (config?.targets?.build?.executor === '@nrwl/web:rollup') {
+            config.targets.build.executor = '@nrwl/rollup:rollup';
+            updated = true;
+        }
+        if (config?.targets?.build?.options?.formats?.includes('umd')) {
+            config.targets.build.options.formats =
+                config.targets.build.options.formats.reduce((acc, x) => {
+                    const format = x === 'umd' ? 'cjs' : x;
+                    if (format === 'cjs') {
+                        if (!acc.includes('cjs'))
+                            acc.push(format);
+                    }
+                    else {
+                        acc.push(format);
+                    }
+                    return acc;
+                }, []);
+            updated = true;
+        }
+        if (updated) {
+            (0, devkit_1.updateProjectConfiguration)(host, name, config);
+        }
+    }
+    await (0, devkit_1.formatFiles)(host);
+}
+exports.default = update;

package/src/migrations/update-15-5-4/update-babel-preset.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-15-5-4/update-babel-preset.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../utils/versions");
+/* Updates @nrwl/web/babel to @nrwl/js/babel because web package is no longer necessary to use webpack/rollup + babel. */
+async function update(tree) {
+    // Add `@nrwl/js` in case it was missing before.
+    (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+        '@nrwl/js': versions_1.nxVersion,
+    });
+    const projects = (0, devkit_1.getProjects)(tree);
+    projects.forEach((config, name) => {
+        const babelrcPath = (0, devkit_1.joinPathFragments)(config.root, '.babelrc');
+        if (!tree.exists(babelrcPath))
+            return;
+        const babelrc = (0, devkit_1.readJson)(tree, babelrcPath);
+        const idx = babelrc?.presets?.findIndex((p) => typeof p === 'string'
+            ? p === '@nrwl/web/babel'
+            : p[0] === '@nrwl/web/babel');
+        if (idx === -1)
+            return;
+        const preset = babelrc.presets[idx];
+        if (typeof preset === 'string') {
+            babelrc.presets.splice(idx, 1, '@nrwl/js/babel');
+        }
+        else if (Array.isArray(preset)) {
+            babelrc.presets.splice(idx, 1, ['@nrwl/js/babel', preset[1]]);
+        }
+        (0, devkit_1.writeJson)(tree, babelrcPath, babelrc);
+    });
+}
+exports.default = update;

package/src/migrations/update-15-9-1/add-dropped-dependencies.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function addDroppedDependencies(tree: Tree): Promise<void>;

package/src/migrations/update-15-9-1/add-dropped-dependencies.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+async function addDroppedDependencies(tree) {
+    const devDependencies = {};
+    const droppedDependencies = [
+        '@nrwl/linter',
+        '@nrwl/cypress',
+        '@nrwl/jest',
+        '@nrwl/rollup',
+    ];
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [_, projectConfiguration] of projects) {
+        for (const [_, targetConfiguration] of Object.entries(projectConfiguration.targets ?? {})) {
+            for (const droppedDependency of droppedDependencies) {
+                if (targetConfiguration?.['executor']?.startsWith(droppedDependency + ':')) {
+                    devDependencies[droppedDependency] = devkit_1.NX_VERSION;
+                }
+            }
+        }
+    }
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    for (const [_, targetConfiguration] of Object.entries(nxJson?.targetDefaults ?? {})) {
+        for (const droppedDependency of droppedDependencies) {
+            if (targetConfiguration?.['executor']?.startsWith(droppedDependency + ':')) {
+                devDependencies[droppedDependency] = devkit_1.NX_VERSION;
+            }
+        }
+    }
+    if (Object.keys(devDependencies).length > 0) {
+        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies);
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+exports.default = addDroppedDependencies;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function replacePackage(tree: Tree): Promise<void>;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
+async function replacePackage(tree) {
+    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/web', '@nx/web');
+    await (0, devkit_1.formatFiles)(tree);
+}
+exports.default = replacePackage;

package/src/migrations/update-16-0-0-update-executors/update-16-0-0-update-executors.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function update(host: Tree): Promise<import("@nx/devkit").GeneratorCallback>;

package/src/migrations/update-16-0-0-update-executors/update-16-0-0-update-executors.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../utils/versions");
+async function update(host) {
+    const projects = (0, devkit_1.getProjects)(host);
+    const deps = {};
+    for (const [name, config] of projects.entries()) {
+        let updated = false;
+        // webpack
+        if (config?.targets?.build?.executor === '@nrwl/web:webpack') {
+            config.targets.build.executor = '@nx/webpack:webpack';
+            deps['@nx/webpack'] = versions_1.nxVersion;
+            updated = true;
+        }
+        if (config?.targets?.serve?.executor === '@nrwl/web:dev-server') {
+            config.targets.serve.executor = '@nx/webpack:dev-server';
+            deps['@nx/webpack'] = versions_1.nxVersion;
+            updated = true;
+        }
+        // rollup
+        if (config?.targets?.build?.executor === '@nrwl/web:rollup') {
+            config.targets.build.executor = '@nx/rollup:rollup';
+            deps['@nx/rollup'] = versions_1.nxVersion;
+            updated = true;
+        }
+        if (updated) {
+            (0, devkit_1.updateProjectConfiguration)(host, name, config);
+        }
+    }
+    await (0, devkit_1.formatFiles)(host);
+    return (0, devkit_1.addDependenciesToPackageJson)(host, {}, deps);
+}
+exports.default = update;

package/src/plugins/webpack-nx-build-coordination-plugin.d.ts

@@ -0,0 +1 @@
+export { WebpackNxBuildCoordinationPlugin } from '@nx/webpack/src/plugins/webpack-nx-build-coordination-plugin';

package/src/plugins/webpack-nx-build-coordination-plugin.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebpackNxBuildCoordinationPlugin = void 0;
+var webpack_nx_build_coordination_plugin_1 = require("@nx/webpack/src/plugins/webpack-nx-build-coordination-plugin");
+Object.defineProperty(exports, "WebpackNxBuildCoordinationPlugin", { enumerable: true, get: function () { return webpack_nx_build_coordination_plugin_1.WebpackNxBuildCoordinationPlugin; } });

package/src/utils/fs.d.ts

@@ -0,0 +1 @@
+export * from '@nx/webpack/src/utils/fs';

package/src/utils/fs.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("@nx/webpack/src/utils/fs"), exports);

package/src/utils/has-webpack-plugin.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export declare function hasWebpackPlugin(tree: Tree): boolean;

package/src/utils/has-webpack-plugin.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasWebpackPlugin = void 0;
+const devkit_1 = require("@nx/devkit");
+function hasWebpackPlugin(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    return !!nxJson.plugins?.some((p) => typeof p === 'string'
+        ? p === '@nx/webpack/plugin'
+        : p.plugin === '@nx/webpack/plugin');
+}
+exports.hasWebpackPlugin = hasWebpackPlugin;

package/src/utils/normalize.d.ts

@@ -0,0 +1 @@
+export * from '@nx/webpack/src/executors/webpack/lib/normalize-options';

package/src/utils/normalize.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("@nx/webpack/src/executors/webpack/lib/normalize-options"), exports);

package/src/utils/versions.d.ts

@@ -0,0 +1,4 @@
+export declare const nxVersion: any;
+export declare const swcLoaderVersion = "0.1.15";
+export declare const typesNodeVersion = "18.16.9";
+export declare const tsLibVersion = "^2.3.0";

package/src/utils/versions.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tsLibVersion = exports.typesNodeVersion = exports.swcLoaderVersion = exports.nxVersion = void 0;
+exports.nxVersion = require('../../package.json').version;
+exports.swcLoaderVersion = '0.1.15';
+exports.typesNodeVersion = '18.16.9';
+exports.tsLibVersion = '^2.3.0';

package/src/utils/wait-for-port-open.d.ts

@@ -0,0 +1,5 @@
+export declare function waitForPortOpen(port: number, options?: {
+    host?: string;
+    retries?: number;
+    retryDelay?: number;
+}): Promise<void>;

package/src/utils/wait-for-port-open.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.waitForPortOpen = void 0;
+const devkit_1 = require("@nx/devkit");
+const net = require("net");
+function waitForPortOpen(port, options = {}) {
+    const host = options.host ?? '127.0.0.1';
+    const allowedErrorCodes = ['ECONNREFUSED', 'ECONNRESET', 'ETIMEDOUT'];
+    return new Promise((resolve, reject) => {
+        const checkPort = (retries = options.retries ?? 120) => {
+            const client = new net.Socket();
+            const cleanupClient = () => {
+                client.removeAllListeners('connect');
+                client.removeAllListeners('error');
+                client.end();
+                client.destroy();
+                client.unref();
+            };
+            client.once('connect', () => {
+                cleanupClient();
+                resolve();
+            });
+            client.once('error', (err) => {
+                if (retries === 0 || !allowedErrorCodes.includes(err['code'])) {
+                    if (process.env['NX_VERBOSE_LOGGING'] === 'true') {
+                        devkit_1.logger.info(`Error connecting on ${host}:${port}: ${err['code'] || err}`);
+                    }
+                    cleanupClient();
+                    reject(err);
+                }
+                else {
+                    setTimeout(() => checkPort(retries - 1), options.retryDelay ?? 1000);
+                }
+            });
+            // Node will use IPv6 if it is available, but this can cause issues if the server is only listening on IPv4.
+            // Hard-coding to look on 127.0.0.1 to avoid using the IPv6 loopback address "::1".
+            if (process.env['NX_VERBOSE_LOGGING'] === 'true') {
+                devkit_1.logger.info(`Connecting on ${host}:${port}`);
+            }
+            client.connect({ port, host });
+        };
+        checkPort();
+    });
+}
+exports.waitForPortOpen = waitForPortOpen;