@nx/rspack 22.4.0-canary.20260113-246d4fd → 22.4.0-canary.20260115-21d1555

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/rspack",
   "description": "The Nx Plugin for Rspack contains executors and generators that support building applications using Rspack.",
-  "version": "22.4.0-canary.20260113-246d4fd",
+  "version": "22.4.0-canary.20260115-21d1555",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -24,11 +24,11 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/devkit": "22.4.0-canary.20260113-246d4fd",
-    "@nx/js": "22.4.0-canary.20260113-246d4fd",
-    "@nx/module-federation": "22.4.0-canary.20260113-246d4fd",
-    "@nx/web": "22.4.0-canary.20260113-246d4fd",
-    "@phenomnomnominal/tsquery": "~5.0.1",
+    "@nx/devkit": "22.4.0-canary.20260115-21d1555",
+    "@nx/js": "22.4.0-canary.20260115-21d1555",
+    "@nx/module-federation": "22.4.0-canary.20260115-21d1555",
+    "@nx/web": "22.4.0-canary.20260115-21d1555",
+    "@phenomnomnominal/tsquery": "~6.1.4",
     "@rspack/core": "1.6.8",
     "@rspack/dev-server": "^1.1.4",
     "@rspack/plugin-react-refresh": "^1.0.0",
@@ -57,8 +57,8 @@
     "webpack-node-externals": "^3.0.0"
   },
   "devDependencies": {
-    "nx": "22.4.0-canary.20260113-246d4fd",
-    "@nx/nest": "22.4.0-canary.20260113-246d4fd"
+    "nx": "22.4.0-canary.20260115-21d1555",
+    "@nx/nest": "22.4.0-canary.20260115-21d1555"
   },
   "peerDependencies": {
     "@module-federation/enhanced": "^0.21.2",

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

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

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

@@ -6,13 +6,13 @@ const tsquery_1 = require("@phenomnomnominal/tsquery");
 const ts = tslib_1.__importStar(require("typescript"));
 function extractRspackOptions(tree, rspackConfigPath) {
     const source = tree.read(rspackConfigPath).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) => {
@@ -45,14 +45,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 (!rspackConfigPath) {
             return `The rspack config path is missing in the project configuration (${projectConfiguration.root}).`;
         }
-        const sourceFile = tsquery_1.tsquery.ast(tree.read(rspackConfigPath, 'utf-8'));
+        const sourceFile = (0, tsquery_1.ast)(tree.read(rspackConfigPath, '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 rspack config (${rspackConfigPath}) can only work with the  "@nx/rspack:rspack" executor. Run the "@nx/rspack:convert-config-to-rspack-plugin" generator first.`;
         }
         const nxAppRspackPluginSelector = 'PropertyAssignment:has(Identifier[name=plugins]) NewExpression:has(Identifier[name=NxAppRspackPlugin])';
-        const nxAppRspackPlugin = (0, tsquery_1.tsquery)(sourceFile, nxAppRspackPluginSelector)[0];
+        const nxAppRspackPlugin = (0, tsquery_1.query)(sourceFile, nxAppRspackPluginSelector)[0];
         if (!nxAppRspackPlugin) {
             return `No "NxAppRspackPlugin" found in the rspack config (${rspackConfigPath}). 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 updateRspackConfig(tree, rspackConfig, pluginOptions) {
     let rspackConfigText;
     const updateSources = () => {
         rspackConfigText = tree.read(rspackConfig, 'utf-8');
-        sourceFile = tsquery_1.tsquery.ast(rspackConfigText);
+        sourceFile = (0, tsquery_1.ast)(rspackConfigText);
     };
     updateSources();
     setOptionsInRspackConfig(tree, rspackConfigText, sourceFile, rspackConfig, pluginOptions);
@@ -117,11 +117,11 @@ function updateRspackConfig(tree, rspackConfig, pluginOptions) {
 function setOptionsInRspackConfig(tree, text, sourceFile, rspackConfig, 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-rspack-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 setOptionsInRspackConfig(tree, text, sourceFile, rspackConfig, pluginOp
 }
 function setOptionsInNxRspackPlugin(tree, text, sourceFile, rspackConfig) {
     const nxAppRspackPluginSelector = 'PropertyAssignment:has(Identifier[name=plugins]) NewExpression:has(Identifier[name=NxAppRspackPlugin])';
-    const nxAppRspackPlugin = (0, tsquery_1.tsquery)(sourceFile, nxAppRspackPluginSelector)[0];
+    const nxAppRspackPlugin = (0, tsquery_1.query)(sourceFile, nxAppRspackPluginSelector)[0];
     // the NxAppRspackPlugin must exists, otherwise, the migration doesn't run and we wouldn't reach this point
     const updatedNxAppRspackPlugin = ts.factory.updateNewExpression(nxAppRspackPlugin, nxAppRspackPlugin.expression, undefined, [ts.factory.createIdentifier('buildOptions')]);
     text = `${text.slice(0, nxAppRspackPlugin.getStart())}${ts
@@ -186,7 +186,7 @@ function setOptionsInNxRspackPlugin(tree, text, sourceFile, rspackConfig) {
 }
 function setOptionsInLegacyNxPlugin(tree, text, sourceFile, rspackConfig) {
     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-rspack-plugin` generates
     // we've already "ensured" that the `convert-config-to-rspack-plugin` was run by checking for the `NxAppRspackPlugin` 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

@@ -134,7 +134,7 @@ function updateRspackConfig(tree, rspackConfigPath, devServerOptions, context) {
     let rspackConfigText;
     const updateSources = () => {
         rspackConfigText = tree.read(rspackConfigPath, 'utf-8');
-        sourceFile = tsquery_1.tsquery.ast(rspackConfigText);
+        sourceFile = (0, tsquery_1.ast)(rspackConfigText);
     };
     updateSources();
     setOptionsInRspackConfig(tree, rspackConfigText, sourceFile, rspackConfigPath, devServerOptions);
@@ -144,7 +144,7 @@ function updateRspackConfig(tree, rspackConfigPath, devServerOptions, context) {
 function setOptionsInRspackConfig(tree, text, sourceFile, rspackConfigPath, 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 = {
@@ -168,9 +168,9 @@ function setOptionsInRspackConfig(tree, text, sourceFile, rspackConfigPath, devS
         .createPrinter()
         .printNode(ts.EmitHint.Unspecified, updatedConfigValuesObject, sourceFile)}${text.slice(configValuesObject.getEnd())}`;
     tree.write(rspackConfigPath, 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,
@@ -180,7 +180,7 @@ function setOptionsInRspackConfig(tree, text, sourceFile, rspackConfigPath, devS
 }
 function setDevServerOptionsInRspackConfig(tree, text, sourceFile, rspackConfigPath, context) {
     const rspackConfigDevServerSelector = 'ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=devServer])';
-    const rspackConfigDevServer = (0, tsquery_1.tsquery)(sourceFile, rspackConfigDevServerSelector)[0];
+    const rspackConfigDevServer = (0, tsquery_1.query)(sourceFile, rspackConfigDevServerSelector)[0];
     if (rspackConfigDevServer) {
         context.logger.addLog({
             executorName: '@nx/rspack:dev-server',
@@ -195,7 +195,7 @@ function setDevServerOptionsInRspackConfig(tree, text, sourceFile, rspackConfigP
         return;
     }
     const rspackConfigSelector = 'ObjectLiteralExpression:has(PropertyAssignment:has(Identifier[name=plugins]))';
-    const rspackConfig = (0, tsquery_1.tsquery)(sourceFile, rspackConfigSelector)[0];
+    const rspackConfig = (0, tsquery_1.query)(sourceFile, rspackConfigSelector)[0];
     const updatedRspackConfig = ts.factory.updateObjectLiteralExpression(rspackConfig, [
         ts.factory.createPropertyAssignment('devServer', ts.factory.createIdentifier('devServerOptions')),
         ...rspackConfig.properties,

package/src/generators/convert-webpack/lib/transform-cjs.js

@@ -24,9 +24,9 @@ function detectJsExtensions(configContents) {
 }
 function transformWithWebCalls(tree, configPath) {
     const configContents = tree.read(configPath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configContents);
+    const sourceFile = (0, tsquery_1.ast)(configContents);
     // Find withWeb() calls
-    const withWebCallNodes = (0, tsquery_1.tsquery)(ast, 'CallExpression > Identifier[name=withWeb]');
+    const withWebCallNodes = (0, tsquery_1.query)(sourceFile, 'CallExpression > Identifier[name=withWeb]');
     // If there are withWeb calls, update them
     if (withWebCallNodes.length > 0) {
         let newContents = configContents;
@@ -64,7 +64,7 @@ function transformWithWebCalls(tree, configPath) {
         return;
     }
     // If no withWeb calls, check for withReact calls
-    const withReactCallNodes = (0, tsquery_1.tsquery)(ast, 'CallExpression > Identifier[name=withReact]');
+    const withReactCallNodes = (0, tsquery_1.query)(sourceFile, 'CallExpression > Identifier[name=withReact]');
     if (withReactCallNodes.length === 0) {
         return;
     }
@@ -103,14 +103,14 @@ function transformWithWebCalls(tree, configPath) {
 }
 function transformComposePlugins(tree, configPath, scope) {
     const configContents = tree.read(configPath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configContents);
+    const sourceFile = (0, tsquery_1.ast)(configContents);
     const HAS_COMPOSE_PLUGINS_FROM_NX_WEBPACK = `VariableDeclaration:has(Identifier[name=composePlugins]) > CallExpression:has(Identifier[name=require]) StringLiteral[value=${scope}/webpack]`;
-    const nodes = (0, tsquery_1.tsquery)(ast, HAS_COMPOSE_PLUGINS_FROM_NX_WEBPACK);
+    const nodes = (0, tsquery_1.query)(sourceFile, HAS_COMPOSE_PLUGINS_FROM_NX_WEBPACK);
     if (nodes.length === 0) {
         return;
     }
     const COMPOSE_PLUGINS_IMPORT = 'VariableDeclaration:has(Identifier[name=composePlugins]) Identifier[name=composePlugins]';
-    const composePluginsNodes = (0, tsquery_1.tsquery)(ast, COMPOSE_PLUGINS_IMPORT);
+    const composePluginsNodes = (0, tsquery_1.query)(sourceFile, COMPOSE_PLUGINS_IMPORT);
     if (nodes.length === 0) {
         return;
     }
@@ -125,14 +125,14 @@ function transformComposePlugins(tree, configPath, scope) {
 }
 function transformWithNx(tree, configPath, scope) {
     const configContents = tree.read(configPath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configContents);
+    const sourceFile = (0, tsquery_1.ast)(configContents);
     const HAS_WITH_NX_FROM_NX_WEBPACK = `VariableDeclaration:has(Identifier[name=withNx]) > CallExpression:has(Identifier[name=require]) StringLiteral[value=${scope}/webpack]`;
-    const nodes = (0, tsquery_1.tsquery)(ast, HAS_WITH_NX_FROM_NX_WEBPACK);
+    const nodes = (0, tsquery_1.query)(sourceFile, HAS_WITH_NX_FROM_NX_WEBPACK);
     if (nodes.length === 0) {
         return;
     }
     const WITH_NX_IMPORT = 'VariableDeclaration:has(Identifier[name=withNx]) Identifier[name=withNx]';
-    const withNxNodes = (0, tsquery_1.tsquery)(ast, WITH_NX_IMPORT);
+    const withNxNodes = (0, tsquery_1.query)(sourceFile, WITH_NX_IMPORT);
     if (nodes.length === 0) {
         return;
     }
@@ -147,14 +147,14 @@ function transformWithNx(tree, configPath, scope) {
 }
 function transformWithWeb(tree, configPath, scope) {
     const configContents = tree.read(configPath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configContents);
+    const sourceFile = (0, tsquery_1.ast)(configContents);
     const HAS_WITH_WEB_FROM_NX_WEBPACK = `VariableDeclaration:has(Identifier[name=withWeb]) > CallExpression:has(Identifier[name=require]) StringLiteral[value=${scope}/webpack]`;
-    const nodes = (0, tsquery_1.tsquery)(ast, HAS_WITH_WEB_FROM_NX_WEBPACK);
+    const nodes = (0, tsquery_1.query)(sourceFile, HAS_WITH_WEB_FROM_NX_WEBPACK);
     if (nodes.length === 0) {
         return;
     }
     const WITH_WEB_IMPORT = 'VariableDeclaration:has(Identifier[name=withWeb]) Identifier[name=withWeb]';
-    const withWebNodes = (0, tsquery_1.tsquery)(ast, WITH_WEB_IMPORT);
+    const withWebNodes = (0, tsquery_1.query)(sourceFile, WITH_WEB_IMPORT);
     if (nodes.length === 0) {
         return;
     }
@@ -169,14 +169,14 @@ function transformWithWeb(tree, configPath, scope) {
 }
 function transformWithReact(tree, configPath, scope) {
     const configContents = tree.read(configPath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configContents);
+    const sourceFile = (0, tsquery_1.ast)(configContents);
     const HAS_WITH_REACT_FROM_NX_REACT = `VariableDeclaration:has(Identifier[name=withReact]) > CallExpression:has(Identifier[name=require]) StringLiteral[value=${scope}/react]`;
-    const nodes = (0, tsquery_1.tsquery)(ast, HAS_WITH_REACT_FROM_NX_REACT);
+    const nodes = (0, tsquery_1.query)(sourceFile, HAS_WITH_REACT_FROM_NX_REACT);
     if (nodes.length === 0) {
         return;
     }
     const WITH_REACT_IMPORT = 'VariableDeclaration:has(Identifier[name=withReact]) Identifier[name=withReact]';
-    const withReactNodes = (0, tsquery_1.tsquery)(ast, WITH_REACT_IMPORT);
+    const withReactNodes = (0, tsquery_1.query)(sourceFile, WITH_REACT_IMPORT);
     if (nodes.length === 0) {
         return;
     }
@@ -191,14 +191,14 @@ function transformWithReact(tree, configPath, scope) {
 }
 function transformModuleFederationConfig(tree, configPath, scope) {
     const configContents = tree.read(configPath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configContents);
+    const sourceFile = (0, tsquery_1.ast)(configContents);
     const HAS_WITH_MODULE_FEDERATION_FROM_NX_REACT = `VariableDeclaration:has(Identifier[name=ModuleFederationConfig]) > CallExpression:has(Identifier[name=require]) StringLiteral[value=${scope}/webpack]`;
-    const nodes = (0, tsquery_1.tsquery)(ast, HAS_WITH_MODULE_FEDERATION_FROM_NX_REACT);
+    const nodes = (0, tsquery_1.query)(sourceFile, HAS_WITH_MODULE_FEDERATION_FROM_NX_REACT);
     if (nodes.length === 0) {
         return;
     }
     const WITH_MODULE_FEDERATION_IMPORT = 'VariableDeclaration:has(Identifier[name=ModuleFederationConfig]) Identifier[name=ModuleFederationConfig]';
-    const withModuleFederationNodes = (0, tsquery_1.tsquery)(ast, WITH_MODULE_FEDERATION_IMPORT);
+    const withModuleFederationNodes = (0, tsquery_1.query)(sourceFile, WITH_MODULE_FEDERATION_IMPORT);
     if (nodes.length === 0) {
         return;
     }
@@ -213,14 +213,14 @@ function transformModuleFederationConfig(tree, configPath, scope) {
 }
 function transformWithModuleFederation(tree, configPath, scope, usesJsExtensions) {
     const configContents = tree.read(configPath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configContents);
+    const sourceFile = (0, tsquery_1.ast)(configContents);
     const HAS_WITH_MODULE_FEDERATION_FROM_NX_REACT = `VariableDeclaration:has(Identifier[name=withModuleFederation]) > CallExpression:has(Identifier[name=require]) StringLiteral[value="${scope}/module-federation/webpack${usesJsExtensions ? '.js' : ''}"]`;
-    const nodes = (0, tsquery_1.tsquery)(ast, HAS_WITH_MODULE_FEDERATION_FROM_NX_REACT);
+    const nodes = (0, tsquery_1.query)(sourceFile, HAS_WITH_MODULE_FEDERATION_FROM_NX_REACT);
     if (nodes.length === 0) {
         return;
     }
     const WITH_MODULE_FEDERATION_IMPORT = 'VariableDeclaration:has(Identifier[name=withModuleFederation]) Identifier[name=withModuleFederation]';
-    const withModuleFederationNodes = (0, tsquery_1.tsquery)(ast, WITH_MODULE_FEDERATION_IMPORT);
+    const withModuleFederationNodes = (0, tsquery_1.query)(sourceFile, WITH_MODULE_FEDERATION_IMPORT);
     if (nodes.length === 0) {
         return;
     }
@@ -238,14 +238,14 @@ function transformWithModuleFederation(tree, configPath, scope, usesJsExtensions
 }
 function transformWithModuleFederationSSR(tree, configPath, scope, usesJsExtensions) {
     const configContents = tree.read(configPath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configContents);
+    const sourceFile = (0, tsquery_1.ast)(configContents);
     const HAS_WITH_MODULE_FEDERATION_FROM_NX_REACT = `VariableDeclaration:has(Identifier[name=withModuleFederationForSSR]) > CallExpression:has(Identifier[name=require]) StringLiteral[value="${scope}/module-federation/webpack${usesJsExtensions ? '.js' : ''}"]`;
-    const nodes = (0, tsquery_1.tsquery)(ast, HAS_WITH_MODULE_FEDERATION_FROM_NX_REACT);
+    const nodes = (0, tsquery_1.query)(sourceFile, HAS_WITH_MODULE_FEDERATION_FROM_NX_REACT);
     if (nodes.length === 0) {
         return;
     }
     const WITH_MODULE_FEDERATION_IMPORT = 'VariableDeclaration:has(Identifier[name=withModuleFederationForSSR]) Identifier[name=withModuleFederationForSSR]';
-    const withModuleFederationNodes = (0, tsquery_1.tsquery)(ast, WITH_MODULE_FEDERATION_IMPORT);
+    const withModuleFederationNodes = (0, tsquery_1.query)(sourceFile, WITH_MODULE_FEDERATION_IMPORT);
     if (nodes.length === 0) {
         return;
     }

package/src/generators/convert-webpack/lib/transform-esm.js

@@ -24,9 +24,9 @@ function detectJsExtensions(configContents) {
 }
 function transformWithWebCalls(tree, configPath) {
     const configContents = tree.read(configPath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configContents);
+    const sourceFile = (0, tsquery_1.ast)(configContents);
     // Find withWeb() calls
-    const withWebCallNodes = (0, tsquery_1.tsquery)(ast, 'CallExpression > Identifier[name=withWeb]');
+    const withWebCallNodes = (0, tsquery_1.query)(sourceFile, 'CallExpression > Identifier[name=withWeb]');
     // If there are withWeb calls, update them
     if (withWebCallNodes.length > 0) {
         let newContents = configContents;
@@ -64,7 +64,7 @@ function transformWithWebCalls(tree, configPath) {
         return;
     }
     // If no withWeb calls, check for withReact calls
-    const withReactCallNodes = (0, tsquery_1.tsquery)(ast, 'CallExpression > Identifier[name=withReact]');
+    const withReactCallNodes = (0, tsquery_1.query)(sourceFile, 'CallExpression > Identifier[name=withReact]');
     if (withReactCallNodes.length === 0) {
         return;
     }
@@ -103,14 +103,14 @@ function transformWithWebCalls(tree, configPath) {
 }
 function transformComposePlugins(tree, configPath, scope) {
     const configContents = tree.read(configPath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configContents);
+    const sourceFile = (0, tsquery_1.ast)(configContents);
     const HAS_COMPOSE_PLUGINS_FROM_NX_WEBPACK = `ImportDeclaration:has(Identifier[name=composePlugins]) > StringLiteral[value=${scope}/webpack]`;
-    const nodes = (0, tsquery_1.tsquery)(ast, HAS_COMPOSE_PLUGINS_FROM_NX_WEBPACK);
+    const nodes = (0, tsquery_1.query)(sourceFile, HAS_COMPOSE_PLUGINS_FROM_NX_WEBPACK);
     if (nodes.length === 0) {
         return;
     }
     const COMPOSE_PLUGINS_IMPORT = 'ImportDeclaration:has(Identifier[name=composePlugins]) Identifier[name=composePlugins]';
-    const composePluginsNodes = (0, tsquery_1.tsquery)(ast, COMPOSE_PLUGINS_IMPORT);
+    const composePluginsNodes = (0, tsquery_1.query)(sourceFile, COMPOSE_PLUGINS_IMPORT);
     if (nodes.length === 0) {
         return;
     }
@@ -125,14 +125,14 @@ function transformComposePlugins(tree, configPath, scope) {
 }
 function transformWithNx(tree, configPath, scope) {
     const configContents = tree.read(configPath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configContents);
+    const sourceFile = (0, tsquery_1.ast)(configContents);
     const HAS_WITH_NX_FROM_NX_WEBPACK = `ImportDeclaration:has(Identifier[name=withNx]) > StringLiteral[value=${scope}/webpack]`;
-    const nodes = (0, tsquery_1.tsquery)(ast, HAS_WITH_NX_FROM_NX_WEBPACK);
+    const nodes = (0, tsquery_1.query)(sourceFile, HAS_WITH_NX_FROM_NX_WEBPACK);
     if (nodes.length === 0) {
         return;
     }
     const WITH_NX_IMPORT = 'ImportDeclaration:has(Identifier[name=withNx]) Identifier[name=withNx]';
-    const withNxNodes = (0, tsquery_1.tsquery)(ast, WITH_NX_IMPORT);
+    const withNxNodes = (0, tsquery_1.query)(sourceFile, WITH_NX_IMPORT);
     if (nodes.length === 0) {
         return;
     }
@@ -147,14 +147,14 @@ function transformWithNx(tree, configPath, scope) {
 }
 function transformWithWeb(tree, configPath, scope) {
     const configContents = tree.read(configPath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configContents);
+    const sourceFile = (0, tsquery_1.ast)(configContents);
     const HAS_WITH_WEB_FROM_NX_WEBPACK = `ImportDeclaration:has(Identifier[name=withWeb]) > StringLiteral[value=${scope}/webpack]`;
-    const nodes = (0, tsquery_1.tsquery)(ast, HAS_WITH_WEB_FROM_NX_WEBPACK);
+    const nodes = (0, tsquery_1.query)(sourceFile, HAS_WITH_WEB_FROM_NX_WEBPACK);
     if (nodes.length === 0) {
         return;
     }
     const WITH_WEB_IMPORT = 'ImportDeclaration:has(Identifier[name=withWeb]) Identifier[name=withWeb]';
-    const withWebNodes = (0, tsquery_1.tsquery)(ast, WITH_WEB_IMPORT);
+    const withWebNodes = (0, tsquery_1.query)(sourceFile, WITH_WEB_IMPORT);
     if (nodes.length === 0) {
         return;
     }
@@ -169,14 +169,14 @@ function transformWithWeb(tree, configPath, scope) {
 }
 function transformWithReact(tree, configPath, scope) {
     const configContents = tree.read(configPath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configContents);
+    const sourceFile = (0, tsquery_1.ast)(configContents);
     const HAS_WITH_REACT_FROM_NX_REACT = `ImportDeclaration:has(Identifier[name=withReact]) > StringLiteral[value=${scope}/react]`;
-    const nodes = (0, tsquery_1.tsquery)(ast, HAS_WITH_REACT_FROM_NX_REACT);
+    const nodes = (0, tsquery_1.query)(sourceFile, HAS_WITH_REACT_FROM_NX_REACT);
     if (nodes.length === 0) {
         return;
     }
     const WITH_REACT_IMPORT = 'ImportDeclaration:has(Identifier[name=withReact]) Identifier[name=withReact]';
-    const withReactNodes = (0, tsquery_1.tsquery)(ast, WITH_REACT_IMPORT);
+    const withReactNodes = (0, tsquery_1.query)(sourceFile, WITH_REACT_IMPORT);
     if (nodes.length === 0) {
         return;
     }
@@ -191,14 +191,14 @@ function transformWithReact(tree, configPath, scope) {
 }
 function transformWithModuleFederation(tree, configPath, scope, usesJsExtension) {
     const configContents = tree.read(configPath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configContents);
+    const sourceFile = (0, tsquery_1.ast)(configContents);
     const HAS_WITH_MODULE_FEDERATION_FROM_NX_REACT = `ImportDeclaration:has(Identifier[name=withModuleFederation]) > StringLiteral[value="${scope}/module-federation/webpack${usesJsExtension ? '.js' : ''}"]`;
-    const nodes = (0, tsquery_1.tsquery)(ast, HAS_WITH_MODULE_FEDERATION_FROM_NX_REACT);
+    const nodes = (0, tsquery_1.query)(sourceFile, HAS_WITH_MODULE_FEDERATION_FROM_NX_REACT);
     if (nodes.length === 0) {
         return;
     }
     const WITH_MODULE_FEDERATION_IMPORT = 'ImportDeclaration:has(Identifier[name=withModuleFederation]) Identifier[name=withModuleFederation]';
-    const withModuleFederationNodes = (0, tsquery_1.tsquery)(ast, WITH_MODULE_FEDERATION_IMPORT);
+    const withModuleFederationNodes = (0, tsquery_1.query)(sourceFile, WITH_MODULE_FEDERATION_IMPORT);
     if (nodes.length === 0) {
         return;
     }
@@ -216,14 +216,14 @@ function transformWithModuleFederation(tree, configPath, scope, usesJsExtension)
 }
 function transformModuleFederationConfig(tree, configPath, scope) {
     const configContents = tree.read(configPath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configContents);
+    const sourceFile = (0, tsquery_1.ast)(configContents);
     const HAS_WITH_MODULE_FEDERATION_FROM_NX_REACT = `ImportDeclaration:has(Identifier[name=ModuleFederationConfig]) > StringLiteral[value=${scope}/webpack]`;
-    const nodes = (0, tsquery_1.tsquery)(ast, HAS_WITH_MODULE_FEDERATION_FROM_NX_REACT);
+    const nodes = (0, tsquery_1.query)(sourceFile, HAS_WITH_MODULE_FEDERATION_FROM_NX_REACT);
     if (nodes.length === 0) {
         return;
     }
     const WITH_MODULE_FEDERATION_IMPORT = 'ImportDeclaration:has(Identifier[name=ModuleFederationConfig]) Identifier[name=ModuleFederationConfig]';
-    const withModuleFederationNodes = (0, tsquery_1.tsquery)(ast, WITH_MODULE_FEDERATION_IMPORT);
+    const withModuleFederationNodes = (0, tsquery_1.query)(sourceFile, WITH_MODULE_FEDERATION_IMPORT);
     if (nodes.length === 0) {
         return;
     }
@@ -238,14 +238,14 @@ function transformModuleFederationConfig(tree, configPath, scope) {
 }
 function transformWithModuleFederationSSR(tree, configPath, scope, usesJsExtensions) {
     const configContents = tree.read(configPath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configContents);
+    const sourceFile = (0, tsquery_1.ast)(configContents);
     const HAS_WITH_MODULE_FEDERATION_FROM_NX_REACT = `ImportDeclaration:has(Identifier[name=withModuleFederationForSSR]) > StringLiteral[value="${scope}/module-federation/webpack${usesJsExtensions ? '.js' : ''}"]`;
-    const nodes = (0, tsquery_1.tsquery)(ast, HAS_WITH_MODULE_FEDERATION_FROM_NX_REACT);
+    const nodes = (0, tsquery_1.query)(sourceFile, HAS_WITH_MODULE_FEDERATION_FROM_NX_REACT);
     if (nodes.length === 0) {
         return;
     }
     const WITH_MODULE_FEDERATION_IMPORT = 'ImportDeclaration:has(Identifier[name=withModuleFederationForSSR]) Identifier[name=withModuleFederationForSSR]';
-    const withModuleFederationNodes = (0, tsquery_1.tsquery)(ast, WITH_MODULE_FEDERATION_IMPORT);
+    const withModuleFederationNodes = (0, tsquery_1.query)(sourceFile, WITH_MODULE_FEDERATION_IMPORT);
     if (nodes.length === 0) {
         return;
     }

package/src/generators/convert-webpack/lib/transform-plugin-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform-plugin-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/rspack/src/generators/convert-webpack/lib/transform-plugin-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAIvC,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,QAU1E"}
+{"version":3,"file":"transform-plugin-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/rspack/src/generators/convert-webpack/lib/transform-plugin-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAIvC,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,QAkB1E"}

package/src/generators/convert-webpack/lib/transform-plugin-config.js

@@ -4,44 +4,38 @@ exports.transformPluginConfig = transformPluginConfig;
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 function transformPluginConfig(tree, webpackConfigPath) {
     const webpackConfigContents = tree.read(webpackConfigPath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(webpackConfigContents);
+    let sourceFile = (0, tsquery_1.ast)(webpackConfigContents);
     let newConfigContents = webpackConfigContents;
     if (webpackConfigContents.includes("require('@nx/webpack/app-plugin')")) {
-        newConfigContents = transformCjsConfig(tree, webpackConfigContents, ast);
+        newConfigContents = transformCjsConfig(tree, webpackConfigContents, sourceFile);
     }
     else {
-        newConfigContents = transformEsmConfig(tree, webpackConfigContents, ast);
+        newConfigContents = transformEsmConfig(tree, webpackConfigContents, sourceFile);
     }
     tree.write(webpackConfigPath, newConfigContents);
 }
-function transformCjsConfig(tree, webpackConfigContents, ast) {
+function transformCjsConfig(tree, webpackConfigContents, sourceFile) {
     // Convert require('@nx/webpack/app-plugin') to require('@nx/rspack/app-plugin')
     const WEBPACK_APP_PLUGIN_REQUIRE_SELECTOR = 'CallExpression:has(Identifier[name=require]) > StringLiteral[value=@nx/webpack/app-plugin]';
-    let nodes = (0, tsquery_1.tsquery)(ast, WEBPACK_APP_PLUGIN_REQUIRE_SELECTOR, {
-        visitAllChildren: true,
-    });
+    let nodes = (0, tsquery_1.query)(sourceFile, WEBPACK_APP_PLUGIN_REQUIRE_SELECTOR);
     if (nodes.length === 0) {
         return webpackConfigContents;
     }
     const requireNode = nodes[0];
     webpackConfigContents = `${webpackConfigContents.slice(0, requireNode.getStart())}'@nx/rspack/app-plugin'${webpackConfigContents.slice(requireNode.getEnd())}`;
     // Convert const { NxAppWebpackPlugin } to const { NxAppRspackPlugin }
-    ast = tsquery_1.tsquery.ast(webpackConfigContents);
+    sourceFile = (0, tsquery_1.ast)(webpackConfigContents);
     const WEBPACK_APP_BINDING_ELEMENT_SELECTOR = 'BindingElement:has(Identifier[name=NxAppWebpackPlugin])';
-    nodes = (0, tsquery_1.tsquery)(ast, WEBPACK_APP_BINDING_ELEMENT_SELECTOR, {
-        visitAllChildren: true,
-    });
+    nodes = (0, tsquery_1.query)(sourceFile, WEBPACK_APP_BINDING_ELEMENT_SELECTOR);
     if (nodes.length === 0) {
         return webpackConfigContents;
     }
     const bindingElement = nodes[0];
     webpackConfigContents = `${webpackConfigContents.slice(0, bindingElement.getStart())}NxAppRspackPlugin${webpackConfigContents.slice(bindingElement.getEnd())}`;
     // Convert new NxAppWebpackPlugin() to new NxAppRspackPlugin()
-    ast = tsquery_1.tsquery.ast(webpackConfigContents);
+    sourceFile = (0, tsquery_1.ast)(webpackConfigContents);
     const WEBPACK_APP_INSTANTIATION_SELECTOR = 'NewExpression > Identifier[name=NxAppWebpackPlugin]';
-    nodes = (0, tsquery_1.tsquery)(ast, WEBPACK_APP_INSTANTIATION_SELECTOR, {
-        visitAllChildren: true,
-    });
+    nodes = (0, tsquery_1.query)(sourceFile, WEBPACK_APP_INSTANTIATION_SELECTOR);
     if (nodes.length === 0) {
         return webpackConfigContents;
     }
@@ -49,34 +43,28 @@ function transformCjsConfig(tree, webpackConfigContents, ast) {
     webpackConfigContents = `${webpackConfigContents.slice(0, instantiation.getStart())}NxAppRspackPlugin${webpackConfigContents.slice(instantiation.getEnd())}`;
     return webpackConfigContents;
 }
-function transformEsmConfig(tree, webpackConfigContents, ast) {
+function transformEsmConfig(tree, webpackConfigContents, sourceFile) {
     // Convert from '@nx/webpack/app-plugin' to from '@nx/rspack/app-plugin'
     const WEBPACK_APP_PLUGIN_IMPORT_SELECTOR = 'ImportClause ~ StringLiteral[value=@nx/webpack/app-plugin]';
-    let nodes = (0, tsquery_1.tsquery)(ast, WEBPACK_APP_PLUGIN_IMPORT_SELECTOR, {
-        visitAllChildren: true,
-    });
+    let nodes = (0, tsquery_1.query)(sourceFile, WEBPACK_APP_PLUGIN_IMPORT_SELECTOR);
     if (nodes.length === 0) {
         return webpackConfigContents;
     }
     const importNode = nodes[0];
     webpackConfigContents = `${webpackConfigContents.slice(0, importNode.getStart())}'@nx/rspack/app-plugin'${webpackConfigContents.slice(importNode.getEnd())}`;
     // Convert import { NxAppWebpackPlugin } to import { NxAppRspackPlugin }
-    ast = tsquery_1.tsquery.ast(webpackConfigContents);
+    sourceFile = (0, tsquery_1.ast)(webpackConfigContents);
     const WEBPACK_APP_IMPORT_SPECIFIER_SELECTOR = 'ImportSpecifier > Identifier[name=NxAppWebpackPlugin]';
-    nodes = (0, tsquery_1.tsquery)(ast, WEBPACK_APP_IMPORT_SPECIFIER_SELECTOR, {
-        visitAllChildren: true,
-    });
+    nodes = (0, tsquery_1.query)(sourceFile, WEBPACK_APP_IMPORT_SPECIFIER_SELECTOR);
     if (nodes.length === 0) {
         return webpackConfigContents;
     }
     const importSpecifier = nodes[0];
     webpackConfigContents = `${webpackConfigContents.slice(0, importSpecifier.getStart())}NxAppRspackPlugin${webpackConfigContents.slice(importSpecifier.getEnd())}`;
     // Convert new NxAppWebpackPlugin() to new NxAppRspackPlugin()
-    ast = tsquery_1.tsquery.ast(webpackConfigContents);
+    sourceFile = (0, tsquery_1.ast)(webpackConfigContents);
     const WEBPACK_APP_INSTANTIATION_SELECTOR = 'NewExpression > Identifier[name=NxAppWebpackPlugin]';
-    nodes = (0, tsquery_1.tsquery)(ast, WEBPACK_APP_INSTANTIATION_SELECTOR, {
-        visitAllChildren: true,
-    });
+    nodes = (0, tsquery_1.query)(sourceFile, WEBPACK_APP_INSTANTIATION_SELECTOR);
     if (nodes.length === 0) {
         return webpackConfigContents;
     }

package/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.js

@@ -22,8 +22,8 @@ async function migrateWithMfImport(tree) {
             if (!contents.includes('@nx/rspack/module-federation')) {
                 return;
             }
-            const ast = tsquery_1.tsquery.ast(contents);
-            const importNodes = (0, tsquery_1.tsquery)(ast, NX_RSPACK_MODULE_FEDERATION_IMPORT_SELECTOR);
+            const sourceFile = (0, tsquery_1.ast)(contents);
+            const importNodes = (0, tsquery_1.query)(sourceFile, NX_RSPACK_MODULE_FEDERATION_IMPORT_SELECTOR);
             if (importNodes.length === 0) {
                 return;
             }

package/src/utils/generator-utils.js

@@ -490,7 +490,7 @@ async function handleUnknownExecutors(projectName) {
 function determineFrameworkAndTarget(tree, options, projectRoot, targets) {
     (0, ensure_typescript_1.ensureTypescript)();
     // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const { ast, query } = require('@phenomnomnominal/tsquery');
     // First try to infer if the target is node
     if (options.target !== 'node') {
         // Try to infer from jest config if the env is node
@@ -506,16 +506,16 @@ function determineFrameworkAndTarget(tree, options, projectRoot, targets) {
             return { target: options.target, framework: options.framework };
         }
         const appFileContent = tree.read(jestConfigPath, 'utf-8');
-        const file = tsquery.ast(appFileContent);
+        const file = ast(appFileContent);
         // find testEnvironment: 'node' in jest config
-        const testEnvironment = tsquery(file, `PropertyAssignment:has(Identifier[name="testEnvironment"]) > StringLiteral[value="node"]`);
+        const testEnvironment = query(file, `PropertyAssignment:has(Identifier[name="testEnvironment"]) > StringLiteral[value="node"]`);
         if (testEnvironment.length > 0) {
             return { target: 'node', framework: options.framework };
         }
         if (tree.exists((0, devkit_1.joinPathFragments)(projectRoot, 'src/main.ts'))) {
             const appFileContent = tree.read((0, devkit_1.joinPathFragments)(projectRoot, 'src/main.ts'), 'utf-8');
-            const file = tsquery.ast(appFileContent);
-            const hasNestJsDependency = tsquery(file, `ImportDeclaration:has(StringLiteral[value="@nestjs/common"])`);
+            const file = ast(appFileContent);
+            const hasNestJsDependency = query(file, `ImportDeclaration:has(StringLiteral[value="@nestjs/common"])`);
             if (hasNestJsDependency?.length > 0) {
                 return { target: 'node', framework: 'nest' };
             }