@nx/js 19.2.0-beta.4 → 19.2.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "19.2.0-beta.4",
+  "version": "19.2.0-beta.6",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -58,9 +58,9 @@
     "semver": "^7.5.3",
     "source-map-support": "0.5.19",
     "tslib": "^2.3.0",
-    "@nx/devkit": "19.2.0-beta.4",
-    "@nx/workspace": "19.2.0-beta.4",
-    "@nrwl/js": "19.2.0-beta.4"
+    "@nx/devkit": "19.2.0-beta.6",
+    "@nx/workspace": "19.2.0-beta.6",
+    "@nrwl/js": "19.2.0-beta.6"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/generators/library/library.js

@@ -41,6 +41,14 @@ async function libraryGeneratorInternal(tree, schema) {
     if (options.publishable) {
         tasks.push(await (0, generator_1.default)(tree, { ...options, skipFormat: true }));
     }
+    if (options.bundler === 'rollup') {
+        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
+        await configurationGenerator(tree, {
+            project: options.name,
+            compiler: 'swc',
+            format: ['cjs', 'esm'],
+        });
+    }
     if (options.bundler === 'vite') {
         const { viteConfigurationGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
         const viteTask = await viteConfigurationGenerator(tree, {
@@ -124,36 +132,31 @@ async function addProject(tree, options) {
     if (options.bundler &&
         options.bundler !== 'none' &&
         options.config !== 'npm-scripts') {
-        const outputPath = getOutputPath(options);
-        const executor = getBuildExecutor(options.bundler);
-        (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, executor);
-        projectConfiguration.targets.build = {
-            executor,
-            outputs: ['{options.outputPath}'],
-            options: {
-                outputPath,
-                main: `${options.projectRoot}/src/index` + (options.js ? '.js' : '.ts'),
-                tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
-                assets: [],
-            },
-        };
-        if (options.bundler === 'esbuild') {
-            projectConfiguration.targets.build.options.generatePackageJson = true;
-            projectConfiguration.targets.build.options.format = ['cjs'];
-        }
-        if (options.bundler === 'rollup') {
-            projectConfiguration.targets.build.options.project = `${options.projectRoot}/package.json`;
-            projectConfiguration.targets.build.options.compiler = 'swc';
-            projectConfiguration.targets.build.options.format = ['cjs', 'esm'];
-        }
-        if (options.bundler === 'swc' && options.skipTypeCheck) {
-            projectConfiguration.targets.build.options.skipTypeCheck = true;
-        }
-        if (!options.minimal &&
-            // TODO(jack): assets for rollup have validation that we need to fix (assets must be under <project-root>/src)
-            options.bundler !== 'rollup') {
-            projectConfiguration.targets.build.options.assets ??= [];
-            projectConfiguration.targets.build.options.assets.push((0, devkit_1.joinPathFragments)(options.projectRoot, '*.md'));
+        if (options.bundler !== 'rollup') {
+            const outputPath = getOutputPath(options);
+            const executor = getBuildExecutor(options.bundler);
+            (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, executor);
+            projectConfiguration.targets.build = {
+                executor,
+                outputs: ['{options.outputPath}'],
+                options: {
+                    outputPath,
+                    main: `${options.projectRoot}/src/index` + (options.js ? '.js' : '.ts'),
+                    tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
+                    assets: [],
+                },
+            };
+            if (options.bundler === 'esbuild') {
+                projectConfiguration.targets.build.options.generatePackageJson = true;
+                projectConfiguration.targets.build.options.format = ['cjs'];
+            }
+            if (options.bundler === 'swc' && options.skipTypeCheck) {
+                projectConfiguration.targets.build.options.skipTypeCheck = true;
+            }
+            if (!options.minimal) {
+                projectConfiguration.targets.build.options.assets ??= [];
+                projectConfiguration.targets.build.options.assets.push((0, devkit_1.joinPathFragments)(options.projectRoot, '*.md'));
+            }
         }
         if (options.publishable) {
             const packageRoot = (0, path_1.join)(defaultOutputDirectory, '{projectRoot}');
@@ -201,6 +204,8 @@ async function addLint(tree, options) {
         setParserOptionsProject: options.setParserOptionsProject,
         rootProject: options.rootProject,
         addPlugin: options.addPlugin,
+        // Since the build target is inferred now, we need to let the generator know to add @nx/dependency-checks regardless.
+        addPackageJsonDependencyChecks: options.bundler !== 'none',
     });
     const { addOverrideToLintConfig, lintConfigHasOverride, isEslintConfigSupported, updateOverrideInLintConfig,
     // nx-ignore-next-line

package/src/plugins/rollup/type-definitions.d.ts

@@ -1,7 +1,6 @@
 import type { OutputBundle } from 'rollup';
 export declare function typeDefinitions(options: {
     projectRoot: string;
-    main: string;
 }): {
     name: string;
     generateBundle(_opts: unknown, bundle: OutputBundle): Promise<void>;

package/src/plugins/typescript/plugin.js

@@ -31,7 +31,7 @@ exports.createDependencies = createDependencies;
 exports.PLUGIN_NAME = '@nx/js/typescript';
 exports.createNodes = [
     '**/tsconfig*.json',
-    (configFilePath, options, context) => {
+    async (configFilePath, options, context) => {
         const pluginOptions = normalizePluginOptions(options);
         const projectRoot = (0, node_path_1.dirname)(configFilePath);
         const fullConfigPath = (0, devkit_1.joinPathFragments)(context.workspaceRoot, configFilePath);
@@ -46,7 +46,7 @@ exports.createNodes = [
             !siblingFiles.includes('tsconfig.json')) {
             return {};
         }
-        const nodeHash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, pluginOptions, context, [(0, lock_file_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
+        const nodeHash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, pluginOptions, context, [(0, lock_file_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
         // The hash is calculated at the node/project level, so we add the config file path to avoid conflicts when caching
         const cacheKey = `${nodeHash}_${configFilePath}`;
         targetsCache[cacheKey] ??= buildTscTargets(fullConfigPath, projectRoot, pluginOptions, context);