@nx/storybook 21.1.2 → 21.1.3

package/README.md

@@ -1,7 +1,7 @@
 <p style="text-align: center;">
   <picture>
     <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
-    <img alt="Nx - Smart Monorepos · Fast CI" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
+    <img alt="Nx - Smart Repos · Fast Builds" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
   </picture>
 </p>
 
@@ -20,9 +20,9 @@
 
 <hr>
 
-# Nx: Smart Monorepos · Fast CI
+# Nx: Smart Repos · Fast Builds
 
-Nx is a build system, optimized for monorepos, with plugins for popular frameworks and tools and advanced CI capabilities including caching and distribution.
+An AI-first build platform that connects everything from your editor to CI. Helping you deliver fast, without breaking things.
 
 This package is a [Storybook plugin for Nx](https://nx.dev/nx-api/storybook).
 
@@ -64,5 +64,5 @@ npx nx@latest init
 - [Blog Posts About Nx](https://nx.dev/blog)
 
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart Monorepos · Fast CI"></a></p>
+width="100%" alt="Nx - Smart Repos · Fast Builds"></a></p>
 

package/package.json

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

package/src/plugins/plugin.js

@@ -10,6 +10,7 @@ const cache_directory_1 = require("nx/src/utils/cache-directory");
 const js_1 = require("@nx/js");
 const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
 const file_hasher_1 = require("nx/src/hasher/file-hasher");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
 function readTargetsCache(cachePath) {
     return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
 }
@@ -79,7 +80,10 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
 async function buildStorybookTargets(configFilePath, projectRoot, options, context, projectName) {
     const buildOutputs = getOutputs();
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
-    const storybookFramework = await getStorybookFramework(configFilePath, context);
+    // First attempt to do a very fast lookup for the framework
+    // If that fails, the framework might be inherited, so do a very heavyweight lookup
+    const storybookFramework = (await getStorybookFramework(configFilePath, context)) ||
+        (await getStorybookFullyResolvedFramework(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.`);
@@ -190,6 +194,34 @@ function serveStaticTarget(options, projectRoot) {
     return targetConfig;
 }
 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();
+}
+async function getStorybookFullyResolvedFramework(configFilePath, context) {
     const resolvedPath = (0, path_1.join)(context.workspaceRoot, configFilePath);
     const { framework } = await (0, config_utils_1.loadConfigFile)(resolvedPath);
     return typeof framework === 'string' ? framework : framework.name;