@nx/workspace 16.4.0-beta.6 → 16.4.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "16.4.0-beta.6",
+  "version": "16.4.0-beta.7",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -33,36 +33,36 @@
     "requirements": {},
     "migrations": "./migrations.json",
     "packageGroup": {
-      "@nrwl/js": "16.4.0-beta.6",
-      "@nrwl/jest": "16.4.0-beta.6",
-      "@nrwl/linter": "16.4.0-beta.6",
-      "@nrwl/angular": "16.4.0-beta.6",
-      "@nrwl/cypress": "16.4.0-beta.6",
-      "@nrwl/detox": "16.4.0-beta.6",
-      "@nrwl/devkit": "16.4.0-beta.6",
-      "@nrwl/esbuild": "16.4.0-beta.6",
-      "@nrwl/eslint-plugin-nx": "16.4.0-beta.6",
-      "@nrwl/expo": "16.4.0-beta.6",
-      "@nrwl/express": "16.4.0-beta.6",
-      "@nrwl/nest": "16.4.0-beta.6",
-      "@nrwl/next": "16.4.0-beta.6",
-      "@nrwl/node": "16.4.0-beta.6",
+      "@nrwl/js": "16.4.0-beta.7",
+      "@nrwl/jest": "16.4.0-beta.7",
+      "@nrwl/linter": "16.4.0-beta.7",
+      "@nrwl/angular": "16.4.0-beta.7",
+      "@nrwl/cypress": "16.4.0-beta.7",
+      "@nrwl/detox": "16.4.0-beta.7",
+      "@nrwl/devkit": "16.4.0-beta.7",
+      "@nrwl/esbuild": "16.4.0-beta.7",
+      "@nrwl/eslint-plugin-nx": "16.4.0-beta.7",
+      "@nrwl/expo": "16.4.0-beta.7",
+      "@nrwl/express": "16.4.0-beta.7",
+      "@nrwl/nest": "16.4.0-beta.7",
+      "@nrwl/next": "16.4.0-beta.7",
+      "@nrwl/node": "16.4.0-beta.7",
       "nx-cloud": "latest",
-      "@nrwl/nx-plugin": "16.4.0-beta.6",
-      "@nrwl/react-native": "16.4.0-beta.6",
-      "@nrwl/react": "16.4.0-beta.6",
-      "@nrwl/rollup": "16.4.0-beta.6",
-      "@nrwl/storybook": "16.4.0-beta.6",
-      "@nrwl/tao": "16.4.0-beta.6",
-      "@nrwl/vite": "16.4.0-beta.6",
-      "@nrwl/web": "16.4.0-beta.6",
-      "@nrwl/webpack": "16.4.0-beta.6",
-      "nx": "16.4.0-beta.6"
+      "@nrwl/nx-plugin": "16.4.0-beta.7",
+      "@nrwl/react-native": "16.4.0-beta.7",
+      "@nrwl/react": "16.4.0-beta.7",
+      "@nrwl/rollup": "16.4.0-beta.7",
+      "@nrwl/storybook": "16.4.0-beta.7",
+      "@nrwl/tao": "16.4.0-beta.7",
+      "@nrwl/vite": "16.4.0-beta.7",
+      "@nrwl/web": "16.4.0-beta.7",
+      "@nrwl/webpack": "16.4.0-beta.7",
+      "nx": "16.4.0-beta.7"
     }
   },
   "dependencies": {
-    "@nrwl/workspace": "16.4.0-beta.6",
-    "@nx/devkit": "16.4.0-beta.6",
+    "@nrwl/workspace": "16.4.0-beta.7",
+    "@nx/devkit": "16.4.0-beta.7",
     "@parcel/watcher": "2.0.4",
     "chalk": "^4.1.0",
     "chokidar": "^3.5.1",
@@ -74,7 +74,7 @@
     "ignore": "^5.0.4",
     "minimatch": "3.0.5",
     "npm-run-path": "^4.0.1",
-    "nx": "16.4.0-beta.6",
+    "nx": "16.4.0-beta.7",
     "open": "^8.4.0",
     "rxjs": "^7.8.0",
     "tmp": "~0.2.1",
@@ -86,5 +86,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "6eda3ff725a1e5ee973e71cb711b065dcc3f2a16"
+  "gitHead": "847d3a45b61cd2c267acb66c4165a5bb875aff4f"
 }

package/src/generators/move/lib/update-eslintrc-json.js

@@ -34,7 +34,9 @@ function updateEslintrcJson(tree, schema, project) {
         (_a = eslintRcJson.overrides) === null || _a === void 0 ? void 0 : _a.forEach((o) => {
             var _a;
             if ((_a = o.parserOptions) === null || _a === void 0 ? void 0 : _a.project) {
-                o.parserOptions.project = o.parserOptions.project.map((p) => p.replace(project.root, schema.relativeToRootDestination));
+                o.parserOptions.project = Array.isArray(o.parserOptions.project)
+                    ? o.parserOptions.project.map((p) => p.replace(project.root, schema.relativeToRootDestination))
+                    : o.parserOptions.project.replace(project.root, schema.relativeToRootDestination);
             }
         });
         return eslintRcJson;

package/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
 

package/src/generators/new/generate-preset.js

@@ -60,6 +60,7 @@ function generatePreset(host, opts) {
             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
@@ -78,6 +79,7 @@ function getPresetDependencies({ preset, presetVersion, bundler, e2eTestRunner,
     var _a;
     switch (preset) {
         case presets_1.Preset.TS:
+        case presets_1.Preset.TsStandalone:
             return { dependencies: {}, dev: { '@nx/js': versions_1.nxVersion } };
         case presets_1.Preset.AngularMonorepo:
         case presets_1.Preset.AngularStandalone:

package/src/generators/new/generate-workspace-files.js

@@ -52,6 +52,7 @@ function createAppsAndLibsFolders(tree, options) {
         options.preset === presets_1.Preset.ReactStandalone ||
         options.preset === presets_1.Preset.NodeStandalone ||
         options.preset === presets_1.Preset.NextJsStandalone ||
+        options.preset === presets_1.Preset.TsStandalone ||
         options.isCustomPreset) {
         // don't generate any folders
     }
@@ -100,17 +101,19 @@ function createFiles(tree, options) {
     const filesDirName = options.preset === presets_1.Preset.AngularStandalone ||
         options.preset === presets_1.Preset.ReactStandalone ||
         options.preset === presets_1.Preset.NodeStandalone ||
-        options.preset === presets_1.Preset.NextJsStandalone
+        options.preset === presets_1.Preset.NextJsStandalone ||
+        options.preset === presets_1.Preset.TsStandalone
         ? './files-root-app'
         : options.preset === presets_1.Preset.NPM || options.preset === presets_1.Preset.Core
             ? './files-package-based-repo'
             : './files-integrated-repo';
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, filesDirName), options.directory, Object.assign(Object.assign({ formattedNames, dot: '.', tmpl: '', cliCommand: 'nx', nxCli: false }, options), { nxVersion: versions_1.nxVersion, packageManager: options.packageManager }));
 }
-function createReadme(tree, { name, appName, directory }) {
+function createReadme(tree, { name, appName, directory, preset }) {
     const formattedNames = (0, devkit_1.names)(name);
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files-readme'), directory, {
         formattedNames,
+        includeServe: preset !== presets_1.Preset.TsStandalone,
         appName,
         name,
     });
@@ -137,6 +140,15 @@ function addNpmScripts(tree, options) {
             return json;
         });
     }
+    if (options.preset === presets_1.Preset.TsStandalone) {
+        (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'package.json'), (json) => {
+            Object.assign(json.scripts, {
+                build: 'nx build',
+                test: 'nx test',
+            });
+            return json;
+        });
+    }
 }
 function addPropertyWithStableKeys(obj, key, value) {
     const copy = Object.assign({}, obj);

package/src/generators/new/new.d.ts

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

package/src/generators/preset/preset.js

@@ -147,6 +147,19 @@ function createPreset(tree, options) {
             (0, devkit_1.updateNxJson)(tree, c);
             return initGenerator(tree, {});
         }
+        else if (options.preset === presets_1.Preset.TsStandalone) {
+            const c = (0, devkit_1.readNxJson)(tree);
+            const { libraryGenerator } = require('@nx' + '/js');
+            (0, devkit_1.updateNxJson)(tree, c);
+            return libraryGenerator(tree, {
+                name: options.name,
+                bundler: 'tsc',
+                unitTestRunner: 'vitest',
+                testEnvironment: 'node',
+                js: options.js,
+                rootProject: true,
+            });
+        }
         else if (options.preset === presets_1.Preset.NodeStandalone) {
             const { applicationGenerator: nodeApplicationGenerator } = require('@nx' +
                 '/node');

package/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;
 }

package/src/generators/utils/presets.d.ts

@@ -16,5 +16,6 @@ export declare enum Preset {
     Nest = "nest",
     Express = "express",
     NodeStandalone = "node-standalone",
-    NodeMonorepo = "node-monorepo"
+    NodeMonorepo = "node-monorepo",
+    TsStandalone = "ts-standalone"
 }

package/src/generators/utils/presets.js

@@ -21,4 +21,5 @@ var Preset;
     Preset["Express"] = "express";
     Preset["NodeStandalone"] = "node-standalone";
     Preset["NodeMonorepo"] = "node-monorepo";
+    Preset["TsStandalone"] = "ts-standalone";
 })(Preset = exports.Preset || (exports.Preset = {}));