fix(js): pass buildTargetOptions in executor (nrwl#17459)

docs/generated/cli/create-nx-workspace.md

@@ -131,7 +131,7 @@ Package manager to use
 
 Type: `string`
 
-Customizes the initial content of your workspace. Default presets include: ["apps", "empty", "core", "npm", "ts", "web-components", "angular-monorepo", "angular-standalone", "react-monorepo", "react-standalone", "next", "nextjs-standalone", "react-native", "expo", "nest", "express", "react", "angular", "node-standalone", "node-monorepo"]. To build your own see https://nx.dev/plugins/recipes/create-preset
+Customizes the initial content of your workspace. Default presets include: ["apps", "empty", "core", "npm", "ts", "web-components", "angular-monorepo", "angular-standalone", "react-monorepo", "react-standalone", "next", "nextjs-standalone", "react-native", "expo", "nest", "express", "react", "angular", "node-standalone", "node-monorepo", "ts-standalone"]. To build your own see https://nx.dev/plugins/recipes/create-preset
 
 ### routing
 

docs/generated/packages/nx/documents/create-nx-workspace.md

@@ -131,7 +131,7 @@ Package manager to use
 
 Type: `string`
 
-Customizes the initial content of your workspace. Default presets include: ["apps", "empty", "core", "npm", "ts", "web-components", "angular-monorepo", "angular-standalone", "react-monorepo", "react-standalone", "next", "nextjs-standalone", "react-native", "expo", "nest", "express", "react", "angular", "node-standalone", "node-monorepo"]. To build your own see https://nx.dev/plugins/recipes/create-preset
+Customizes the initial content of your workspace. Default presets include: ["apps", "empty", "core", "npm", "ts", "web-components", "angular-monorepo", "angular-standalone", "react-monorepo", "react-standalone", "next", "nextjs-standalone", "react-native", "expo", "nest", "express", "react", "angular", "node-standalone", "node-monorepo", "ts-standalone"]. To build your own see https://nx.dev/plugins/recipes/create-preset
 
 ### routing
 

packages/create-nx-workspace/bin/create-nx-workspace.ts

@@ -39,6 +39,12 @@ interface NoneArguments extends BaseArguments {
   workspaceType: 'package-based' | 'integrated';
 }
 
+interface TsArguments extends BaseArguments {
+  stack: 'ts';
+  workspaceType: 'standalone' | 'integrated';
+  js: boolean;
+}
+
 interface ReactArguments extends BaseArguments {
   stack: 'react';
   workspaceType: 'standalone' | 'integrated';
@@ -72,6 +78,7 @@ interface UnknownStackArguments extends BaseArguments {
 
 type Arguments =
   | NoneArguments
+  | TsArguments
   | ReactArguments
   | AngularArguments
   | NodeArguments
@@ -309,7 +316,7 @@ async function determineFolder(
 
 async function determineStack(
   parsedArgs: yargs.Arguments<Arguments>
-): Promise<'none' | 'react' | 'angular' | 'node' | 'unknown'> {
+): Promise<'none' | 'ts' | 'react' | 'angular' | 'node' | 'unknown'> {
   if (parsedArgs.preset) {
     switch (parsedArgs.preset) {
       case Preset.Angular:
@@ -333,6 +340,8 @@ async function determineStack(
       case Preset.NPM:
         return 'none';
       case Preset.TS:
+      case Preset.TsStandalone:
+        return 'ts';
       case Preset.WebComponents:
       case Preset.ReactNative:
       case Preset.Expo:
@@ -342,7 +351,7 @@ async function determineStack(
   }
 
   const { stack } = await enquirer.prompt<{
-    stack: 'none' | 'react' | 'angular' | 'node';
+    stack: 'none' | 'ts' | 'react' | 'angular' | 'node';
   }>([
     {
       name: 'stack',
@@ -353,6 +362,10 @@ async function determineStack(
           name: `none`,
           message: `None:          Configures a minimal structure without specific frameworks or technologies.`,
         },
+        {
+          name: `ts`,
+          message: `TS/JS:         Configures a TypeScript or JavaScript package without specific frameworks or platforms.`,
+        },
         {
           name: `react`,
           message: `React:         Configures a React app with your framework of choice.`,
@@ -377,7 +390,9 @@ async function determinePresetOptions(
 ): Promise<Partial<Arguments>> {
   switch (parsedArgs.stack) {
     case 'none':
-      return determineNoneptions(parsedArgs);
+      return determineNoneOptions(parsedArgs);
+    case 'ts':
+      return determineTsOptions(parsedArgs);
     case 'react':
       return determineReactOptions(parsedArgs);
     case 'angular':
@@ -389,7 +404,7 @@ async function determinePresetOptions(
   }
 }
 
-async function determineNoneptions(
+async function determineNoneOptions(
   parsedArgs: yargs.Arguments<Arguments>
 ): Promise<Partial<Arguments>> {
   if (parsedArgs.preset) return parsedArgs;
@@ -428,6 +443,45 @@ async function determineNoneptions(
   }
 }
 
+async function determineTsOptions(
+  parsedArgs: yargs.Arguments<TsArguments>
+): Promise<Partial<Arguments>> {
+  let preset: Preset;
+  let workspaceType: 'standalone' | 'integrated' | undefined = undefined;
+  let js: boolean;
+
+  if (parsedArgs.preset) {
+    preset = parsedArgs.preset;
+  } else {
+    workspaceType = await determineStandAloneOrMonorepo();
+    preset = workspaceType === 'standalone' ? Preset.TsStandalone : Preset.TS;
+  }
+
+  if (parsedArgs.js !== undefined) {
+    js = parsedArgs.js;
+  } else {
+    const reply = await enquirer.prompt<{ ts: 'Yes' | 'No' }>([
+      {
+        name: 'ts',
+        message: `Would you like to use TypeScript with this project?`,
+        type: 'autocomplete',
+        choices: [
+          {
+            name: 'Yes',
+          },
+          {
+            name: 'No',
+          },
+        ],
+        initial: 'Yes' as any,
+      },
+    ]);
+    js = reply.ts === 'No';
+  }
+
+  return { preset, js };
+}
+
 async function determineReactOptions(
   parsedArgs: yargs.Arguments<ReactArguments>
 ): Promise<Partial<Arguments>> {

packages/create-nx-workspace/src/internal-utils/prompts.ts

@@ -1,6 +1,5 @@
 import * as yargs from 'yargs';
 import { messages } from '../utils/nx/ab-testing';
-import enquirer = require('enquirer');
 import { CI } from '../utils/ci/ci-list';
 import { output } from '../utils/output';
 import { deduceDefaultBase } from '../utils/git/default-base';
@@ -9,7 +8,9 @@ import {
   PackageManager,
   packageManagerList,
 } from '../utils/package-manager';
+import { Preset } from '../utils/preset/preset';
 import { stringifyCollection } from '../utils/string-utils';
+import enquirer = require('enquirer');
 
 export async function determineNxCloud(
   parsedArgs: yargs.Arguments<{ nxCloud: boolean }>
@@ -98,7 +99,7 @@ export async function determineDefaultBase(
       .prompt<{ DefaultBase: string }>([
         {
           name: 'DefaultBase',
-          message: `Main branch name                   `,
+          message: `Main branch name`,
           initial: `main`,
           type: 'input',
         },
@@ -142,7 +143,7 @@ export async function determinePackageManager(
       .prompt<{ packageManager: PackageManager }>([
         {
           name: 'packageManager',
-          message: `Which package manager to use         `,
+          message: `Which package manager to use`,
           initial: 'npm' as any,
           type: 'autocomplete',
           choices: [

packages/create-nx-workspace/src/utils/preset/preset.ts

@@ -19,6 +19,7 @@ export enum Preset {
   Angular = 'angular',
   NodeStandalone = 'node-standalone',
   NodeMonorepo = 'node-monorepo',
+  TsStandalone = 'ts-standalone',
 }
 
 /**

packages/js/src/executors/node/node.impl.ts

@@ -43,8 +43,13 @@ export async function* nodeExecutor(
     context.projectGraph
   );
 
-  const buildOptions = project.data.targets[buildTarget.target]?.options;
-  if (!buildOptions) {
+  let buildOptions: Record<string, any>;
+  if (project.data.targets[buildTarget.target]) {
+    buildOptions = {
+      ...project.data.targets[buildTarget.target]?.options,
+      ...options.buildTargetOptions,
+    };
+  } else {
     throw new Error(
       `Cannot find build target ${chalk.bold(
         options.buildTarget

packages/workspace/src/generators/new/__snapshots__/generate-workspace-files.spec.ts.snap

@@ -1073,6 +1073,67 @@ Nx comes with local caching already built-in (check your \`nx.json\`). On CI you
 "
 `;
 
+exports[`@nx/workspace:generateWorkspaceFiles README.md should be created for TsStandalone preset 1`] = `
+"# Proj
+
+<a alt="Nx logo" href="https://nx.dev" target="_blank" rel="noreferrer"><img src="https://github.com/raw/nrwl/nx/master/images/nx-logo.png" width="45"></a>
+
+✨ **This workspace has been generated by [Nx, a Smart, fast and extensible build system.](https://nx.dev)** ✨
+
+## Generate code
+
+If you happen to use Nx plugins, you can leverage code generators that might come with it.
+
+Run \`nx list\` to get a list of available plugins and whether they have generators. Then run \`nx list <plugin-name>\` to see what generators are available.
+
+Learn more about [Nx generators on the docs](https://nx.dev/plugin-features/use-code-generators).
+
+## Running tasks
+
+To execute tasks with Nx use the following syntax:
+
+\`\`\`
+nx <target> <project> <...options>
+\`\`\`
+
+You can also run multiple targets:
+
+\`\`\`
+nx run-many -t <target1> <target2>
+\`\`\`
+
+..or add \`-p\` to filter specific projects
+
+\`\`\`
+nx run-many -t <target1> <target2> -p <proj1> <proj2>
+\`\`\`
+
+Targets can be defined in the \`package.json\` or \`projects.json\`. Learn more [in the docs](https://nx.dev/core-features/run-tasks).
+
+## Want better Editor Integration?
+
+Have a look at the [Nx Console extensions](https://nx.dev/nx-console). It provides autocomplete support, a UI for exploring and running tasks & generators, and more! Available for VSCode, IntelliJ and comes with a LSP for Vim users.
+
+## Ready to deploy?
+
+Just run \`nx build demoapp\` to build the application. The build artifacts will be stored in the \`dist/\` directory, ready to be deployed.
+
+## Set up CI!
+
+Nx comes with local caching already built-in (check your \`nx.json\`). On CI you might want to go a step further.
+
+- [Set up remote caching](https://nx.dev/core-features/share-your-cache)
+- [Set up task distribution across multiple machines](https://nx.dev/core-features/distribute-task-execution)
+- [Learn more how to setup CI](https://nx.dev/recipes/ci)
+
+## Connect with us!
+
+- [Join the community](https://nx.dev/community)
+- [Subscribe to the Nx Youtube Channel](https://www.youtube.com/@nxdevtools)
+- [Follow us on Twitter](https://twitter.com/nxdevtools)
+"
+`;
+
 exports[`@nx/workspace:generateWorkspaceFiles README.md should be created for WebComponents preset 1`] = `
 "# Proj
 

packages/workspace/src/generators/new/files-readme/README.md.template

@@ -4,9 +4,11 @@
 
 ✨ **This workspace has been generated by [Nx, a Smart, fast and extensible build system.](https://nx.dev)** ✨<% if (!!appName) { %>
 
-## Start the app 
+<% if (includeServe) { %>
+## Start the app
 
 To start the development server run `nx serve <%= appName %>`. Open your browser and navigate to http://localhost:4200/. Happy coding!<% } %>
+<% } %>
 
 ## Generate code
 

packages/workspace/src/generators/new/generate-preset.ts

@@ -76,6 +76,7 @@ export function generatePreset(host: Tree, opts: NormalizedSchema) {
       opts.bundler ? `--bundler=${opts.bundler}` : null,
       opts.framework ? `--framework=${opts.framework}` : null,
       opts.docker ? `--docker=${opts.docker}` : null,
+      opts.js ? `--js` : null,
       opts.nextAppDir ? `--nextAppDir=${opts.nextAppDir}` : null,
       opts.packageManager ? `--packageManager=${opts.packageManager}` : null,
       opts.standaloneApi !== undefined
@@ -98,6 +99,7 @@ function getPresetDependencies({
 }: NormalizedSchema) {
   switch (preset) {
     case Preset.TS:
+    case Preset.TsStandalone:
       return { dependencies: {}, dev: { '@nx/js': nxVersion } };
 
     case Preset.AngularMonorepo:

packages/workspace/src/generators/new/generate-workspace-files.spec.ts

@@ -42,6 +42,7 @@ describe('@nx/workspace:generateWorkspaceFiles', () => {
             Preset.Express,
             Preset.NodeStandalone,
             Preset.NextJsStandalone,
+            Preset.TsStandalone,
           ].includes(Preset[preset])
         ) {
           appName = 'app1';

packages/workspace/src/generators/new/generate-workspace-files.ts

@@ -67,6 +67,7 @@ function createAppsAndLibsFolders(tree: Tree, options: NormalizedSchema) {
     options.preset === Preset.ReactStandalone ||
     options.preset === Preset.NodeStandalone ||
     options.preset === Preset.NextJsStandalone ||
+    options.preset === Preset.TsStandalone ||
     options.isCustomPreset
   ) {
     // don't generate any folders
@@ -126,7 +127,8 @@ function createFiles(tree: Tree, options: NormalizedSchema) {
     options.preset === Preset.AngularStandalone ||
     options.preset === Preset.ReactStandalone ||
     options.preset === Preset.NodeStandalone ||
-    options.preset === Preset.NextJsStandalone
+    options.preset === Preset.NextJsStandalone ||
+    options.preset === Preset.TsStandalone
       ? './files-root-app'
       : options.preset === Preset.NPM || options.preset === Preset.Core
       ? './files-package-based-repo'
@@ -145,11 +147,12 @@ function createFiles(tree: Tree, options: NormalizedSchema) {
 
 function createReadme(
   tree: Tree,
-  { name, appName, directory }: NormalizedSchema
+  { name, appName, directory, preset }: NormalizedSchema
 ) {
   const formattedNames = names(name);
   generateFiles(tree, join(__dirname, './files-readme'), directory, {
     formattedNames,
+    includeServe: preset !== Preset.TsStandalone,
     appName,
     name,
   });
@@ -189,6 +192,15 @@ function addNpmScripts(tree: Tree, options: NormalizedSchema) {
       return json;
     });
   }
+  if (options.preset === Preset.TsStandalone) {
+    updateJson(tree, join(options.directory, 'package.json'), (json) => {
+      Object.assign(json.scripts, {
+        build: 'nx build',
+        test: 'nx test',
+      });
+      return json;
+    });
+  }
 }
 
 function addPropertyWithStableKeys(obj: any, key: string, value: string) {

packages/workspace/src/generators/new/new.ts

@@ -23,6 +23,7 @@ interface Schema {
   defaultBase: string;
   framework?: string;
   docker?: boolean;
+  js?: boolean;
   nextAppDir?: boolean;
   linter?: Linter;
   bundler?: 'vite' | 'webpack';

packages/workspace/src/generators/preset/preset.ts

@@ -147,6 +147,18 @@ async function createPreset(tree: Tree, options: Schema) {
     };
     updateNxJson(tree, c);
     return initGenerator(tree, {});
+  } else if (options.preset === Preset.TsStandalone) {
+    const c = readNxJson(tree);
+    const { libraryGenerator } = require('@nx' + '/js');
+    updateNxJson(tree, c);
+    return libraryGenerator(tree, {
+      name: options.name,
+      bundler: 'swc',
+      unitTestRunner: 'jest',
+      testEnvironment: 'node',
+      js: options.js,
+      rootProject: true,
+    });
   } else if (options.preset === Preset.NodeStandalone) {
     const { applicationGenerator: nodeApplicationGenerator } = require('@nx' +
       '/node');

packages/workspace/src/generators/preset/schema.d.ts

@@ -3,9 +3,9 @@ import { PackageManager } from '@nx/devkit';
 
 export interface Schema {
   name: string;
+  preset: Preset;
   style?: string;
   linter?: string;
-  preset: Preset;
   standaloneConfig?: boolean;
   framework?: string;
   packageManager?: PackageManager;
@@ -15,4 +15,5 @@ export interface Schema {
   routing?: boolean;
   standaloneApi?: boolean;
   e2eTestRunner?: 'cypress' | 'jest' | 'detox' | 'none';
+  js?: boolean;
 }