@nx/js 20.0.0-beta.2 → 20.0.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "20.0.0-beta.2",
+  "version": "20.0.0-beta.3",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -39,8 +39,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "20.0.0-beta.2",
-    "@nx/workspace": "20.0.0-beta.2",
+    "@nx/devkit": "20.0.0-beta.3",
+    "@nx/workspace": "20.0.0-beta.3",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.1",
@@ -61,7 +61,7 @@
     "ts-node": "10.9.1",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nrwl/js": "20.0.0-beta.2"
+    "@nrwl/js": "20.0.0-beta.3"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/generators/init/init.js

@@ -74,14 +74,23 @@ async function initGeneratorInternal(tree, schema) {
         });
         tasks.push(prettierTask);
     }
+    const rootTsConfigFileName = (0, ts_config_1.getRootTsConfigFileName)(tree);
+    // If the root tsconfig file uses `importHelpers` then we must install tslib
+    // in order to run tsc for build and typecheck.
+    if (rootTsConfigFileName) {
+        const rootTsConfig = (0, devkit_1.readJson)(tree, rootTsConfigFileName);
+        if (rootTsConfig.compilerOptions?.importHelpers) {
+            devDependencies['tslib'] = versions_1.tsLibVersion;
+        }
+    }
     const installTask = !schema.skipPackageJson
         ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, schema.keepExistingVersions)
         : () => { };
     tasks.push(installTask);
+    if (!schema.skipPackageJson && schema.setUpPrettier) {
+        (0, devkit_1.ensurePackage)('prettier', versions_1.prettierVersion);
+    }
     if (!schema.skipFormat) {
-        if (!schema.skipPackageJson) {
-            (0, devkit_1.ensurePackage)('prettier', versions_1.prettierVersion);
-        }
         // even if skipPackageJson === true, we can safely run formatFiles, prettier might
         // have been installed earlier and if not, the formatFiles function still handles it
         await (0, devkit_1.formatFiles)(tree);

package/src/generators/library/library.js

@@ -103,9 +103,6 @@ async function libraryGeneratorInternal(tree, schema) {
             (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
         ]);
     }
-    if (options.bundler !== 'none') {
-        addBundlerDependencies(tree, options);
-    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
@@ -267,23 +264,6 @@ async function addLint(tree, options) {
     }
     return task;
 }
-function addBundlerDependencies(tree, options) {
-    (0, devkit_1.updateJson)(tree, `${options.projectRoot}/package.json`, (json) => {
-        if (options.bundler === 'tsc') {
-            json.dependencies = {
-                ...json.dependencies,
-                tslib: versions_1.tsLibVersion,
-            };
-        }
-        else if (options.bundler === 'swc') {
-            json.dependencies = {
-                ...json.dependencies,
-                '@swc/helpers': versions_1.swcHelpersVersion,
-            };
-        }
-        return json;
-    });
-}
 function updateTsConfig(tree, options) {
     (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.projectRoot, 'tsconfig.json'), (json) => {
         if (options.strict) {

package/src/generators/setup-prettier/generator.js

@@ -8,10 +8,10 @@ async function setupPrettierGenerator(tree, options) {
     const prettierTask = (0, prettier_1.generatePrettierSetup)(tree, {
         skipPackageJson: options.skipPackageJson,
     });
+    if (!options.skipPackageJson) {
+        (0, devkit_1.ensurePackage)('prettier', versions_1.prettierVersion);
+    }
     if (!options.skipFormat) {
-        if (!options.skipPackageJson) {
-            (0, devkit_1.ensurePackage)('prettier', versions_1.prettierVersion);
-        }
         // even if skipPackageJson === true, we can safely run formatFiles, prettier might
         // have been installed earlier and if not, the formatFiles function still handles it
         await (0, devkit_1.formatFiles)(tree);