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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/storybook",
-  "version": "22.4.0-canary.20260113-246d4fd",
+  "version": "22.4.0-canary.20260115-21d1555",
   "private": false,
   "description": "The Nx Plugin for Storybook contains executors and generators for allowing your workspace to use the powerful Storybook integration testing & documenting capabilities.",
   "repository": {
@@ -33,16 +33,16 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.4.0-canary.20260113-246d4fd",
-    "@phenomnomnominal/tsquery": "~5.0.1",
+    "@nx/devkit": "22.4.0-canary.20260115-21d1555",
+    "@phenomnomnominal/tsquery": "~6.1.4",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
-    "@nx/cypress": "22.4.0-canary.20260113-246d4fd",
-    "@nx/js": "22.4.0-canary.20260113-246d4fd",
-    "@nx/eslint": "22.4.0-canary.20260113-246d4fd"
+    "@nx/cypress": "22.4.0-canary.20260115-21d1555",
+    "@nx/js": "22.4.0-canary.20260115-21d1555",
+    "@nx/eslint": "22.4.0-canary.20260115-21d1555"
   },
   "devDependencies": {
-    "nx": "22.4.0-canary.20260113-246d4fd",
+    "nx": "22.4.0-canary.20260115-21d1555",
     "storybook": "9.0.6"
   },
   "peerDependencies": {

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

@@ -101,13 +101,11 @@ function handlePropertiesFromTargetOptions(tree, options, defaultConfigDir, proj
 function moveDocsModeToConfigFile(tree, configDir, projectName, migrationLogs, useConfigValues = true) {
     const configFilePath = (0, utils_1.getConfigFilePath)(tree, configDir);
     const configFileContents = tree.read(configFilePath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configFileContents);
+    const sourceFile = (0, tsquery_1.ast)(configFileContents);
     const CONFIG_OBJECT_SELECTOR = 'VariableDeclaration:has(Identifier[name=config]) ObjectLiteralExpression';
     const DOCS_MODE_SELECTOR = 'PropertyAssignment:has(Identifier[name=docs]) PropertyAssignment:has(Identifier[name=docsMode])';
     const DOCS_SELECTOR = 'PropertyAssignment:has(Identifier[name=docs])';
-    const configNodes = (0, tsquery_1.tsquery)(ast, CONFIG_OBJECT_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const configNodes = (0, tsquery_1.query)(sourceFile, CONFIG_OBJECT_SELECTOR);
     if (configNodes.length === 0) {
         // Invalid config file
         migrationLogs.addLog({
@@ -118,16 +116,13 @@ function moveDocsModeToConfigFile(tree, configDir, projectName, migrationLogs, u
         return;
     }
     const configNode = configNodes[0];
-    const hasDocsMode = (0, tsquery_1.tsquery)(configNode, DOCS_MODE_SELECTOR, { visitAllChildren: true }).length >
-        0;
+    const hasDocsMode = (0, tsquery_1.query)(configNode, DOCS_MODE_SELECTOR).length > 0;
     if (hasDocsMode) {
         return;
     }
     let startPosition = configNode.getStart() + 1;
     let needsDocObject = true;
-    const docsNodes = (0, tsquery_1.tsquery)(configNode, DOCS_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const docsNodes = (0, tsquery_1.query)(configNode, DOCS_SELECTOR);
     if (docsNodes.length > 0) {
         needsDocObject = false;
         startPosition = docsNodes[0].getStart() + 1;
@@ -141,12 +136,10 @@ function moveDocsModeToConfigFile(tree, configDir, projectName, migrationLogs, u
 function moveStaticDirToConfigFile(tree, configDir, projectName, migrationLogs, useConfigValues = true) {
     const configFilePath = (0, utils_1.getConfigFilePath)(tree, configDir);
     const configFileContents = tree.read(configFilePath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configFileContents);
+    const sourceFile = (0, tsquery_1.ast)(configFileContents);
     const CONFIG_OBJECT_SELECTOR = 'VariableDeclaration:has(Identifier[name=config]) ObjectLiteralExpression';
     const STATIC_DIRS_SELECTOR = 'PropertyAssignment:has(Identifier[name=staticDirs])';
-    const configNodes = (0, tsquery_1.tsquery)(ast, CONFIG_OBJECT_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const configNodes = (0, tsquery_1.query)(sourceFile, CONFIG_OBJECT_SELECTOR);
     if (configNodes.length === 0) {
         // Invalid config file
         migrationLogs.addLog({
@@ -157,8 +150,7 @@ function moveStaticDirToConfigFile(tree, configDir, projectName, migrationLogs,
         return;
     }
     const configNode = configNodes[0];
-    const hasStaticDir = (0, tsquery_1.tsquery)(configNode, STATIC_DIRS_SELECTOR, { visitAllChildren: true })
-        .length > 0;
+    const hasStaticDir = (0, tsquery_1.query)(configNode, STATIC_DIRS_SELECTOR).length > 0;
     if (hasStaticDir) {
         return;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/storybook/src/generators/convert-to-inferred/lib/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAA+B,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,gEAAgE,CAAC;AAK/F,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,UAS9D;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAkCtD;AAED,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuCnC,CAAC;AAEF,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,aAAa,QA+E7B;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAKf;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM;;;EAIzE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/storybook/src/generators/convert-to-inferred/lib/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAA+B,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,gEAAgE,CAAC;AAK/F,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,UAS9D;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAgCtD;AAED,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuCnC,CAAC;AAEF,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,aAAa,QAmE7B;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAKf;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM;;;EAIzE"}

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

@@ -23,11 +23,9 @@ function getConfigFilePath(tree, configDir) {
 function addConfigValuesToConfigFile(tree, configFile, configValues) {
     const IMPORT_PROPERTY_SELECTOR = 'ImportDeclaration';
     const configFileContents = tree.read(configFile, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configFileContents);
+    const sourceFile = (0, tsquery_1.ast)(configFileContents);
     // AST TO GET SECTION TO APPEND TO
-    const importNodes = (0, tsquery_1.tsquery)(ast, IMPORT_PROPERTY_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const importNodes = (0, tsquery_1.query)(sourceFile, IMPORT_PROPERTY_SELECTOR);
     let startPosition = 0;
     if (importNodes.length !== 0) {
         const lastImportNode = importNodes[importNodes.length - 1];
@@ -93,34 +91,23 @@ function ensureViteConfigPathIsRelative(tree, configPath, projectName, projectRo
     if (configFileContents.includes('viteFinal:')) {
         return;
     }
-    const ast = tsquery_1.tsquery.ast(configFileContents);
+    const sourceFile = (0, tsquery_1.ast)(configFileContents);
     const REACT_FRAMEWORK_SELECTOR_IDENTIFIERS = 'PropertyAssignment:has(Identifier[name=framework]) PropertyAssignment:has(Identifier[name=name]) StringLiteral[value=@storybook/react-vite]';
     const REACT_FRAMEWORK_SELECTOR_STRING_LITERALS = 'PropertyAssignment:has(StringLiteral[value=framework]) PropertyAssignment:has(StringLiteral[value=name]) StringLiteral[value=@storybook/react-vite]';
     const VUE_FRAMEWORK_SELECTOR_IDENTIFIERS = 'PropertyAssignment:has(Identifier[name=framework]) PropertyAssignment:has(Identifier[name=name]) StringLiteral[value=@storybook/vue3-vite]';
     const VUE_FRAMEWORK_SELECTOR_STRING_LITERALS = 'PropertyAssignment:has(StringLiteral[value=framework]) PropertyAssignment:has(StringLiteral[value=name]) StringLiteral[value=@storybook/vue3-vite]';
-    const isUsingVite = (0, tsquery_1.tsquery)(ast, REACT_FRAMEWORK_SELECTOR_IDENTIFIERS, {
-        visitAllChildren: true,
-    }).length > 0 ||
-        (0, tsquery_1.tsquery)(ast, REACT_FRAMEWORK_SELECTOR_STRING_LITERALS, {
-            visitAllChildren: true,
-        }).length > 0 ||
-        (0, tsquery_1.tsquery)(ast, VUE_FRAMEWORK_SELECTOR_STRING_LITERALS, {
-            visitAllChildren: true,
-        }).length > 0 ||
-        (0, tsquery_1.tsquery)(ast, VUE_FRAMEWORK_SELECTOR_IDENTIFIERS, { visitAllChildren: true })
-            .length > 0;
+    const isUsingVite = (0, tsquery_1.query)(sourceFile, REACT_FRAMEWORK_SELECTOR_IDENTIFIERS).length > 0 ||
+        (0, tsquery_1.query)(sourceFile, REACT_FRAMEWORK_SELECTOR_STRING_LITERALS).length > 0 ||
+        (0, tsquery_1.query)(sourceFile, VUE_FRAMEWORK_SELECTOR_STRING_LITERALS).length > 0 ||
+        (0, tsquery_1.query)(sourceFile, VUE_FRAMEWORK_SELECTOR_IDENTIFIERS).length > 0;
     if (!isUsingVite) {
         return;
     }
     const VITE_CONFIG_PATH_SELECTOR = 'PropertyAssignment:has(Identifier[name=framework]) PropertyAssignment PropertyAssignment PropertyAssignment:has(Identifier[name=viteConfigPath]) > StringLiteral';
-    let viteConfigPathNodes = (0, tsquery_1.tsquery)(ast, VITE_CONFIG_PATH_SELECTOR, {
-        visitAllChildren: true,
-    });
+    let viteConfigPathNodes = (0, tsquery_1.query)(sourceFile, VITE_CONFIG_PATH_SELECTOR);
     if (viteConfigPathNodes.length === 0) {
         const VITE_CONFIG_PATH_SELECTOR_STRING_LITERALS = 'PropertyAssignment:has(StringLiteral[value=framework]) PropertyAssignment PropertyAssignment PropertyAssignment:has(StringLiteral[value=viteConfigPath]) > StringLiteral:not(StringLiteral[value=viteConfigPath])';
-        viteConfigPathNodes = (0, tsquery_1.tsquery)(ast, VITE_CONFIG_PATH_SELECTOR_STRING_LITERALS, {
-            visitAllChildren: true,
-        });
+        viteConfigPathNodes = (0, tsquery_1.query)(sourceFile, VITE_CONFIG_PATH_SELECTOR_STRING_LITERALS);
         if (viteConfigPathNodes.length === 0) {
             migrationLogs.addLog({
                 project: projectName,

package/src/plugins/plugin.js

@@ -193,30 +193,30 @@ function serveStaticTarget(options, projectRoot) {
 async function getStorybookFramework(configFilePath, context) {
     const resolvedPath = (0, path_1.join)(context.workspaceRoot, configFilePath);
     const mainTsJs = (0, fs_1.readFileSync)(resolvedPath, 'utf-8');
-    const importDeclarations = tsquery_1.tsquery.query(mainTsJs, 'ImportDeclaration:has(ImportSpecifier:has([text="StorybookConfig"]))')?.[0];
+    const importDeclarations = (0, tsquery_1.query)(mainTsJs, 'ImportDeclaration:has(ImportSpecifier:has([text="StorybookConfig"]))')?.[0];
     if (!importDeclarations) {
         return parseFrameworkName(mainTsJs);
     }
-    const storybookConfigImportPackage = tsquery_1.tsquery.query(importDeclarations, 'StringLiteral')?.[0];
+    const storybookConfigImportPackage = (0, tsquery_1.query)(importDeclarations, 'StringLiteral')?.[0];
     if (storybookConfigImportPackage?.getText() === `'@storybook/core-common'`) {
         return parseFrameworkName(mainTsJs);
     }
     return storybookConfigImportPackage?.getText();
 }
 function parseFrameworkName(mainTsJs) {
-    const frameworkPropertyAssignment = tsquery_1.tsquery.query(mainTsJs, `PropertyAssignment:has(Identifier:has([text="framework"]))`)?.[0];
+    const frameworkPropertyAssignment = (0, tsquery_1.query)(mainTsJs, `PropertyAssignment:has(Identifier:has([text="framework"]))`)?.[0];
     if (!frameworkPropertyAssignment) {
         return undefined;
     }
-    const propertyAssignments = tsquery_1.tsquery.query(frameworkPropertyAssignment, `PropertyAssignment:has(Identifier:has([text="name"]))`);
+    const propertyAssignments = (0, tsquery_1.query)(frameworkPropertyAssignment, `PropertyAssignment:has(Identifier:has([text="name"]))`);
     const namePropertyAssignment = propertyAssignments?.find((expression) => {
         return expression.getText().startsWith('name');
     });
     if (!namePropertyAssignment) {
-        const storybookConfigImportPackage = tsquery_1.tsquery.query(frameworkPropertyAssignment, 'StringLiteral')?.[0];
+        const storybookConfigImportPackage = (0, tsquery_1.query)(frameworkPropertyAssignment, 'StringLiteral')?.[0];
         return storybookConfigImportPackage?.getText();
     }
-    return tsquery_1.tsquery.query(namePropertyAssignment, `StringLiteral`)?.[0]?.getText();
+    return (0, tsquery_1.query)(namePropertyAssignment, `StringLiteral`)?.[0]?.getText();
 }
 async function getStorybookFullyResolvedFramework(configFilePath, context) {
     const resolvedPath = (0, path_1.join)(context.workspaceRoot, configFilePath);