@nx/storybook 18.1.0-beta.2 → 18.1.0-beta.3

package/package.json

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

package/src/generators/configuration/configuration.js

@@ -20,7 +20,7 @@ async function configurationGeneratorInternal(tree, rawSchema) {
     if ((0, utilities_1.storybookMajorVersion)() === 6) {
         throw new Error((0, utilities_1.pleaseUpgrade)());
     }
-    const schema = normalizeSchema(rawSchema);
+    const schema = normalizeSchema(tree, rawSchema);
     const tasks = [];
     const { projectType, targets, root } = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
     const { compiler } = (0, utilities_1.findStorybookAndBuildTargetsAndCompiler)(targets);
@@ -147,13 +147,16 @@ async function configurationGeneratorInternal(tree, rawSchema) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.configurationGeneratorInternal = configurationGeneratorInternal;
-function normalizeSchema(schema) {
+function normalizeSchema(tree, schema) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
     const defaults = {
         interactionTests: true,
         linter: eslint_1.Linter.EsLint,
         js: false,
         tsConfiguration: true,
-        addPlugin: process.env.NX_ADD_PLUGINS !== 'false',
+        addPlugin,
     };
     return {
         ...defaults,

package/src/generators/configuration/lib/util-functions.js

@@ -299,6 +299,10 @@ function updateLintConfig(tree, schema) {
                     ]);
                 }
             }
+            const ignorePatterns = json.ignorePatterns || [];
+            if (!ignorePatterns.includes('storybook-static')) {
+                ignorePatterns.push('storybook-static');
+            }
             return json;
         });
     }

package/src/generators/init/init.js

@@ -55,7 +55,10 @@ function initGenerator(tree, schema) {
 }
 exports.initGenerator = initGenerator;
 async function initGeneratorInternal(tree, schema) {
-    schema.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    schema.addPlugin ??= addPluginDefault;
     if (schema.addPlugin) {
         (0, utilities_1.addPlugin)(tree);
         (0, update_gitignore_1.updateGitignore)(tree);

package/src/plugins/plugin.js

@@ -65,7 +65,7 @@ exports.createNodes = [
 function buildStorybookTargets(configFilePath, projectRoot, options, context, projectName) {
     const buildOutputs = getOutputs(projectRoot);
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
-    const storybookFramework = getStorybookConfig(configFilePath, context);
+    const storybookFramework = 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,35 +162,33 @@ function serveStaticTarget(options, projectRoot) {
     };
     return targetConfig;
 }
-function getStorybookConfig(configFilePath, context) {
+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];
-    let frameworkName;
     if (storybookConfigImportPackage?.getText() === `'@storybook/core-common'`) {
-        const frameworkPropertyAssignment = tsquery_1.tsquery.query(mainTsJs, `PropertyAssignment:has(Identifier:has([text="framework"]))`)?.[0];
-        if (!frameworkPropertyAssignment) {
-            return;
-        }
-        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];
-            frameworkName = storybookConfigImportPackage?.getText();
-        }
-        else {
-            frameworkName = tsquery_1.tsquery
-                .query(namePropertyAssignment, `StringLiteral`)?.[0]
-                ?.getText();
-        }
+        return parseFrameworkName(mainTsJs);
     }
-    else {
-        frameworkName = storybookConfigImportPackage?.getText();
+    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 frameworkName;
+    return tsquery_1.tsquery.query(namePropertyAssignment, `StringLiteral`)?.[0]?.getText();
 }
 function getOutputs(projectRoot) {
     const normalizedOutputPath = normalizeOutputPath(projectRoot);