@nx/webpack 22.4.0-canary.20260113-246d4fd → 22.4.0-canary.20260114-45f2ae3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "22.4.0-canary.20260113-246d4fd",
+  "version": "22.4.0-canary.20260114-45f2ae3",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@babel/core": "^7.23.2",
-    "@phenomnomnominal/tsquery": "~5.0.1",
+    "@phenomnomnominal/tsquery": "~6.1.4",
     "ajv": "^8.12.0",
     "autoprefixer": "^10.4.9",
     "babel-loader": "^9.1.2",
@@ -64,11 +64,11 @@
     "webpack-dev-server": "^5.2.1",
     "webpack-node-externals": "^3.0.0",
     "webpack-subresource-integrity": "^5.1.0",
-    "@nx/devkit": "22.4.0-canary.20260113-246d4fd",
-    "@nx/js": "22.4.0-canary.20260113-246d4fd"
+    "@nx/devkit": "22.4.0-canary.20260114-45f2ae3",
+    "@nx/js": "22.4.0-canary.20260114-45f2ae3"
   },
   "devDependencies": {
-    "nx": "22.4.0-canary.20260113-246d4fd"
+    "nx": "22.4.0-canary.20260114-45f2ae3"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/convert-config-to-webpack-plugin/lib/extract-webpack-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extract-webpack-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/webpack/src/generators/convert-config-to-webpack-plugin/lib/extract-webpack-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElC,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM;;;EA4D1E"}
+{"version":3,"file":"extract-webpack-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/webpack/src/generators/convert-config-to-webpack-plugin/lib/extract-webpack-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElC,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM;;;EA+D1E"}

package/src/generators/convert-config-to-webpack-plugin/lib/extract-webpack-options.js

@@ -5,13 +5,13 @@ const tsquery_1 = require("@phenomnomnominal/tsquery");
 const ts = require("typescript");
 function extractWebpackOptions(tree, webpackConfigPath) {
     const source = tree.read(webpackConfigPath).toString('utf-8');
-    const ast = tsquery_1.tsquery.ast(source);
+    const sourceFile = (0, tsquery_1.ast)(source);
     const withNxQuery = 'CallExpression:has(Identifier[name="withNx"])';
     const withReactQuery = 'CallExpression:has(Identifier[name="withReact"])';
     const withWebQuery = 'CallExpression:has(Identifier[name="withWeb"])';
-    const withNxCall = (0, tsquery_1.tsquery)(ast, withNxQuery);
-    const withReactCall = (0, tsquery_1.tsquery)(ast, withReactQuery);
-    const withWebCall = (0, tsquery_1.tsquery)(ast, withWebQuery);
+    const withNxCall = (0, tsquery_1.query)(sourceFile, withNxQuery);
+    const withReactCall = (0, tsquery_1.query)(sourceFile, withReactQuery);
+    const withWebCall = (0, tsquery_1.query)(sourceFile, withWebQuery);
     // If the config is empty set to empty string to avoid undefined. Undefined is used to check if the withNx exists inside of the config file.
     let withNxConfig, withReactConfig;
     withWebCall.forEach((node) => {
@@ -44,14 +44,14 @@ function removeCallExpressions(source, functionNames) {
     let modifiedSource = source;
     functionNames.forEach((functionName) => {
         const callExpressionQuery = `CallExpression:has(Identifier[name="composePlugins"]) > CallExpression:has(Identifier[name="${functionName}"])`;
-        modifiedSource = tsquery_1.tsquery.replace(modifiedSource, callExpressionQuery, () => {
+        modifiedSource = (0, tsquery_1.replace)(modifiedSource, callExpressionQuery, () => {
             return ''; // Removes the entire CallExpression
         });
     });
     return modifiedSource;
 }
 function removeImportDeclarations(source, importName, moduleName) {
-    const sourceFile = tsquery_1.tsquery.ast(source);
+    const sourceFile = (0, tsquery_1.ast)(source);
     const modifiedStatements = sourceFile.statements
         .map((statement) => {
         if (!ts.isVariableStatement(statement))

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

@@ -70,14 +70,14 @@ function skipProjectFilterFactory(tree) {
         if (!webpackConfigPath) {
             return `The webpack config path is missing in the project configuration (${projectConfiguration.root}).`;
         }
-        const sourceFile = tsquery_1.tsquery.ast(tree.read(webpackConfigPath, 'utf-8'));
+        const sourceFile = (0, tsquery_1.ast)(tree.read(webpackConfigPath, 'utf-8'));
         const composePluginsSelector = 'CallExpression:has(Identifier[name=composePlugins])';
-        const composePlugins = (0, tsquery_1.tsquery)(sourceFile, composePluginsSelector)[0];
+        const composePlugins = (0, tsquery_1.query)(sourceFile, composePluginsSelector)[0];
         if (composePlugins) {
             return `The webpack config (${webpackConfigPath}) can only work with the  "@nx/webpack:webpack" executor. Run the "@nx/webpack:convert-config-to-webpack-plugin" generator first.`;
         }
         const nxAppWebpackPluginSelector = 'PropertyAssignment:has(Identifier[name=plugins]) NewExpression:has(Identifier[name=NxAppWebpackPlugin])';
-        const nxAppWebpackPlugin = (0, tsquery_1.tsquery)(sourceFile, nxAppWebpackPluginSelector)[0];
+        const nxAppWebpackPlugin = (0, tsquery_1.query)(sourceFile, nxAppWebpackPluginSelector)[0];
         if (!nxAppWebpackPlugin) {
             return `No "NxAppWebpackPlugin" found in the webpack config (${webpackConfigPath}). Its usage is required for the migration to work.`;
         }

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

@@ -105,7 +105,7 @@ function updateWebpackConfig(tree, webpackConfig, pluginOptions) {
     let webpackConfigText;
     const updateSources = () => {
         webpackConfigText = tree.read(webpackConfig, 'utf-8');
-        sourceFile = tsquery_1.tsquery.ast(webpackConfigText);
+        sourceFile = (0, tsquery_1.ast)(webpackConfigText);
     };
     updateSources();
     setOptionsInWebpackConfig(tree, webpackConfigText, sourceFile, webpackConfig, pluginOptions);
@@ -117,11 +117,11 @@ function updateWebpackConfig(tree, webpackConfig, pluginOptions) {
 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];
+    const optionsVariable = (0, tsquery_1.query)(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];
+    const optionsObject = (0, tsquery_1.query)(optionsVariable, 'ObjectLiteralExpression')[0];
     if (optionsObject.properties.length === 0) {
         defaultOptionsObject = ts.factory.createObjectLiteralExpression(Object.entries(defaultOptions).map(([key, value]) => (0, ast_1.toPropertyAssignment)(key, value)));
     }
@@ -176,7 +176,7 @@ function setOptionsInWebpackConfig(tree, text, sourceFile, webpackConfig, plugin
 }
 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];
+    const nxAppWebpackPlugin = (0, tsquery_1.query)(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
@@ -186,7 +186,7 @@ function setOptionsInNxWebpackPlugin(tree, text, sourceFile, webpackConfig) {
 }
 function setOptionsInLegacyNxPlugin(tree, text, sourceFile, webpackConfig) {
     const legacyNxPluginSelector = 'AwaitExpression CallExpression:has(Identifier[name=useLegacyNxPlugin])';
-    const legacyNxPlugin = (0, tsquery_1.tsquery)(sourceFile, legacyNxPluginSelector)[0];
+    const legacyNxPlugin = (0, tsquery_1.query)(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')]);

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

@@ -179,7 +179,7 @@ function updateWebpackConfig(tree, webpackConfigPath, devServerOptions, context)
     let webpackConfigText;
     const updateSources = () => {
         webpackConfigText = tree.read(webpackConfigPath, 'utf-8');
-        sourceFile = tsquery_1.tsquery.ast(webpackConfigText);
+        sourceFile = (0, tsquery_1.ast)(webpackConfigText);
     };
     updateSources();
     setOptionsInWebpackConfig(tree, webpackConfigText, sourceFile, webpackConfigPath, devServerOptions);
@@ -189,7 +189,7 @@ function updateWebpackConfig(tree, webpackConfigPath, devServerOptions, 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];
+    const configValuesObject = (0, tsquery_1.query)(sourceFile, configValuesSelector)[0];
     // configValues must exist at this point, we added it when processing the build target
     /**
      * const configValues = {
@@ -213,9 +213,9 @@ function setOptionsInWebpackConfig(tree, text, sourceFile, webpackConfigPath, de
         .createPrinter()
         .printNode(ts.EmitHint.Unspecified, updatedConfigValuesObject, sourceFile)}${text.slice(configValuesObject.getEnd())}`;
     tree.write(webpackConfigPath, text);
-    sourceFile = tsquery_1.tsquery.ast(text);
+    sourceFile = (0, tsquery_1.ast)(text);
     const buildOptionsSelector = 'VariableStatement:has(VariableDeclaration:has(Identifier[name=buildOptions]))';
-    const buildOptionsStatement = (0, tsquery_1.tsquery)(sourceFile, buildOptionsSelector)[0];
+    const buildOptionsStatement = (0, tsquery_1.query)(sourceFile, buildOptionsSelector)[0];
     text = `${text.slice(0, buildOptionsStatement.getEnd())}
   const devServerOptions = {
     ...configValues.serve.default,
@@ -225,7 +225,7 @@ function setOptionsInWebpackConfig(tree, text, sourceFile, webpackConfigPath, de
 }
 function setDevServerOptionsInWebpackConfig(tree, text, sourceFile, webpackConfigPath, context) {
     const webpackConfigDevServerSelector = 'ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=devServer])';
-    const webpackConfigDevServer = (0, tsquery_1.tsquery)(sourceFile, webpackConfigDevServerSelector)[0];
+    const webpackConfigDevServer = (0, tsquery_1.query)(sourceFile, webpackConfigDevServerSelector)[0];
     if (webpackConfigDevServer) {
         context.logger.addLog({
             executorName: '@nx/webpack:dev-server',
@@ -240,7 +240,7 @@ function setDevServerOptionsInWebpackConfig(tree, text, sourceFile, webpackConfi
         return;
     }
     const webpackConfigSelector = 'ObjectLiteralExpression:has(PropertyAssignment:has(Identifier[name=plugins]))';
-    const webpackConfig = (0, tsquery_1.tsquery)(sourceFile, webpackConfigSelector)[0];
+    const webpackConfig = (0, tsquery_1.query)(sourceFile, webpackConfigSelector)[0];
     const updatedWebpackConfig = ts.factory.updateObjectLiteralExpression(webpackConfig, [
         ts.factory.createPropertyAssignment('devServer', ts.factory.createIdentifier('devServerOptions')),
         ...webpackConfig.properties,