@nx/webpack 19.4.0-beta.1 → 19.4.0-beta.2

package/src/generators/convert-to-inferred/utils/ast.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toExpression = exports.toPropertyAssignment = void 0;
+const ts = require("typescript");
+function toPropertyAssignment(key, value) {
+    if (typeof value === 'string') {
+        return ts.factory.createPropertyAssignment(ts.factory.createStringLiteral(key), ts.factory.createStringLiteral(value));
+    }
+    else if (typeof value === 'number') {
+        return ts.factory.createPropertyAssignment(ts.factory.createStringLiteral(key), ts.factory.createNumericLiteral(value));
+    }
+    else if (typeof value === 'boolean') {
+        return ts.factory.createPropertyAssignment(ts.factory.createStringLiteral(key), value ? ts.factory.createTrue() : ts.factory.createFalse());
+    }
+    else if (Array.isArray(value)) {
+        return ts.factory.createPropertyAssignment(ts.factory.createStringLiteral(key), ts.factory.createArrayLiteralExpression(value.map((item) => toExpression(item))));
+    }
+    else {
+        return ts.factory.createPropertyAssignment(ts.factory.createStringLiteral(key), ts.factory.createObjectLiteralExpression(Object.entries(value).map(([key, value]) => toPropertyAssignment(key, value))));
+    }
+}
+exports.toPropertyAssignment = toPropertyAssignment;
+function toExpression(value) {
+    if (typeof value === 'string') {
+        return ts.factory.createStringLiteral(value);
+    }
+    else if (typeof value === 'number') {
+        return ts.factory.createNumericLiteral(value);
+    }
+    else if (typeof value === 'boolean') {
+        return value ? ts.factory.createTrue() : ts.factory.createFalse();
+    }
+    else if (Array.isArray(value)) {
+        return ts.factory.createArrayLiteralExpression(value.map((item) => toExpression(item)));
+    }
+    else {
+        return ts.factory.createObjectLiteralExpression(Object.entries(value).map(([key, value]) => toPropertyAssignment(key, value)));
+    }
+}
+exports.toExpression = toExpression;

package/src/generators/convert-to-inferred/utils/build-post-target-transformer.d.ts

@@ -0,0 +1,6 @@
+import type { TargetConfiguration, Tree } from '@nx/devkit';
+import type { MigrationContext } from './types';
+export declare function buildPostTargetTransformerFactory(migrationContext: MigrationContext): (target: TargetConfiguration, tree: Tree, projectDetails: {
+    projectName: string;
+    root: string;
+}, inferredTarget: TargetConfiguration) => TargetConfiguration;

package/src/generators/convert-to-inferred/utils/build-post-target-transformer.js

@@ -0,0 +1,219 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildPostTargetTransformerFactory = void 0;
+const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const ts = require("typescript");
+const ast_1 = require("./ast");
+function buildPostTargetTransformerFactory(migrationContext) {
+    return function buildPostTargetTransformer(target, tree, projectDetails, inferredTarget) {
+        const context = {
+            ...migrationContext,
+            projectName: projectDetails.projectName,
+            projectRoot: projectDetails.root,
+        };
+        const { pluginOptions, webpackConfigPath } = processOptions(target, context);
+        updateWebpackConfig(tree, webpackConfigPath, pluginOptions);
+        if (target.outputs) {
+            (0, plugin_migration_utils_1.processTargetOutputs)(target, [], inferredTarget, {
+                projectName: projectDetails.projectName,
+                projectRoot: projectDetails.root,
+            });
+        }
+        return target;
+    };
+}
+exports.buildPostTargetTransformerFactory = buildPostTargetTransformerFactory;
+function processOptions(target, context) {
+    const webpackConfigPath = target.options.webpackConfig;
+    delete target.options.webpackConfig;
+    const pluginOptions = {
+        default: extractPluginOptions(target.options, context),
+    };
+    if (target.configurations && Object.keys(target.configurations).length) {
+        for (const [configName, config] of Object.entries(target.configurations)) {
+            pluginOptions[configName] = extractPluginOptions(config, context, configName);
+        }
+    }
+    return { pluginOptions, webpackConfigPath };
+}
+const pathOptions = new Set([
+    'babelConfig',
+    'index',
+    'main',
+    'outputPath',
+    'polyfills',
+    'postcssConfig',
+    'tsConfig',
+]);
+const assetsOptions = new Set(['assets', 'scripts', 'styles']);
+function extractPluginOptions(options, context, configName) {
+    const pluginOptions = {};
+    for (const [key, value] of Object.entries(options)) {
+        if (pathOptions.has(key)) {
+            pluginOptions[key] = (0, plugin_migration_utils_1.toProjectRelativePath)(value, context.projectRoot);
+            delete options[key];
+        }
+        else if (assetsOptions.has(key)) {
+            pluginOptions[key] = value.map((asset) => {
+                if (typeof asset === 'string') {
+                    return (0, plugin_migration_utils_1.toProjectRelativePath)(asset, context.projectRoot);
+                }
+                asset.input = (0, plugin_migration_utils_1.toProjectRelativePath)(asset.input, context.projectRoot);
+                return asset;
+            });
+            delete options[key];
+        }
+        else if (key === 'fileReplacements') {
+            pluginOptions.fileReplacements = value.map((replacement) => ({
+                replace: (0, plugin_migration_utils_1.toProjectRelativePath)(replacement.replace, context.projectRoot),
+                with: (0, plugin_migration_utils_1.toProjectRelativePath)(replacement.with, context.projectRoot),
+            }));
+            delete options.fileReplacements;
+        }
+        else if (key === 'additionalEntryPoints') {
+            pluginOptions.additionalEntryPoints = value.map((entryPoint) => {
+                entryPoint.entryPath = (0, plugin_migration_utils_1.toProjectRelativePath)(entryPoint.entryPath, context.projectRoot);
+                return entryPoint;
+            });
+            delete options.additionalEntryPoints;
+        }
+        else if (key === 'memoryLimit') {
+            pluginOptions.memoryLimit = value;
+            const serveMemoryLimit = getMemoryLimitFromServeTarget(context, configName);
+            if (serveMemoryLimit) {
+                pluginOptions.memoryLimit = Math.max(serveMemoryLimit, value);
+                context.logger.addLog({
+                    executorName: '@nx/webpack:webpack',
+                    log: `The "memoryLimit" option was set in both the serve and build configurations. The migration set the higher value to the build configuration and removed the option from the serve configuration.`,
+                    project: context.projectName,
+                });
+            }
+            delete options.memoryLimit;
+        }
+        else if (key === 'isolatedConfig') {
+            context.logger.addLog({
+                executorName: '@nx/webpack:webpack',
+                log: `The 'isolatedConfig' option is deprecated and not supported by the NxAppWebpackPlugin. It was removed from your project configuration.`,
+                project: context.projectName,
+            });
+            delete options.isolatedConfig;
+        }
+        else if (key === 'standardWebpackConfigFunction') {
+            delete options.standardWebpackConfigFunction;
+        }
+        else {
+            pluginOptions[key] = value;
+            delete options[key];
+        }
+    }
+    return pluginOptions;
+}
+function updateWebpackConfig(tree, webpackConfig, pluginOptions) {
+    let sourceFile;
+    let webpackConfigText;
+    const updateSources = () => {
+        webpackConfigText = tree.read(webpackConfig, 'utf-8');
+        sourceFile = tsquery_1.tsquery.ast(webpackConfigText);
+    };
+    updateSources();
+    setOptionsInWebpackConfig(tree, webpackConfigText, sourceFile, webpackConfig, pluginOptions);
+    updateSources();
+    setOptionsInNxWebpackPlugin(tree, webpackConfigText, sourceFile, webpackConfig);
+    updateSources();
+    setOptionsInLegacyNxPlugin(tree, webpackConfigText, sourceFile, webpackConfig);
+}
+function setOptionsInWebpackConfig(tree, text, sourceFile, webpackConfig, pluginOptions) {
+    const { default: defaultOptions, ...configurationOptions } = pluginOptions;
+    const optionsSelector = 'VariableStatement:has(VariableDeclaration:has(Identifier[name=options]))';
+    const optionsVariable = (0, tsquery_1.tsquery)(sourceFile, optionsSelector)[0];
+    // This is assuming the `options` variable will be available since it's what the
+    // `convert-config-to-webpack-plugin` generates
+    let defaultOptionsObject;
+    const optionsObject = (0, tsquery_1.tsquery)(optionsVariable, 'ObjectLiteralExpression')[0];
+    if (optionsObject.properties.length === 0) {
+        defaultOptionsObject = ts.factory.createObjectLiteralExpression(Object.entries(defaultOptions).map(([key, value]) => (0, ast_1.toPropertyAssignment)(key, value)));
+    }
+    else {
+        // filter out the default options that are already in the options object
+        // the existing options override the options from the project.json file
+        const filteredDefaultOptions = Object.entries(defaultOptions).filter(([key]) => !optionsObject.properties.some((property) => ts.isPropertyAssignment(property) &&
+            ts.isIdentifier(property.name) &&
+            property.name.text === key));
+        defaultOptionsObject = ts.factory.createObjectLiteralExpression([
+            ...optionsObject.properties,
+            ...filteredDefaultOptions.map(([key, value]) => (0, ast_1.toPropertyAssignment)(key, value)),
+        ]);
+    }
+    /**
+     * const configValues = {
+     *  build: {
+     *   default: { ... },
+     *   configuration1: { ... },
+     *   configuration2: { ... },
+     * }
+     */
+    const configValuesVariable = ts.factory.createVariableStatement(undefined, ts.factory.createVariableDeclarationList([
+        ts.factory.createVariableDeclaration('configValues', undefined, undefined, ts.factory.createObjectLiteralExpression([
+            ts.factory.createPropertyAssignment('build', ts.factory.createObjectLiteralExpression([
+                ts.factory.createPropertyAssignment('default', defaultOptionsObject),
+                ...(configurationOptions
+                    ? Object.entries(configurationOptions).map(([key, value]) => ts.factory.createPropertyAssignment(key, ts.factory.createObjectLiteralExpression(Object.entries(value).map(([key, value]) => (0, ast_1.toPropertyAssignment)(key, value)))))
+                    : []),
+            ])),
+        ], true)),
+    ], ts.NodeFlags.Const));
+    text = `${text.slice(0, optionsVariable.getStart())}
+    // These options were migrated by @nx/webpack:convert-to-inferred from
+    // the project.json file and merged with the options in this file
+    ${ts
+        .createPrinter()
+        .printNode(ts.EmitHint.Unspecified, configValuesVariable, sourceFile)}
+    
+    // Determine the correct configValue to use based on the configuration
+    const configuration = process.env.NX_TASK_TARGET_CONFIGURATION || 'default';
+
+    const buildOptions = {
+      ...configValues.build.default,
+      ...configValues.build[configuration],
+    };${text.slice(optionsVariable.getEnd())}`;
+    // These are comments written by the `convert-config-to-webpack-plugin` that are no longer needed
+    text = text
+        .replace(`// This file was migrated using @nx/webpack:convert-config-to-webpack-plugin from your './webpack.config.old.js'`, '')
+        .replace('// Please check that the options here are correct as they were moved from the old webpack.config.js to this file.', '');
+    tree.write(webpackConfig, text);
+}
+function setOptionsInNxWebpackPlugin(tree, text, sourceFile, webpackConfig) {
+    const nxAppWebpackPluginSelector = 'PropertyAssignment:has(Identifier[name=plugins]) NewExpression:has(Identifier[name=NxAppWebpackPlugin])';
+    const nxAppWebpackPlugin = (0, tsquery_1.tsquery)(sourceFile, nxAppWebpackPluginSelector)[0];
+    // the NxAppWebpackPlugin must exists, otherwise, the migration doesn't run and we wouldn't reach this point
+    const updatedNxAppWebpackPlugin = ts.factory.updateNewExpression(nxAppWebpackPlugin, nxAppWebpackPlugin.expression, undefined, [ts.factory.createIdentifier('buildOptions')]);
+    text = `${text.slice(0, nxAppWebpackPlugin.getStart())}${ts
+        .createPrinter()
+        .printNode(ts.EmitHint.Unspecified, updatedNxAppWebpackPlugin, sourceFile)}${text.slice(nxAppWebpackPlugin.getEnd())}`;
+    tree.write(webpackConfig, text);
+}
+function setOptionsInLegacyNxPlugin(tree, text, sourceFile, webpackConfig) {
+    const legacyNxPluginSelector = 'AwaitExpression CallExpression:has(Identifier[name=useLegacyNxPlugin])';
+    const legacyNxPlugin = (0, tsquery_1.tsquery)(sourceFile, legacyNxPluginSelector)[0];
+    // we're assuming the `useLegacyNxPlugin` function is being called since it's what the `convert-config-to-webpack-plugin` generates
+    // we've already "ensured" that the `convert-config-to-webpack-plugin` was run by checking for the `NxAppWebpackPlugin` in the project validation
+    const updatedLegacyNxPlugin = ts.factory.updateCallExpression(legacyNxPlugin, legacyNxPlugin.expression, undefined, [legacyNxPlugin.arguments[0], ts.factory.createIdentifier('buildOptions')]);
+    text = `${text.slice(0, legacyNxPlugin.getStart())}${ts
+        .createPrinter()
+        .printNode(ts.EmitHint.Unspecified, updatedLegacyNxPlugin, sourceFile)}${text.slice(legacyNxPlugin.getEnd())}`;
+    tree.write(webpackConfig, text);
+}
+function getMemoryLimitFromServeTarget(context, configName) {
+    const { targets } = context.projectGraph.nodes[context.projectName].data;
+    const serveTarget = Object.values(targets).find((target) => target.executor === '@nx/webpack:dev-server' ||
+        target.executor === '@nrwl/web:dev-server');
+    if (!serveTarget) {
+        return undefined;
+    }
+    if (configName && serveTarget.configurations?.[configName]) {
+        return (serveTarget.configurations[configName].options?.memoryLimit ??
+            serveTarget.options?.memoryLimit);
+    }
+    return serveTarget.options?.memoryLimit;
+}

package/src/generators/convert-to-inferred/utils/index.d.ts

@@ -0,0 +1,3 @@
+export * from './build-post-target-transformer';
+export * from './serve-post-target-transformer';
+export * from './types';

package/src/generators/convert-to-inferred/utils/index.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./build-post-target-transformer"), exports);
+tslib_1.__exportStar(require("./serve-post-target-transformer"), exports);
+tslib_1.__exportStar(require("./types"), exports);

package/src/generators/convert-to-inferred/utils/serve-post-target-transformer.d.ts

@@ -0,0 +1,6 @@
+import { type TargetConfiguration, type Tree } from '@nx/devkit';
+import type { MigrationContext } from './types';
+export declare function servePostTargetTransformerFactory(migrationContext: MigrationContext): (target: TargetConfiguration, tree: Tree, projectDetails: {
+    projectName: string;
+    root: string;
+}, inferredTarget: TargetConfiguration) => Promise<TargetConfiguration>;

package/src/generators/convert-to-inferred/utils/serve-post-target-transformer.js

@@ -0,0 +1,250 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.servePostTargetTransformerFactory = void 0;
+const devkit_1 = require("@nx/devkit");
+const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const path_1 = require("path");
+const ts = require("typescript");
+const serve_path_1 = require("../../../executors/dev-server/lib/serve-path");
+const ast_1 = require("./ast");
+function servePostTargetTransformerFactory(migrationContext) {
+    return async function servePostTargetTransformer(target, tree, projectDetails, inferredTarget) {
+        const context = {
+            ...migrationContext,
+            projectName: projectDetails.projectName,
+            projectRoot: projectDetails.root,
+        };
+        const { devServerOptions, webpackConfigPath } = await processOptions(tree, target, context);
+        updateWebpackConfig(tree, webpackConfigPath, devServerOptions, context);
+        if (target.outputs) {
+            (0, plugin_migration_utils_1.processTargetOutputs)(target, [], inferredTarget, {
+                projectName: projectDetails.projectName,
+                projectRoot: projectDetails.root,
+            });
+        }
+        return target;
+    };
+}
+exports.servePostTargetTransformerFactory = servePostTargetTransformerFactory;
+async function processOptions(tree, target, context) {
+    const executorContext = {
+        cwd: process.cwd(),
+        nxJsonConfiguration: (0, devkit_1.readJson)(tree, 'nx.json'),
+        projectGraph: context.projectGraph,
+        projectName: context.projectName,
+        projectsConfigurations: Object.entries(context.projectGraph.nodes).reduce((acc, [projectName, project]) => {
+            acc.projects[projectName] = project.data;
+            return acc;
+        }, { version: 1, projects: {} }),
+        root: context.workspaceRoot,
+    };
+    const buildTarget = (0, devkit_1.parseTargetString)(target.options.buildTarget, executorContext);
+    const buildOptions = (0, devkit_1.readTargetOptions)(buildTarget, executorContext);
+    // it must exist, we validated it in the project filter
+    const webpackConfigPath = buildOptions.webpackConfig;
+    const defaultOptions = extractDevServerOptions(target.options, context);
+    applyDefaults(defaultOptions, buildOptions);
+    const devServerOptions = {
+        default: defaultOptions,
+    };
+    if (target.configurations && Object.keys(target.configurations).length) {
+        for (const [configName, config] of Object.entries(target.configurations)) {
+            devServerOptions[configName] = extractDevServerOptions(config, context);
+        }
+    }
+    return { devServerOptions, webpackConfigPath };
+}
+function extractDevServerOptions(options, context) {
+    const devServerOptions = {};
+    for (const [key, value] of Object.entries(options)) {
+        if (key === 'hmr') {
+            devServerOptions.hot = value;
+            if (value) {
+                // the executor disables liveReload when hmr is enabled
+                devServerOptions.liveReload = false;
+                delete options.liveReload;
+            }
+            delete options.hmr;
+        }
+        else if (key === 'allowedHosts') {
+            devServerOptions.allowedHosts = value.split(',');
+            delete options.allowedHosts;
+        }
+        else if (key === 'publicHost') {
+            devServerOptions.client = {
+                webSocketURL: value,
+            };
+            delete options.publicHost;
+        }
+        else if (key === 'proxyConfig') {
+            devServerOptions.proxy = getProxyConfig(context.workspaceRoot, value);
+            delete options.proxyConfig;
+        }
+        else if (key === 'ssl' || key === 'sslCert' || key === 'sslKey') {
+            if (key === 'ssl' || 'ssl' in options) {
+                if (options.ssl) {
+                    devServerOptions.server = { type: 'https' };
+                    if (options.sslCert && options.sslKey) {
+                        devServerOptions.server.options = {};
+                        devServerOptions.server.options.cert = (0, plugin_migration_utils_1.toProjectRelativePath)(options.sslCert, context.projectRoot);
+                        devServerOptions.server.options.key = (0, plugin_migration_utils_1.toProjectRelativePath)(options.sslKey, context.projectRoot);
+                    }
+                    else if (options.sslCert) {
+                        context.logger.addLog({
+                            executorName: '@nx/webpack:dev-server',
+                            log: 'The "sslCert" option was set but "sslKey" was missing and "ssl" was set to "true". This means that "sslCert" was ignored by the executor. It has been removed from the options.',
+                            project: context.projectName,
+                        });
+                    }
+                    else if (options.sslKey) {
+                        context.logger.addLog({
+                            executorName: '@nx/webpack:dev-server',
+                            log: 'The "sslKey" option was set but "sslCert" was missing and "ssl" was set to "true". This means that "sslKey" was ignored by the executor. It has been removed from the options.',
+                            project: context.projectName,
+                        });
+                    }
+                }
+                else if (options.sslCert || options.sslKey) {
+                    context.logger.addLog({
+                        executorName: '@nx/webpack:dev-server',
+                        log: 'The "sslCert" and/or "sslKey" were set with "ssl" set to "false". This means they were ignored by the executor. They have been removed from the options.',
+                        project: context.projectName,
+                    });
+                }
+                delete options.ssl;
+                delete options.sslCert;
+                delete options.sslKey;
+            }
+            else if (options.sslCert || options.sslKey) {
+                context.logger.addLog({
+                    executorName: '@nx/webpack:dev-server',
+                    log: 'The "sslCert" and/or "sslKey" were set but the "ssl" was not set. This means they were ignored by the executor. They have been removed from the options.',
+                    project: context.projectName,
+                });
+                delete options.sslCert;
+                delete options.sslKey;
+            }
+        }
+        else if (key === 'buildTarget') {
+            delete options.buildTarget;
+        }
+        else if (key === 'watch') {
+            context.logger.addLog({
+                executorName: '@nx/webpack:dev-server',
+                log: 'The "watch" option was removed from the serve configuration since it is not needed. The dev server always watches the files.',
+                project: context.projectName,
+            });
+            delete options.watch;
+        }
+        else if (key === 'baseHref') {
+            context.logger.addLog({
+                executorName: '@nx/webpack:dev-server',
+                log: 'The "baseHref" option was removed from the serve configuration. If you need different base hrefs for the build and the dev server, please update the final webpack config manually to achieve that.',
+                project: context.projectName,
+            });
+            delete options.baseHref;
+        }
+        else if (key === 'memoryLimit') {
+            // we already log a message for this one when processing the build options
+            delete options.memoryLimit;
+        }
+        else {
+            devServerOptions[key] = value;
+            delete options[key];
+        }
+    }
+    return devServerOptions;
+}
+function applyDefaults(options, buildOptions) {
+    if (options.port === undefined) {
+        options.port = 4200;
+    }
+    options.headers = { 'Access-Control-Allow-Origin': '*' };
+    const servePath = (0, serve_path_1.buildServePath)(buildOptions);
+    options.historyApiFallback = {
+        index: buildOptions.index && `${servePath}${(0, path_1.basename)(buildOptions.index)}`,
+        disableDotRule: true,
+        htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
+    };
+}
+function getProxyConfig(root, proxyConfig) {
+    const proxyPath = (0, path_1.resolve)(root, proxyConfig);
+    return require(proxyPath);
+}
+function updateWebpackConfig(tree, webpackConfigPath, devServerOptions, context) {
+    let sourceFile;
+    let webpackConfigText;
+    const updateSources = () => {
+        webpackConfigText = tree.read(webpackConfigPath, 'utf-8');
+        sourceFile = tsquery_1.tsquery.ast(webpackConfigText);
+    };
+    updateSources();
+    setOptionsInWebpackConfig(tree, webpackConfigText, sourceFile, webpackConfigPath, devServerOptions);
+    updateSources();
+    setDevServerOptionsInWebpackConfig(tree, webpackConfigText, sourceFile, webpackConfigPath, context);
+}
+function setOptionsInWebpackConfig(tree, text, sourceFile, webpackConfigPath, devServerOptions) {
+    const { default: defaultOptions, ...configurationOptions } = devServerOptions;
+    const configValuesSelector = 'VariableDeclaration:has(Identifier[name=configValues]) ObjectLiteralExpression';
+    const configValuesObject = (0, tsquery_1.tsquery)(sourceFile, configValuesSelector)[0];
+    // configValues must exist at this point, we added it when processing the build target
+    /**
+     * const configValues = {
+     *   ...
+     *   serve: {
+     *     default: { ... },
+     *     configuration1: { ... },
+     *    ...
+     *  },
+     */
+    const updatedConfigValuesObject = ts.factory.updateObjectLiteralExpression(configValuesObject, [
+        ...configValuesObject.properties,
+        ts.factory.createPropertyAssignment('serve', ts.factory.createObjectLiteralExpression([
+            ts.factory.createPropertyAssignment('default', ts.factory.createObjectLiteralExpression(Object.entries(defaultOptions).map(([key, value]) => (0, ast_1.toPropertyAssignment)(key, value)))),
+            ...(configurationOptions
+                ? Object.entries(configurationOptions).map(([key, value]) => ts.factory.createPropertyAssignment(key, ts.factory.createObjectLiteralExpression(Object.entries(value).map(([key, value]) => (0, ast_1.toPropertyAssignment)(key, value)))))
+                : []),
+        ])),
+    ]);
+    text = `${text.slice(0, configValuesObject.getStart())}${ts
+        .createPrinter()
+        .printNode(ts.EmitHint.Unspecified, updatedConfigValuesObject, sourceFile)}${text.slice(configValuesObject.getEnd())}`;
+    tree.write(webpackConfigPath, text);
+    sourceFile = tsquery_1.tsquery.ast(text);
+    const buildOptionsSelector = 'VariableStatement:has(VariableDeclaration:has(Identifier[name=buildOptions]))';
+    const buildOptionsStatement = (0, tsquery_1.tsquery)(sourceFile, buildOptionsSelector)[0];
+    text = `${text.slice(0, buildOptionsStatement.getEnd())}
+  const devServerOptions = {
+    ...configValues.serve.default,
+    ...configValues.serve[configuration],
+  };${text.slice(buildOptionsStatement.getEnd())}`;
+    tree.write(webpackConfigPath, text);
+}
+function setDevServerOptionsInWebpackConfig(tree, text, sourceFile, webpackConfigPath, context) {
+    const webpackConfigDevServerSelector = 'ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=devServer])';
+    const webpackConfigDevServer = (0, tsquery_1.tsquery)(sourceFile, webpackConfigDevServerSelector)[0];
+    if (webpackConfigDevServer) {
+        context.logger.addLog({
+            executorName: '@nx/webpack:dev-server',
+            log: `The "devServer" option is already set in the webpack config. The migration doesn't support updating it. Please review it and make any necessary changes manually.`,
+            project: context.projectName,
+        });
+        text = `${text.slice(0, webpackConfigDevServer.getStart())}// This is the untouched "devServer" option from the original webpack config. Please review it and make any necessary changes manually.
+    ${text.slice(webpackConfigDevServer.getStart())}`;
+        tree.write(webpackConfigPath, text);
+        // If the devServer property already exists, we don't know how to merge the
+        // options, so we leave it as is.
+        return;
+    }
+    const webpackConfigSelector = 'ObjectLiteralExpression:has(PropertyAssignment:has(Identifier[name=plugins]))';
+    const webpackConfig = (0, tsquery_1.tsquery)(sourceFile, webpackConfigSelector)[0];
+    const updatedWebpackConfig = ts.factory.updateObjectLiteralExpression(webpackConfig, [
+        ts.factory.createPropertyAssignment('devServer', ts.factory.createIdentifier('devServerOptions')),
+        ...webpackConfig.properties,
+    ]);
+    text = `${text.slice(0, webpackConfig.getStart())}${ts
+        .createPrinter()
+        .printNode(ts.EmitHint.Unspecified, updatedWebpackConfig, sourceFile)}${text.slice(webpackConfig.getEnd())}`;
+    tree.write(webpackConfigPath, text);
+}

package/src/generators/convert-to-inferred/utils/types.d.ts

@@ -0,0 +1,11 @@
+import type { ProjectGraph } from '@nx/devkit';
+import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util';
+export type MigrationContext = {
+    logger: AggregatedLog;
+    projectGraph: ProjectGraph;
+    workspaceRoot: string;
+};
+export type TransformerContext = MigrationContext & {
+    projectName: string;
+    projectRoot: string;
+};

package/src/generators/convert-to-inferred/utils/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/plugins/nx-webpack-plugin/lib/apply-base-config.js

@@ -72,7 +72,11 @@ function applyNxIndependentConfig(options, config) {
             (options.target === 'node' ? 'commonjs' : undefined),
         path: config.output?.path ??
             (options.outputPath
-                ? path.join(options.root, options.outputPath)
+                ? // If path is relative, it is relative from project root (aka cwd).
+                    // Otherwise, it is relative to workspace root (legacy behavior).
+                    options.outputPath.startsWith('.')
+                        ? path.join(options.root, options.projectRoot, options.outputPath)
+                        : path.join(options.root, options.outputPath)
                 : undefined),
         filename: config.output?.filename ??
             (options.outputHashing ? `[name]${hashFormat.script}.js` : '[name].js'),

package/src/plugins/nx-webpack-plugin/lib/normalize-options.js

@@ -47,7 +47,7 @@ function normalizeOptions(options) {
         originalTargetOptions);
     }
     const sourceRoot = projectNode.data.sourceRoot ?? projectNode.data.root;
-    if (!options.main) {
+    if (!combinedPluginAndMaybeExecutorOptions.main) {
         throw new Error(`Missing "main" option for the entry file. Set this option in your Nx webpack plugin.`);
     }
     return {

package/src/plugins/plugin.d.ts

@@ -1,9 +1,13 @@
-import { CreateDependencies, CreateNodes } from '@nx/devkit';
+import { CreateDependencies, CreateNodes, CreateNodesV2 } from '@nx/devkit';
 export interface WebpackPluginOptions {
     buildTargetName?: string;
     serveTargetName?: string;
     serveStaticTargetName?: string;
     previewTargetName?: string;
 }
+/**
+ * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
+ */
 export declare const createDependencies: CreateDependencies;
+export declare const createNodesV2: CreateNodesV2<WebpackPluginOptions>;
 export declare const createNodes: CreateNodes<WebpackPluginOptions>;