@nx/plugin 0.0.0-pr-31222-862e973 → 0.0.0-pr-31313-387cdca

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2024 Narwhal Technologies Inc.
+Copyright (c) 2017-2025 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/README.md

@@ -9,7 +9,7 @@
 
 [![CircleCI](https://circleci.com/gh/nrwl/nx.svg?style=svg)](https://circleci.com/gh/nrwl/nx)
 [![License](https://img.shields.io/npm/l/@nx/workspace.svg?style=flat-square)]()
-[![NPM Version](https://badge.fury.io/js/%40nrwl%2Fworkspace.svg)](https://www.npmjs.com/@nx/workspace)
+[![NPM Version](https://badge.fury.io/js/nx.svg)](https://www.npmjs.com/package/nx)
 [![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)]()
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 [![Join the chat at https://gitter.im/nrwl-nx/community](https://badges.gitter.im/nrwl-nx/community.svg)](https://gitter.im/nrwl-nx/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

package/generators.json

@@ -19,17 +19,17 @@
       "description": "Create a E2E application for a Nx Plugin."
     },
     "migration": {
-      "factory": "./src/generators/migration/migration#migrationGeneratorInternal",
+      "factory": "./src/generators/migration/migration",
       "schema": "./src/generators/migration/schema.json",
       "description": "Create a migration for an Nx Plugin."
     },
     "generator": {
-      "factory": "./src/generators/generator/generator#generatorGeneratorInternal",
+      "factory": "./src/generators/generator/generator",
       "schema": "./src/generators/generator/schema.json",
       "description": "Create a generator for an Nx Plugin."
     },
     "executor": {
-      "factory": "./src/generators/executor/executor#executorGeneratorInternal",
+      "factory": "./src/generators/executor/executor",
       "schema": "./src/generators/executor/schema.json",
       "description": "Create an executor for an Nx Plugin."
     },
@@ -39,7 +39,7 @@
       "description": "Adds linting configuration to validate common json files for nx plugins."
     },
     "preset": {
-      "factory": "./src/generators/preset/generator",
+      "factory": "./src/generators/preset/generator#presetGeneratorInternal",
       "schema": "./src/generators/preset/schema.json",
       "description": "Initializes a workspace with an nx-plugin inside of it. Use as: `create-nx-workspace --preset @nx/plugin`.",
       "hidden": true,

package/migrations.json

@@ -1,22 +1,3 @@
 {
-  "generators": {
-    "update-remove-cli-prop": {
-      "version": "16.0.0-beta.1",
-      "cli": "nx",
-      "description": "Removes CLI property within schema.json files and moves generators and schematics to the proper root node in migrations.json",
-      "factory": "./src/migrations/update-16-0-0/cli-in-schema-json"
-    },
-    "update-16-0-0-add-nx-packages": {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/nx-plugin with @nx/plugin",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
-    },
-    "update-16-2-0-replace-e2e-executor": {
-      "cli": "nx",
-      "version": "16.2.0-beta.0",
-      "description": "Replace @nx/plugin:e2e with @nx/jest",
-      "implementation": "./src/migrations/update-16-2-0/replace-e2e-executor"
-    }
-  }
+  "generators": {}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "0.0.0-pr-31222-862e973",
+  "version": "0.0.0-pr-31313-387cdca",
   "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,11 +28,10 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "0.0.0-pr-31222-862e973",
-    "@nx/jest": "0.0.0-pr-31222-862e973",
-    "@nx/js": "0.0.0-pr-31222-862e973",
-    "@nx/eslint": "0.0.0-pr-31222-862e973",
-    "@nrwl/nx-plugin": "0.0.0-pr-31222-862e973"
+    "@nx/devkit": "0.0.0-pr-31313-387cdca",
+    "@nx/jest": "0.0.0-pr-31313-387cdca",
+    "@nx/js": "0.0.0-pr-31313-387cdca",
+    "@nx/eslint": "0.0.0-pr-31313-387cdca"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/create-package/create-package.js

@@ -5,15 +5,17 @@ exports.createPackageGeneratorInternal = createPackageGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const add_tslib_dependencies_1 = require("@nx/js/src/utils/typescript/add-tslib-dependencies");
-const versions_1 = require("nx/src/utils/versions");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const versions_1 = require("@nx/js/src/utils/versions");
+const versions_2 = require("nx/src/utils/versions");
+const path_1 = require("path");
+const has_generator_1 = require("../../utils/has-generator");
 const generator_1 = require("../generator/generator");
 const normalize_schema_1 = require("./utils/normalize-schema");
-const has_generator_1 = require("../../utils/has-generator");
-const path_1 = require("path");
-const versions_2 = require("@nx/js/src/utils/versions");
 async function createPackageGenerator(host, schema) {
     return await createPackageGeneratorInternal(host, {
-        projectNameAndRootFormat: 'derived',
+        useProjectJson: true,
+        addPlugin: false,
         ...schema,
     });
 }
@@ -25,10 +27,11 @@ async function createPackageGeneratorInternal(host, schema) {
         tasks.push((0, add_tslib_dependencies_1.addTsLibDependencies)(host));
     }
     const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {
-        'create-nx-workspace': versions_1.nxVersion,
+        'create-nx-workspace': versions_2.nxVersion,
     }, {});
     tasks.push(installTask);
-    await createCliPackage(host, options, pluginPackageName);
+    const cliPackageTask = await createCliPackage(host, options, pluginPackageName);
+    tasks.push(cliPackageTask);
     if (options.e2eProject) {
         addE2eProject(host, options);
     }
@@ -46,19 +49,20 @@ async function createPackageGeneratorInternal(host, schema) {
 async function addPresetGenerator(host, schema) {
     const { root: projectRoot } = (0, devkit_1.readProjectConfiguration)(host, schema.project);
     if (!(0, has_generator_1.hasGenerator)(host, schema.project, 'preset')) {
-        await (0, generator_1.default)(host, {
+        await (0, generator_1.generatorGenerator)(host, {
             name: 'preset',
-            directory: (0, path_1.join)(projectRoot, 'src/generators/preset'),
+            path: (0, path_1.join)(projectRoot, 'src/generators/preset/generator'),
             unitTestRunner: schema.unitTestRunner,
             skipFormat: true,
-            nameAndDirectoryFormat: 'as-provided',
+            skipLintChecks: schema.linter === 'none',
         });
     }
     return (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(projectRoot, 'package.json'))?.name;
 }
 async function createCliPackage(host, options, pluginPackageName) {
-    await (0, js_1.libraryGenerator)(host, {
+    const jsLibraryTask = await (0, js_1.libraryGenerator)(host, {
         ...options,
+        directory: options.directory,
         rootProject: false,
         config: 'project',
         publishable: true,
@@ -66,16 +70,26 @@ async function createCliPackage(host, options, pluginPackageName) {
         importPath: options.name,
         skipFormat: true,
         skipTsConfig: true,
+        useTscExecutor: true,
     });
     host.delete((0, devkit_1.joinPathFragments)(options.projectRoot, 'src'));
+    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     // Add the bin entry to the package.json
     (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (packageJson) => {
         packageJson.bin = {
             [options.name]: './bin/index.js',
         };
+        if (isTsSolutionSetup) {
+            packageJson.bin[options.name] = './dist/bin/index.js';
+            // this package only exposes a binary entry point and no JS programmatic API
+            delete packageJson.main;
+            delete packageJson.types;
+            delete packageJson.typings;
+            delete packageJson.exports;
+        }
         packageJson.dependencies = {
-            'create-nx-workspace': versions_1.nxVersion,
-            ...(options.bundler === 'tsc' && { tslib: versions_2.tsLibVersion }),
+            'create-nx-workspace': versions_2.nxVersion,
+            ...(options.bundler === 'tsc' && { tslib: versions_1.tsLibVersion }),
         };
         return packageJson;
     });
@@ -84,10 +98,20 @@ async function createCliPackage(host, options, pluginPackageName) {
     projectConfiguration.sourceRoot = (0, devkit_1.joinPathFragments)(options.projectRoot, 'bin');
     projectConfiguration.targets.build.options.main = (0, devkit_1.joinPathFragments)(options.projectRoot, 'bin/index.ts');
     projectConfiguration.implicitDependencies = [options.project];
+    if (options.isTsSolutionSetup) {
+        if (options.bundler === 'tsc') {
+            projectConfiguration.targets.build.options.generatePackageJson = false;
+        }
+        else if (options.bundler === 'swc') {
+            delete projectConfiguration.targets.build.options.stripLeadingPaths;
+        }
+    }
     (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfiguration);
-    // Add bin files to tsconfg.lib.json
+    // Add bin files and update rootDir in tsconfg.lib.json
     (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'), (tsConfig) => {
         tsConfig.include.push('bin/**/*.ts');
+        tsConfig.compilerOptions ??= {};
+        tsConfig.compilerOptions.rootDir = '.';
         return tsConfig;
     });
     (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/create-framework-package'), options.projectRoot, {
@@ -95,6 +119,7 @@ async function createCliPackage(host, options, pluginPackageName) {
         preset: pluginPackageName,
         tmpl: '',
     });
+    return jsLibraryTask;
 }
 /**
  * Add a test file to plugin e2e project
@@ -109,7 +134,7 @@ function addE2eProject(host, options) {
     (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/e2e'), e2eProjectConfiguration.sourceRoot, {
         pluginName: options.project,
         cliName: options.name,
-        packageManagerCommands: (0, devkit_1.getPackageManagerCommand)('npm'),
+        packageManagerCommands: (0, devkit_1.getPackageManagerCommand)(),
         pluginPackageName,
         tmpl: '',
     });

package/src/generators/create-package/files/create-framework-package/bin/index.ts__tmpl__

@@ -11,15 +11,19 @@ async function main() {
   console.log(`Creating the workspace: ${name}`);
 
   // This assumes "<%= preset %>" and "<%= projectName %>" are at the same version
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const presetVersion = require('../package.json').version,
+  // eslint-disable-next-line @typescript-eslint/no-var-requires<% if (isTsSolutionSetup) { %>
+  const presetVersion = require('../../package.json').version;<% } else { %>
+  const presetVersion = require('../package.json').version;<% } %>
 
   // TODO: update below to customize the workspace
-  const { directory } = await createWorkspace(`<%= preset %>@${presetVersion}`, {
-    name,
-    nxCloud: 'skip',
-    packageManager: 'npm',
-  });
+  const { directory } = await createWorkspace(
+    `<%= preset %>@${presetVersion}`,
+    {
+      name,
+      nxCloud: 'skip',
+      packageManager: 'npm',
+    }
+  );
 
   console.log(`Successfully created the workspace: ${directory}.`);
 }

package/src/generators/create-package/files/e2e/__cliName__.spec.ts__tmpl__

@@ -6,11 +6,13 @@ describe('<%= cliName %>', () => {
   let projectDirectory: string;
 
   afterAll(() => {
-    // Cleanup the test project
-    rmSync(projectDirectory, {
-      recursive: true,
-      force: true,
-    });
+    if (projectDirectory) {
+      // Cleanup the test project
+      rmSync(projectDirectory, {
+        recursive: true,
+        force: true,
+      });
+    }
   });
 
 
@@ -43,7 +45,7 @@ function createTestProject(extraArgs = '') {
   });
 
   execSync(
-    `<%= packageManagerCommands.exec %> --yes <%= cliName %>@e2e ${projectName} ${extraArgs}`,
+    `<%= packageManagerCommands.dlx %> <%= cliName %>@e2e ${projectName} ${extraArgs}`,
     {
       cwd: dirname(projectDirectory),
       stdio: 'inherit',

package/src/generators/create-package/schema.d.ts

@@ -1,19 +1,20 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 
 export interface CreatePackageSchema {
   name: string;
   project: string;
+  directory: string;
 
   // options to create cli package, passed to js library generator
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
-  skipFormat: boolean;
+  skipFormat?: boolean;
   tags?: string;
-  unitTestRunner: 'jest' | 'none';
-  linter: Linter | LinterType;
-  compiler: 'swc' | 'tsc';
+  unitTestRunner?: 'jest' | 'vitest' | 'none';
+  linter?: Linter | LinterType;
+  compiler?: 'swc' | 'tsc';
 
   // options to create e2e project, passed to e2e project generator
   e2eProject?: string;
+
+  useProjectJson?: boolean;
+  addPlugin?: boolean;
 }

package/src/generators/create-package/schema.json

@@ -7,14 +7,18 @@
   "examplesFile": "../../../docs/generators/create-package-examples.md",
   "type": "object",
   "properties": {
-    "name": {
+    "directory": {
       "type": "string",
-      "description": "The package name of cli, e.g. `create-framework-package`. Note this must be a valid NPM name to be published.",
-      "pattern": "create-.+|^@.+/create(?:-.+)?",
+      "description": "A directory where the app is placed.",
       "$default": {
         "$source": "argv",
         "index": 0
-      },
+      }
+    },
+    "name": {
+      "type": "string",
+      "description": "The package name of cli, e.g. `create-framework-package`. Note this must be a valid NPM name to be published.",
+      "pattern": "create-.+|^@.+/create(?:-.+)?",
       "x-priority": "important"
     },
     "project": {
@@ -29,24 +33,13 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["jest", "none"],
-      "description": "Test runner to use for unit tests.",
-      "default": "jest"
-    },
-    "directory": {
-      "type": "string",
-      "description": "A directory where the app is placed."
-    },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
+      "enum": ["none", "jest", "vitest"],
+      "description": "Test runner to use for unit tests."
     },
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint"],
-      "default": "eslint"
+      "enum": ["none", "eslint"]
     },
     "tags": {
       "type": "string",
@@ -69,7 +62,11 @@
       "type": "string",
       "description": "The name of the e2e project.",
       "x-prompt": "What is the name of the e2e project? Leave blank to skip e2e tests"
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
-  "required": ["name", "project"]
+  "required": ["directory", "name", "project"]
 }

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

@@ -1,8 +1,14 @@
 import { Tree } from '@nx/devkit';
+import type { LinterType } from '@nx/eslint';
 import { CreatePackageSchema } from '../schema';
 export interface NormalizedSchema extends CreatePackageSchema {
     bundler: 'swc' | 'tsc';
     projectName: string;
     projectRoot: string;
+    unitTestRunner: 'jest' | 'vitest' | 'none';
+    linter: LinterType;
+    useProjectJson: boolean;
+    addPlugin: boolean;
+    isTsSolutionSetup: boolean;
 }
 export declare function normalizeSchema(host: Tree, schema: CreatePackageSchema): Promise<NormalizedSchema>;

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

@@ -1,21 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeSchema = normalizeSchema;
+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");
 async function normalizeSchema(host, schema) {
-    const { projectName, names: projectNames, projectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    const linter = await (0, generator_prompts_1.normalizeLinterOption)(host, schema.linter);
+    const unitTestRunner = await (0, generator_prompts_1.normalizeUnitTestRunnerOption)(host, schema.unitTestRunner, ['jest']);
+    if (!schema.directory) {
+        throw new Error(`Please provide the --directory option. It should be the directory containing the project '${schema.project}'.`);
+    }
+    const { projectName, names: projectNames, projectRoot, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: schema.name,
         projectType: 'library',
         directory: schema.directory,
-        projectNameAndRootFormat: schema.projectNameAndRootFormat,
-        callingGenerator: '@nx/plugin:create-package',
     });
-    schema.projectNameAndRootFormat = projectNameAndRootFormat;
+    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    const addPlugin = schema.addPlugin ??
+        (isTsSolutionSetup &&
+            process.env.NX_ADD_PLUGINS !== 'false' &&
+            nxJson.useInferencePlugins !== false);
     return {
         ...schema,
         bundler: schema.compiler ?? 'tsc',
         projectName,
         projectRoot,
         name: projectNames.projectSimpleName,
+        linter,
+        unitTestRunner,
+        // We default to generate a project.json file if the new setup is not being used
+        useProjectJson: schema.useProjectJson ?? !isTsSolutionSetup,
+        addPlugin,
+        isTsSolutionSetup,
     };
 }

package/src/generators/e2e-project/e2e.d.ts

@@ -1,5 +1,4 @@
-import type { Tree } from '@nx/devkit';
-import { GeneratorCallback } from '@nx/devkit';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import type { Schema } from './schema';
 export declare function e2eProjectGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export declare function e2eProjectGeneratorInternal(host: Tree, schema: Schema): Promise<GeneratorCallback>;

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

@@ -4,48 +4,41 @@ exports.e2eProjectGenerator = e2eProjectGenerator;
 exports.e2eProjectGeneratorInternal = e2eProjectGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const eslint_1 = require("@nx/eslint");
 const jest_1 = require("@nx/jest");
 const js_1 = require("@nx/js");
 const generator_1 = require("@nx/js/src/generators/setup-verdaccio/generator");
 const add_local_registry_scripts_1 = require("@nx/js/src/utils/add-local-registry-scripts");
-const eslint_1 = require("@nx/eslint");
+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 path_1 = require("path");
 async function normalizeOptions(host, options) {
+    const linter = await (0, generator_prompts_1.normalizeLinterOption)(host, options.linter);
     const projectName = options.rootProject ? 'e2e' : `${options.pluginName}-e2e`;
     const nxJson = (0, devkit_1.readNxJson)(host);
-    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
-    options.addPlugin ??= addPlugin;
+    const addPlugin = options.addPlugin ??
+        (process.env.NX_ADD_PLUGINS !== 'false' &&
+            nxJson.useInferencePlugins !== false);
     let projectRoot;
-    if (options.projectNameAndRootFormat === 'as-provided') {
-        const projectNameAndRootOptions = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
-            name: projectName,
-            projectType: 'application',
-            directory: options.rootProject || !options.projectDirectory
-                ? projectName
-                : `${options.projectDirectory}-e2e`,
-            projectNameAndRootFormat: `as-provided`,
-            callingGenerator: '@nx/plugin:e2e-project',
-        });
-        projectRoot = projectNameAndRootOptions.projectRoot;
-    }
-    else {
-        const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.projectDirectory);
-        const { appsDir: defaultAppsDir } = (0, devkit_1.getWorkspaceLayout)(host);
-        const appsDir = layoutDirectory ?? defaultAppsDir;
-        projectRoot = options.rootProject
+    const projectNameAndRootOptions = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+        name: projectName,
+        projectType: 'application',
+        directory: options.rootProject || !options.projectDirectory
             ? projectName
-            : projectDirectory
-                ? (0, devkit_1.joinPathFragments)(appsDir, `${projectDirectory}-e2e`)
-                : (0, devkit_1.joinPathFragments)(appsDir, projectName);
-    }
+            : `${options.projectDirectory}-e2e`,
+    });
+    projectRoot = projectNameAndRootOptions.projectRoot;
     const pluginPropertyName = (0, devkit_1.names)(options.pluginName).propertyName;
+    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     return {
         ...options,
         projectName,
-        linter: options.linter ?? eslint_1.Linter.EsLint,
+        linter,
         pluginPropertyName,
         projectRoot,
+        addPlugin,
+        useProjectJson: options.useProjectJson ?? !isTsSolutionSetup,
+        isTsSolutionSetup,
     };
 }
 function validatePlugin(host, pluginName) {
@@ -59,22 +52,36 @@ function validatePlugin(host, pluginName) {
 function addFiles(host, options) {
     const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, options.pluginName);
     const { name: pluginPackageName } = (0, devkit_1.readJson)(host, (0, path_1.join)(projectConfiguration.root, 'package.json'));
+    const simplePluginName = options.pluginName.split('/').pop();
     (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files'), options.projectRoot, {
         ...options,
         tmpl: '',
         rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot),
-        packageManagerCommands: (0, devkit_1.getPackageManagerCommand)('npm'),
+        packageManagerCommands: (0, devkit_1.getPackageManagerCommand)(),
         pluginPackageName,
+        simplePluginName,
     });
 }
 async function addJest(host, options) {
-    (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
+    const projectConfiguration = {
+        name: options.projectName,
         root: options.projectRoot,
         projectType: 'application',
         sourceRoot: `${options.projectRoot}/src`,
-        targets: {},
         implicitDependencies: [options.pluginName],
-    });
+    };
+    if (options.isTsSolutionSetup) {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
+            name: options.projectName,
+            version: '0.0.1',
+            private: true,
+        });
+        (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfiguration);
+    }
+    else {
+        projectConfiguration.targets = {};
+        (0, devkit_1.addProjectConfiguration)(host, options.projectName, projectConfiguration);
+    }
     const jestTask = await (0, jest_1.configurationGenerator)(host, {
         project: options.projectName,
         targetName: 'e2e',
@@ -83,11 +90,13 @@ 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));
     (0, jest_1.addPropertyToJestConfig)(host, (0, path_1.join)(options.projectRoot, 'jest.config.ts'), 'globalTeardown', (0, path_1.join)((0, devkit_1.offsetFromRoot)(options.projectRoot), stopLocalRegistryPath));
     const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
+    project.targets ??= {};
     const e2eTarget = project.targets.e2e;
     project.targets.e2e = {
         ...e2eTarget,
@@ -114,10 +123,18 @@ async function addLintingToApplication(tree, options) {
     });
     return lintTask;
 }
+function updatePluginPackageJson(tree, options) {
+    const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.pluginName);
+    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(root, 'package.json'), (json) => {
+        // to publish the plugin, we need to remove the private flag
+        delete json.private;
+        return json;
+    });
+}
 async function e2eProjectGenerator(host, schema) {
     return await e2eProjectGeneratorInternal(host, {
         addPlugin: false,
-        projectNameAndRootFormat: 'derived',
+        useProjectJson: true,
         ...schema,
     });
 }
@@ -130,11 +147,29 @@ async function e2eProjectGeneratorInternal(host, schema) {
         skipFormat: true,
     }));
     tasks.push(await addJest(host, options));
-    if (options.linter !== eslint_1.Linter.None) {
+    updatePluginPackageJson(host, options);
+    if (options.linter !== 'none') {
         tasks.push(await addLintingToApplication(host, {
             ...options,
         }));
     }
+    if (options.isTsSolutionSetup && !options.rootProject) {
+        // update root  tsconfig.json references with the new lib tsconfig
+        (0, devkit_1.updateJson)(host, 'tsconfig.json', (json) => {
+            json.references ??= [];
+            json.references.push({
+                path: options.projectRoot.startsWith('./')
+                    ? options.projectRoot
+                    : './' + options.projectRoot,
+            });
+            return json;
+        });
+    }
+    // If we are using the new TS solution
+    // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
+    if (options.isTsSolutionSetup) {
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }