@nx/storybook 18.3.3 → 18.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/storybook",
-  "version": "18.3.3",
+  "version": "18.3.4",
   "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": {
@@ -30,14 +30,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "18.3.3",
+    "@nx/devkit": "18.3.4",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
-    "@nx/cypress": "18.3.3",
-    "@nx/js": "18.3.3",
-    "@nx/eslint": "18.3.3",
-    "@nrwl/storybook": "18.3.3"
+    "@nx/cypress": "18.3.4",
+    "@nx/js": "18.3.4",
+    "@nx/eslint": "18.3.4",
+    "@nrwl/storybook": "18.3.4"
   },
   "publishConfig": {
     "access": "public"

package/src/plugins/plugin.js

@@ -8,7 +8,7 @@ const fs_1 = require("fs");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const js_1 = require("@nx/js");
-const tsquery_1 = require("@phenomnomnominal/tsquery");
+const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
 const cachePath = (0, path_1.join)(cache_directory_1.projectGraphCacheDirectory, 'storybook.hash');
 const targetsCache = (0, fs_1.existsSync)(cachePath) ? readTargetsCache() : {};
 const calculatedTargets = {};
@@ -25,7 +25,7 @@ const createDependencies = () => {
 exports.createDependencies = createDependencies;
 exports.createNodes = [
     '**/.storybook/main.{js,ts,mjs,mts,cjs,cts}',
-    (configFilePath, options, context) => {
+    async (configFilePath, options, context) => {
         let projectRoot = '';
         if (configFilePath.includes('/.storybook')) {
             projectRoot = (0, path_1.dirname)(configFilePath).replace('/.storybook', '');
@@ -49,7 +49,7 @@ exports.createNodes = [
         const projectName = buildProjectName(projectRoot, context.workspaceRoot);
         const targets = targetsCache[hash]
             ? targetsCache[hash]
-            : buildStorybookTargets(configFilePath, projectRoot, options, context, projectName);
+            : await buildStorybookTargets(configFilePath, projectRoot, options, context, projectName);
         calculatedTargets[hash] = targets;
         const result = {
             projects: {
@@ -62,11 +62,11 @@ exports.createNodes = [
         return result;
     },
 ];
-function buildStorybookTargets(configFilePath, projectRoot, options, context, projectName) {
+async function buildStorybookTargets(configFilePath, projectRoot, options, context, projectName) {
     const buildOutputs = getOutputs(projectRoot);
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
-    const storybookFramework = getStorybookFramework(configFilePath, context);
-    const frameworkIsAngular = storybookFramework === "'@storybook/angular'";
+    const storybookFramework = await getStorybookFramework(configFilePath, context);
+    const frameworkIsAngular = storybookFramework === '@storybook/angular';
     if (frameworkIsAngular && !projectName) {
         throw new Error(`Could not find a name for the project at '${projectRoot}'. Please make sure that the project has a package.json or project.json file with name specified.`);
     }
@@ -162,33 +162,10 @@ function serveStaticTarget(options, projectRoot) {
     };
     return targetConfig;
 }
-function getStorybookFramework(configFilePath, context) {
+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];
-    if (!importDeclarations) {
-        return parseFrameworkName(mainTsJs);
-    }
-    const storybookConfigImportPackage = tsquery_1.tsquery.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];
-    if (!frameworkPropertyAssignment) {
-        return undefined;
-    }
-    const propertyAssignments = tsquery_1.tsquery.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];
-        return storybookConfigImportPackage?.getText();
-    }
-    return tsquery_1.tsquery.query(namePropertyAssignment, `StringLiteral`)?.[0]?.getText();
+    const { framework } = await (0, config_utils_1.loadConfigFile)(resolvedPath);
+    return typeof framework === 'string' ? framework : framework.name;
 }
 function getOutputs(projectRoot) {
     const normalizedOutputPath = normalizeOutputPath(projectRoot);