@nx/plugin 20.4.0-beta.1 → 20.4.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "20.4.0-beta.1",
+  "version": "20.4.0-beta.2",
   "private": false,
   "description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
   "repository": {
@@ -28,10 +28,10 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "20.4.0-beta.1",
-    "@nx/jest": "20.4.0-beta.1",
-    "@nx/js": "20.4.0-beta.1",
-    "@nx/eslint": "20.4.0-beta.1"
+    "@nx/devkit": "20.4.0-beta.2",
+    "@nx/jest": "20.4.0-beta.2",
+    "@nx/js": "20.4.0-beta.2",
+    "@nx/eslint": "20.4.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/e2e-project/e2e.js

@@ -88,6 +88,7 @@ async function addJest(host, options) {
         skipSerializers: true,
         skipFormat: true,
         addPlugin: options.addPlugin,
+        compiler: options.isTsSolutionSetup ? 'swc' : undefined,
     });
     const { startLocalRegistryPath, stopLocalRegistryPath } = (0, add_local_registry_scripts_1.addLocalRegistryScripts)(host);
     (0, jest_1.addPropertyToJestConfig)(host, (0, path_1.join)(options.projectRoot, 'jest.config.ts'), 'globalSetup', (0, path_1.join)((0, devkit_1.offsetFromRoot)(options.projectRoot), startLocalRegistryPath));

package/src/generators/executor/executor.js

@@ -109,7 +109,7 @@ async function normalizeOptions(tree, options) {
         propertyName,
         description,
         projectRoot,
-        projectSourceRoot,
+        projectSourceRoot: projectSourceRoot ?? (0, path_1.join)(projectRoot, 'src'),
         isTsSolutionSetup: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree),
     };
 }

package/src/generators/generator/generator.js

@@ -36,7 +36,7 @@ async function normalizeOptions(tree, options) {
         propertyName,
         description,
         projectRoot,
-        projectSourceRoot,
+        projectSourceRoot: projectSourceRoot ?? (0, node_path_1.join)(projectRoot, 'src'),
         isTsSolutionSetup: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree),
     };
 }

package/src/generators/migration/migration.js

@@ -26,7 +26,7 @@ async function normalizeOptions(tree, options) {
         name,
         description,
         projectRoot,
-        projectSourceRoot,
+        projectSourceRoot: projectSourceRoot ?? (0, node_path_1.join)(projectRoot, 'src'),
         isTsSolutionSetup: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree),
     };
     return normalized;

package/src/generators/plugin/plugin.js

@@ -20,10 +20,11 @@ async function addFiles(host, options) {
     });
 }
 function updatePluginConfig(host, options) {
-    const project = (0, devkit_1.readProjectConfiguration)(host, options.name);
+    const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     if (project.targets.build) {
         if (options.isTsSolutionSetup && options.bundler === 'tsc') {
-            project.targets.build.options.rootDir = project.sourceRoot;
+            project.targets.build.options.rootDir =
+                project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
             project.targets.build.options.generatePackageJson = false;
         }
         project.targets.build.options.assets = [
@@ -36,7 +37,7 @@ function updatePluginConfig(host, options) {
         else {
             project.targets.build.options.assets.push({ input: `${root}/src`, glob: '**/!(*.ts)', output: './src' }, { input: `${root}/src`, glob: '**/*.d.ts', output: './src' }, { input: root, glob: 'generators.json', output: '.' }, { input: root, glob: 'executors.json', output: '.' });
         }
-        (0, devkit_1.updateProjectConfiguration)(host, options.name, project);
+        (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
     }
 }
 async function pluginGenerator(tree, schema) {
@@ -64,6 +65,12 @@ async function pluginGeneratorInternal(host, schema) {
         skipFormat: true,
         useTscExecutor: true,
     }));
+    if (options.isTsSolutionSetup) {
+        (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (json) => {
+            delete json.type;
+            return json;
+        });
+    }
     if (options.bundler === 'tsc') {
         tasks.push((0, add_tslib_dependencies_1.addTsLibDependencies)(host));
     }
@@ -82,7 +89,7 @@ async function pluginGeneratorInternal(host, schema) {
     updatePluginConfig(host, options);
     if (options.e2eTestRunner !== 'none') {
         tasks.push(await (0, e2e_1.e2eProjectGenerator)(host, {
-            pluginName: options.name,
+            pluginName: options.projectName,
             projectDirectory: options.projectDirectory,
             pluginOutputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.projectRoot),
             npmPackageName: options.npmPackageName,
@@ -94,7 +101,7 @@ async function pluginGeneratorInternal(host, schema) {
         }));
     }
     if (options.linter === eslint_1.Linter.EsLint && !options.skipLintChecks) {
-        await (0, generator_1.default)(host, { projectName: options.name });
+        await (0, generator_1.default)(host, { projectName: options.projectName });
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);

package/src/generators/plugin/utils/normalize-schema.d.ts

@@ -3,6 +3,7 @@ import type { LinterType } from '@nx/eslint';
 import type { Schema } from '../schema';
 export interface NormalizedSchema extends Schema {
     name: string;
+    projectName: string;
     fileName: string;
     projectRoot: string;
     projectDirectory: string;

package/src/generators/plugin/utils/normalize-schema.js

@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const generator_prompts_1 = require("@nx/js/src/utils/generator-prompts");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 async function normalizeOptions(host, options) {
     const linter = await (0, generator_prompts_1.normalizeLinterOption)(host, options.linter);
     const unitTestRunner = await (0, generator_prompts_1.normalizeUnitTestRunnerOption)(host, options.unitTestRunner, ['jest', 'vitest']);
@@ -32,6 +33,9 @@ async function normalizeOptions(host, options) {
         bundler: options.compiler ?? 'tsc',
         fileName: projectName,
         name: projectName,
+        projectName: isTsSolutionSetup
+            ? (0, get_import_path_1.getImportPath)(host, projectName)
+            : projectName,
         projectRoot,
         projectDirectory,
         parsedTags,