@nx/node 20.3.0-beta.0 → 20.3.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/node",
-  "version": "20.3.0-beta.0",
+  "version": "20.3.0-beta.1",
   "private": false,
   "description": "The Node Plugin for Nx contains generators to manage Node applications within an Nx workspace.",
   "repository": {
@@ -32,10 +32,10 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "20.3.0-beta.0",
-    "@nx/jest": "20.3.0-beta.0",
-    "@nx/js": "20.3.0-beta.0",
-    "@nx/eslint": "20.3.0-beta.0"
+    "@nx/devkit": "20.3.0-beta.1",
+    "@nx/jest": "20.3.0-beta.1",
+    "@nx/js": "20.3.0-beta.1",
+    "@nx/eslint": "20.3.0-beta.1"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.d.ts

@@ -4,6 +4,7 @@ export interface NormalizedSchema extends Schema {
     appProjectRoot: string;
     parsedTags: string[];
     outputPath: string;
+    isUsingTsSolutionConfig: boolean;
 }
 export declare function addLintingToApplication(tree: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
 export declare function applicationGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;

package/src/generators/application/application.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLintingToApplication = addLintingToApplication;
 exports.applicationGenerator = applicationGenerator;
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const jest_1 = require("@nx/jest");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const versions_1 = require("@nx/js/src/utils/versions");
 const eslint_1 = require("@nx/eslint");
 const path_1 = require("path");
@@ -18,6 +18,7 @@ const setup_docker_1 = require("../setup-docker/setup-docker");
 const has_webpack_plugin_1 = require("../../utils/has-webpack-plugin");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function getWebpackBuildConfig(project, options) {
     return {
         executor: `@nx/webpack:webpack`,
@@ -31,7 +32,7 @@ function getWebpackBuildConfig(project, options) {
             tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
             assets: [(0, devkit_1.joinPathFragments)(project.sourceRoot, 'assets')],
             webpackConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'webpack.config.js'),
-            generatePackageJson: true,
+            generatePackageJson: options.isUsingTsSolutionConfig ? undefined : true,
         },
         configurations: {
             development: {},
@@ -55,7 +56,7 @@ function getEsBuildConfig(project, options) {
             main: (0, devkit_1.joinPathFragments)(project.sourceRoot, 'main' + (options.js ? '.js' : '.ts')),
             tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
             assets: [(0, devkit_1.joinPathFragments)(project.sourceRoot, 'assets')],
-            generatePackageJson: true,
+            generatePackageJson: options.isUsingTsSolutionConfig ? undefined : true,
             esbuildOptions: {
                 sourcemap: true,
                 // Generate CJS files as .js so imports can be './foo' rather than './foo.cjs'.
@@ -136,10 +137,25 @@ function addProject(tree, options) {
         }
     }
     project.targets.serve = getServeConfig(options);
-    (0, devkit_1.addProjectConfiguration)(tree, options.name, project, options.standaloneConfig);
+    if (options.isUsingTsSolutionConfig) {
+        (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
+            name: (0, get_import_path_1.getImportPath)(tree, options.name),
+            version: '0.0.1',
+            private: true,
+            nx: {
+                name: options.name,
+                projectType: 'application',
+                sourceRoot: project.sourceRoot,
+                targets: project.targets,
+                tags: project.tags?.length ? project.tags : undefined,
+            },
+        });
+    }
+    else {
+        (0, devkit_1.addProjectConfiguration)(tree, options.name, project, options.standaloneConfig);
+    }
 }
 function addAppFiles(tree, options) {
-    const sourceRoot = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src');
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/common'), options.appProjectRoot, {
         ...options,
         tmpl: '',
@@ -265,6 +281,9 @@ function addProjectDependencies(tree, options) {
     });
 }
 function updateTsConfigOptions(tree, options) {
+    if (options.isUsingTsSolutionConfig) {
+        return;
+    }
     (0, devkit_1.updateJson)(tree, `${options.appProjectRoot}/tsconfig.json`, (json) => {
         if (options.rootProject) {
             return {
@@ -296,9 +315,15 @@ async function applicationGenerator(tree, schema) {
     });
 }
 async function applicationGeneratorInternal(tree, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'node', 'application');
-    const options = await normalizeOptions(tree, schema);
     const tasks = [];
+    const jsInitTask = await (0, js_1.initGenerator)(tree, {
+        ...schema,
+        tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
+        skipFormat: true,
+        addTsPlugin: schema.useTsSolution,
+    });
+    tasks.push(jsInitTask);
+    const options = await normalizeOptions(tree, schema);
     if (options.framework === 'nest') {
         // nx-ignore-next-line
         const { applicationGenerator } = (0, devkit_1.ensurePackage)('@nx/nest', versions_2.nxVersion);
@@ -322,12 +347,6 @@ async function applicationGeneratorInternal(tree, schema) {
             },
         ]);
     }
-    const jsInitTask = await (0, js_1.initGenerator)(tree, {
-        ...schema,
-        tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
-        skipFormat: true,
-    });
-    tasks.push(jsInitTask);
     const initTask = await (0, init_1.initGenerator)(tree, {
         ...schema,
         skipFormat: true,
@@ -369,6 +388,13 @@ async function applicationGeneratorInternal(tree, schema) {
             skipFormat: true,
         });
         tasks.push(jestTask);
+        // There are no tests by default, so set `--passWithNoTests` to avoid test failure on new project.
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.name);
+        projectConfig.targets ??= {};
+        projectConfig.targets.test = {
+            options: { passWithNoTests: true },
+        };
+        (0, devkit_1.updateProjectConfiguration)(tree, options.name, projectConfig);
     }
     else {
         // No need for default spec file if unit testing is not setup.
@@ -404,6 +430,14 @@ async function applicationGeneratorInternal(tree, schema) {
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
+    if (options.isUsingTsSolutionConfig) {
+        (0, ts_solution_setup_1.updateTsconfigFiles)(tree, options.appProjectRoot, 'tsconfig.app.json', {
+            module: 'nodenext',
+            moduleResolution: 'nodenext',
+        }, options.linter === 'eslint'
+            ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
+            : undefined);
+    }
     tasks.push(() => {
         (0, log_show_project_command_1.logShowProjectCommand)(options.name);
     });
@@ -440,6 +474,7 @@ async function normalizeOptions(host, options) {
         rootProject: options.rootProject ?? false,
         port: options.port ?? 3000,
         outputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : appProjectRoot),
+        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
     };
 }
 exports.default = applicationGenerator;

package/src/generators/application/schema.d.ts

@@ -8,6 +8,7 @@ export interface Schema {
   unitTestRunner?: 'jest' | 'none';
   e2eTestRunner?: 'jest' | 'none';
   linter?: Linter | LinterType;
+  formatter?: 'none' | 'prettier';
   tags?: string;
   frontendProject?: string;
   swcJest?: boolean;
@@ -23,6 +24,7 @@ export interface Schema {
   docker?: boolean;
   isNest?: boolean;
   addPlugin?: boolean;
+  useTsSolution?: boolean;
 }
 
 export type NodeJsFrameWorks = 'express' | 'koa' | 'fastify' | 'nest' | 'none';

package/src/generators/application/schema.json

@@ -36,14 +36,26 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint"],
-      "default": "eslint"
+      "enum": ["eslint", "none"],
+      "default": "none",
+      "x-prompt": "Which linter would you like to use?",
+      "x-priority": "important"
     },
     "unitTestRunner": {
       "type": "string",
       "enum": ["jest", "none"],
       "description": "Test runner to use for unit tests.",
-      "default": "jest"
+      "default": "none",
+      "x-priority": "important",
+      "x-prompt": "Which unit test runner would you like to use?"
+    },
+    "e2eTestRunner": {
+      "type": "string",
+      "enum": ["jest", "none"],
+      "description": "Test runner to use for end-to-end tests",
+      "default": "none",
+      "x-priority": "important",
+      "x-prompt": "Which end-to-end test runner would you like to use?"
     },
     "tags": {
       "type": "string",
@@ -109,12 +121,6 @@
       "hidden": true,
       "x-priority": "internal"
     },
-    "e2eTestRunner": {
-      "type": "string",
-      "enum": ["jest", "none"],
-      "description": "Test runner to use for end to end (e2e) tests",
-      "default": "jest"
-    },
     "docker": {
       "type": "boolean",
       "description": "Add a docker build target"

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

@@ -11,6 +11,9 @@ const versions_1 = require("../../utils/versions");
 const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const config_file_1 = require("@nx/jest/src/utils/config/config-file");
+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");
+const posix_1 = require("node:path/posix");
 async function e2eProjectGenerator(host, options) {
     return await e2eProjectGeneratorInternal(host, {
         addPlugin: false,
@@ -21,23 +24,49 @@ async function e2eProjectGeneratorInternal(host, _options) {
     const tasks = [];
     const options = await normalizeOptions(host, _options);
     const appProject = (0, devkit_1.readProjectConfiguration)(host, options.project);
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     // TODO(@ndcunningham): This is broken.. the outputs are wrong.. and this isn't using the jest generator
-    (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
-        root: options.e2eProjectRoot,
-        implicitDependencies: [options.project],
-        projectType: 'application',
-        targets: {
-            e2e: {
-                executor: '@nx/jest:jest',
-                outputs: ['{workspaceRoot}/coverage/{e2eProjectRoot}'],
-                options: {
-                    jestConfig: `${options.e2eProjectRoot}/jest.config.ts`,
-                    passWithNoTests: true,
+    if (isUsingTsSolutionConfig) {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+            name: (0, get_import_path_1.getImportPath)(host, options.e2eProjectName),
+            version: '0.0.1',
+            private: true,
+            nx: {
+                name: options.e2eProjectName,
+                projectType: 'application',
+                implicitDependencies: [options.project],
+                targets: {
+                    e2e: {
+                        executor: '@nx/jest:jest',
+                        outputs: ['{workspaceRoot}/coverage/{e2eProjectRoot}'],
+                        options: {
+                            jestConfig: `${options.e2eProjectRoot}/jest.config.ts`,
+                            passWithNoTests: true,
+                        },
+                        dependsOn: [`${options.project}:build`],
+                    },
                 },
-                dependsOn: [`${options.project}:build`],
             },
-        },
-    });
+        });
+    }
+    else {
+        (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
+            root: options.e2eProjectRoot,
+            implicitDependencies: [options.project],
+            projectType: 'application',
+            targets: {
+                e2e: {
+                    executor: '@nx/jest:jest',
+                    outputs: ['{workspaceRoot}/coverage/{e2eProjectRoot}'],
+                    options: {
+                        jestConfig: `${options.e2eProjectRoot}/jest.config.ts`,
+                        passWithNoTests: true,
+                    },
+                    dependsOn: [`${options.project}:build`],
+                },
+            },
+        });
+    }
     // TODO(@nicholas): Find a better way to get build target
     // We remove the 'test' target from the e2e project because it is not needed
     // The 'e2e' target is the one that should run the tests for the e2e project
@@ -64,10 +93,14 @@ async function e2eProjectGeneratorInternal(host, _options) {
         });
     }
     const jestPreset = (0, config_file_1.findRootJestPreset)(host) ?? 'jest.preset.js';
+    const tsConfigFile = isUsingTsSolutionConfig
+        ? 'tsconfig.json'
+        : 'tsconfig.spec.json';
     if (options.projectType === 'server') {
         (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/server/common'), options.e2eProjectRoot, {
             ...options,
             ...(0, devkit_1.names)(options.rootProject ? 'server' : options.project),
+            tsConfigFile,
             offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot),
             jestPreset,
             tmpl: '',
@@ -76,6 +109,7 @@ async function e2eProjectGeneratorInternal(host, _options) {
             (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/server/nest'), options.e2eProjectRoot, {
                 ...options,
                 ...(0, devkit_1.names)(options.rootProject ? 'server' : options.project),
+                tsConfigFile,
                 offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot),
                 tmpl: '',
             });
@@ -87,11 +121,27 @@ async function e2eProjectGeneratorInternal(host, _options) {
             ...options,
             ...(0, devkit_1.names)(options.rootProject ? 'cli' : options.project),
             mainFile,
+            tsConfigFile,
             offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot),
             jestPreset,
             tmpl: '',
         });
     }
+    if (isUsingTsSolutionConfig) {
+        (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/ts-solution'), options.e2eProjectRoot, {
+            ...options,
+            relativeProjectReferencePath: (0, posix_1.relative)(options.e2eProjectRoot, appProject.root),
+            offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot),
+            tmpl: '',
+        });
+    }
+    else {
+        (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/non-ts-solution'), options.e2eProjectRoot, {
+            ...options,
+            offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot),
+            tmpl: '',
+        });
+    }
     // axios is more than likely used in the application code, so install it as a regular dependency.
     const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, { axios: versions_1.axiosVersion }, {});
     tasks.push(installTask);
@@ -120,6 +170,16 @@ async function e2eProjectGeneratorInternal(host, _options) {
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
+    if (isUsingTsSolutionConfig) {
+        (0, devkit_1.updateJson)(host, 'tsconfig.json', (json) => {
+            json.references ??= [];
+            const e2eRef = `./${options.e2eProjectRoot}`;
+            if (!json.references.find((ref) => ref.path === e2eRef)) {
+                json.references.push({ path: e2eRef });
+            }
+            return json;
+        });
+    }
     tasks.push(() => {
         (0, log_show_project_command_1.logShowProjectCommand)(options.e2eProjectName);
     });

package/src/generators/e2e-project/files/cli/jest.config.ts__tmpl__

@@ -5,7 +5,7 @@ export default {
   testEnvironment: 'node',
   transform: {
     '^.+\\.[tj]s$': ['ts-jest', {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
+      tsconfig: '<rootDir>/<%= tsConfigFile %>',
     }],
   },
   moduleFileExtensions: ['ts', 'js', 'html'],

package/src/generators/e2e-project/files/server/common/jest.config.ts__tmpl__

@@ -7,7 +7,7 @@ export default {
   testEnvironment: 'node',
   transform: {
     '^.+\\.[tj]s$': ['ts-jest', {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
+      tsconfig: '<rootDir>/<%= tsConfigFile %>',
     }],
   },
   moduleFileExtensions: ['ts', 'js', 'html'],

package/src/generators/e2e-project/files/ts-solution/tsconfig.json__tmpl__

@@ -0,0 +1,16 @@
+{
+  "extends": "<%= offsetFromRoot %>tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "out-tsc/<%= e2eProjectName %>",
+    "esModuleInterop": true,
+    "noUnusedLocals": false,
+    "noImplicitAny": false
+  },
+  "include": [
+    "jest.config.ts",
+    "src/**/*.ts"
+  ],
+  "references": [
+   { "path": "<%= relativeProjectReferencePath %>" }
+  ]
+}

package/src/generators/init/init.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initGenerator = initGenerator;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const versions_1 = require("../../utils/versions");
 function updateDependencies(tree, options) {
     const tasks = [];
@@ -11,7 +10,6 @@ function updateDependencies(tree, options) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function initGenerator(tree, options) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'node', 'init');
     let installTask = () => { };
     if (!options.skipPackageJson) {
         installTask = updateDependencies(tree, options);

package/src/generators/library/files/ts-solution/tsconfig.lib.json

@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "src",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
+    "emitDeclarationOnly": false,
+    "types": ["node"]
+  },
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"],
+  "include": ["src/**/*.ts"]
+}

package/src/generators/library/library.d.ts

@@ -6,6 +6,7 @@ export interface NormalizedSchema extends Schema {
     projectRoot: string;
     parsedTags: string[];
     compiler: 'swc' | 'tsc';
+    isUsingTsSolutionConfig: boolean;
 }
 export declare function libraryGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export declare function libraryGeneratorInternal(tree: Tree, schema: Schema): Promise<GeneratorCallback>;

package/src/generators/library/library.js

@@ -7,11 +7,12 @@ const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project
 const js_1 = require("@nx/js");
 const add_swc_config_1 = require("@nx/js/src/utils/swc/add-swc-config");
 const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const path_1 = require("path");
 const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
+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 libraryGenerator(tree, schema) {
     return await libraryGeneratorInternal(tree, {
         addPlugin: false,
@@ -19,33 +20,46 @@ async function libraryGenerator(tree, schema) {
     });
 }
 async function libraryGeneratorInternal(tree, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'node', 'library');
     const options = await normalizeOptions(tree, schema);
-    const tasks = [
-        await (0, init_1.initGenerator)(tree, {
-            ...options,
-            skipFormat: true,
-        }),
-    ];
+    const tasks = [];
     if (options.publishable === true && !schema.importPath) {
         throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
     }
-    const libraryInstall = await (0, js_1.libraryGenerator)(tree, {
-        ...options,
+    // Create `package.json` first because @nx/js:lib generator will update it.
+    if (options.isUsingTsSolutionConfig ||
+        options.publishable ||
+        options.buildable) {
+        (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
+            name: (0, get_import_path_1.getImportPath)(tree, options.name),
+            version: '0.0.1',
+            private: true,
+            files: options.publishable ? ['dist', '!**/*.tsbuildinfo'] : undefined,
+        });
+    }
+    tasks.push(await (0, js_1.libraryGenerator)(tree, {
+        ...schema,
         bundler: schema.buildable || schema.publishable ? 'tsc' : 'none',
         includeBabelRc: schema.babelJest,
-        importPath: options.importPath,
+        importPath: schema.importPath,
         testEnvironment: 'node',
         skipFormat: true,
-        setParserOptionsProject: options.setParserOptionsProject,
-    });
-    tasks.push(libraryInstall);
+        setParserOptionsProject: schema.setParserOptionsProject,
+        useProjectJson: !options.isUsingTsSolutionConfig,
+    }));
+    tasks.push(await (0, init_1.initGenerator)(tree, {
+        ...options,
+        skipFormat: true,
+    }));
     createFiles(tree, options);
     if (options.js) {
         (0, devkit_1.updateTsConfigsToJs)(tree, options);
     }
     updateProject(tree, options);
     tasks.push(ensureDependencies(tree));
+    // Always run install to link packages.
+    if (options.isUsingTsSolutionConfig) {
+        tasks.push(() => (0, devkit_1.installPackagesTask)(tree, true));
+    }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
@@ -77,6 +91,7 @@ async function normalizeOptions(tree, options) {
         projectRoot,
         parsedTags,
         importPath,
+        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree),
     };
 }
 function createFiles(tree, options) {
@@ -92,9 +107,6 @@ function createFiles(tree, options) {
     if (options.unitTestRunner === 'none') {
         tree.delete((0, path_1.join)(options.projectRoot, `./src/lib/${options.fileName}.spec.ts`));
     }
-    if (!options.publishable && !options.buildable) {
-        tree.delete((0, path_1.join)(options.projectRoot, 'package.json'));
-    }
     if (options.js) {
         (0, devkit_1.toJS)(tree);
     }
@@ -107,17 +119,25 @@ function updateProject(tree, options) {
     const rootProject = options.projectRoot === '.' || options.projectRoot === '';
     project.targets = project.targets || {};
     (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, `@nx/js:${options.compiler}`);
-    project.targets.build = {
-        executor: `@nx/js:${options.compiler}`,
-        outputs: ['{options.outputPath}'],
-        options: {
-            outputPath: (0, devkit_1.joinPathFragments)('dist', rootProject ? options.projectName : options.projectRoot),
-            tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
-            packageJson: `${options.projectRoot}/package.json`,
-            main: `${options.projectRoot}/src/index` + (options.js ? '.js' : '.ts'),
-            assets: [`${options.projectRoot}/*.md`],
-        },
-    };
+    // For TS solution, we want tsc build to be inferred by `@nx/js/typescript` plugin.
+    if (!options.isUsingTsSolutionConfig || options.compiler === 'swc') {
+        project.targets.build = {
+            executor: `@nx/js:${options.compiler}`,
+            outputs: ['{options.outputPath}'],
+            options: {
+                outputPath: options.isUsingTsSolutionConfig
+                    ? (0, devkit_1.joinPathFragments)(options.projectRoot, 'dist')
+                    : (0, devkit_1.joinPathFragments)('dist', rootProject ? options.projectName : options.projectRoot),
+                tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
+                packageJson: `${options.projectRoot}/package.json`,
+                main: `${options.projectRoot}/src/index` + (options.js ? '.js' : '.ts'),
+                assets: options.isUsingTsSolutionConfig
+                    ? undefined
+                    : [`${options.projectRoot}/*.md`],
+                stripLeadingPaths: options.isUsingTsSolutionConfig ? true : undefined,
+            },
+        };
+    }
     if (options.compiler === 'swc') {
         (0, add_swc_dependencies_1.addSwcDependencies)(tree);
         (0, add_swc_config_1.addSwcConfig)(tree, options.projectRoot);

package/src/generators/library/schema.json

@@ -36,14 +36,18 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint"],
-      "default": "eslint"
+      "enum": ["eslint", "none"],
+      "default": "none",
+      "x-prompt": "Which linter would you like to use?",
+      "x-priority": "important"
     },
     "unitTestRunner": {
       "type": "string",
       "enum": ["jest", "none"],
       "description": "Test runner to use for unit tests.",
-      "default": "jest"
+      "default": "none",
+      "x-prompt": "Which unit test runner would you like to use?",
+      "x-priority": "important"
     },
     "tags": {
       "type": "string",
@@ -69,7 +73,7 @@
     },
     "buildable": {
       "type": "boolean",
-      "default": false,
+      "default": true,
       "description": "Generate a buildable library.",
       "x-priority": "important"
     },

package/src/generators/e2e-project/files/cli/tsconfig.spec.json__tmpl__

@@ -1,12 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "<%= offsetFromRoot %>/dist/out-tsc",
-    "module": "commonjs",
-    "types": ["jest", "node"]
-  },
-  "include": [
-    "jest.config.ts",
-    "src/**/*.ts"
-  ]
-}

package/src/generators/e2e-project/files/server/common/tsconfig.json__tmpl__

@@ -1,13 +0,0 @@
-{
-  "extends": "<%= offsetFromRoot %><% if (rootProject) { %>tsconfig.json<% } else { %>tsconfig.base.json<% } %>",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ],
-  "compilerOptions": {
-    "esModuleInterop": true
-  }
-}

package/src/generators/library/files/lib/package.json__tmpl__

@@ -1,4 +0,0 @@
-{
-  "name": "<%= importPath %>",
-  "version": "0.0.1"
-}