@nx/storybook 20.6.2 → 20.6.4

package/package.json

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

package/src/generators/configuration/lib/edit-root-tsconfig.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.editRootTsConfig = editRootTsConfig;
 const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
 /**
  * This is a temporary fix for Storybook to support TypeScript configuration files.
  * The issue is that if there is a root tsconfig.json file, Storybook will use it, and
@@ -13,21 +14,21 @@ function editRootTsConfig(tree) {
         return;
     }
     (0, devkit_1.updateJson)(tree, 'tsconfig.json', (json) => {
-        if (json['ts-node']) {
-            json['ts-node'] = {
-                ...json['ts-node'],
-                compilerOptions: {
-                    ...(json['ts-node'].compilerOptions ?? {}),
-                    module: 'commonjs',
-                },
-            };
+        json['ts-node'] ??= {};
+        json['ts-node'].compilerOptions ??= {};
+        json['ts-node'].compilerOptions.module = 'commonjs';
+        json['ts-node'].compilerOptions.moduleResolution = 'node10';
+        if (json.compilerOptions?.customConditions) {
+            json['ts-node'].compilerOptions.customConditions = null;
         }
         else {
-            json['ts-node'] = {
-                compilerOptions: {
-                    module: 'commonjs',
-                },
-            };
+            const rootTsconfigFile = (0, js_1.getRootTsConfigFileName)(tree);
+            if (rootTsconfigFile) {
+                const rootTsconfigJson = (0, devkit_1.readJson)(tree, rootTsconfigFile);
+                if (rootTsconfigJson.compilerOptions?.customConditions) {
+                    json['ts-node'].compilerOptions.customConditions = null;
+                }
+            }
         }
         return json;
     });