@nrwl/workspace 15.3.0-beta.12 → 15.3.0-beta.13

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [15.3.0-beta.12](https://github.com/nrwl/nx/compare/15.2.0...15.3.0-beta.12) (2022-12-01)
+# [15.3.0-beta.13](https://github.com/nrwl/nx/compare/15.2.0...15.3.0-beta.13) (2022-12-05)
 
 **Note:** Version bump only for package @nrwl/workspace

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/workspace",
-  "version": "15.3.0-beta.12",
+  "version": "15.3.0-beta.13",
   "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,31 +33,31 @@
     "requirements": {},
     "migrations": "./migrations.json",
     "packageGroup": {
-      "@nrwl/angular": "15.3.0-beta.12",
-      "@nrwl/cli": "15.3.0-beta.12",
-      "@nrwl/cypress": "15.3.0-beta.12",
-      "@nrwl/detox": "15.3.0-beta.12",
-      "@nrwl/devkit": "15.3.0-beta.12",
-      "@nrwl/esbuild": "15.3.0-beta.12",
-      "@nrwl/eslint-plugin-nx": "15.3.0-beta.12",
-      "@nrwl/expo": "15.3.0-beta.12",
-      "@nrwl/express": "15.3.0-beta.12",
-      "@nrwl/jest": "15.3.0-beta.12",
-      "@nrwl/js": "15.3.0-beta.12",
-      "@nrwl/linter": "15.3.0-beta.12",
-      "@nrwl/nest": "15.3.0-beta.12",
-      "@nrwl/next": "15.3.0-beta.12",
-      "@nrwl/node": "15.3.0-beta.12",
+      "@nrwl/angular": "15.3.0-beta.13",
+      "@nrwl/cli": "15.3.0-beta.13",
+      "@nrwl/cypress": "15.3.0-beta.13",
+      "@nrwl/detox": "15.3.0-beta.13",
+      "@nrwl/devkit": "15.3.0-beta.13",
+      "@nrwl/esbuild": "15.3.0-beta.13",
+      "@nrwl/eslint-plugin-nx": "15.3.0-beta.13",
+      "@nrwl/expo": "15.3.0-beta.13",
+      "@nrwl/express": "15.3.0-beta.13",
+      "@nrwl/jest": "15.3.0-beta.13",
+      "@nrwl/js": "15.3.0-beta.13",
+      "@nrwl/linter": "15.3.0-beta.13",
+      "@nrwl/nest": "15.3.0-beta.13",
+      "@nrwl/next": "15.3.0-beta.13",
+      "@nrwl/node": "15.3.0-beta.13",
       "@nrwl/nx-cloud": "latest",
-      "@nrwl/nx-plugin": "15.3.0-beta.12",
-      "@nrwl/react": "15.3.0-beta.12",
-      "@nrwl/react-native": "15.3.0-beta.12",
-      "@nrwl/rollup": "15.3.0-beta.12",
-      "@nrwl/storybook": "15.3.0-beta.12",
-      "@nrwl/tao": "15.3.0-beta.12",
-      "@nrwl/web": "15.3.0-beta.12",
-      "@nrwl/webpack": "15.3.0-beta.12",
-      "nx": "15.3.0-beta.12"
+      "@nrwl/nx-plugin": "15.3.0-beta.13",
+      "@nrwl/react": "15.3.0-beta.13",
+      "@nrwl/react-native": "15.3.0-beta.13",
+      "@nrwl/rollup": "15.3.0-beta.13",
+      "@nrwl/storybook": "15.3.0-beta.13",
+      "@nrwl/tao": "15.3.0-beta.13",
+      "@nrwl/web": "15.3.0-beta.13",
+      "@nrwl/webpack": "15.3.0-beta.13",
+      "nx": "15.3.0-beta.13"
     }
   },
   "peerDependencies": {
@@ -69,8 +69,8 @@
     }
   },
   "dependencies": {
-    "@nrwl/devkit": "15.3.0-beta.12",
-    "@nrwl/linter": "15.3.0-beta.12",
+    "@nrwl/devkit": "15.3.0-beta.13",
+    "@nrwl/linter": "15.3.0-beta.13",
     "@parcel/watcher": "2.0.4",
     "chalk": "4.1.0",
     "chokidar": "^3.5.1",
@@ -85,7 +85,7 @@
     "ignore": "^5.0.4",
     "minimatch": "3.0.5",
     "npm-run-path": "^4.0.1",
-    "nx": "15.3.0-beta.12",
+    "nx": "15.3.0-beta.13",
     "open": "^8.4.0",
     "rxjs": "^6.5.4",
     "semver": "7.3.4",
@@ -98,5 +98,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "cded83b2c5bf3e4252c03d4dbcbb5b203b0faed0"
+  "gitHead": "61d7d74378305ba96f9e94707aefeecb438328ca"
 }

package/src/generators/library/files/lib/tsconfig.lib.json

@@ -5,6 +5,6 @@
     "declaration": true,
     "types": []
   },
-  "include": ["**/*.ts"<% if (js) { %>, "**/*.js"<% } %>],
-  "exclude": ["jest.config.ts","**/*.spec.ts"<% if (js) { %>, "**/*.spec.js"<% } %>]
+  "include": ["src/**/*.ts"<% if (js) { %>, "src/**/*.js"<% } %>],
+  "exclude": ["jest.config.ts","src/**/*.spec.ts"<% if (js) { %>, "src/**/*.spec.js"<% } %>]
 }

package/src/generators/new/files-integrated-repo/package.json__tmpl__

@@ -9,7 +9,6 @@
   },
   "devDependencies": {
     "nx": "<%= nxVersion %>",
-    "@nrwl/cli": "<%= nxVersion %>",
     "@nrwl/workspace": "<%= nxVersion %>",
     "typescript": "<%= typescriptVersion %>",
     "prettier": "<%= prettierVersion %>"

package/src/generators/new/files-root-app/package.json__tmpl__

@@ -8,7 +8,6 @@
   "dependencies": {
   },
   "devDependencies": {
-    "@nrwl/cli": "<%= nxVersion %>",
     "@nrwl/workspace": "<%= nxVersion %>",
     "nx": "<%= nxVersion %>",
     "prettier": "<%= prettierVersion %>",

package/src/utils/create-ts-config.d.ts

@@ -0,0 +1,17 @@
+import { Tree } from 'nx/src/generators/tree';
+export declare const tsConfigBaseOptions: {
+    rootDir: string;
+    sourceMap: boolean;
+    declaration: boolean;
+    moduleResolution: string;
+    emitDecoratorMetadata: boolean;
+    experimentalDecorators: boolean;
+    importHelpers: boolean;
+    target: string;
+    module: string;
+    lib: string[];
+    skipLibCheck: boolean;
+    skipDefaultLibCheck: boolean;
+    baseUrl: string;
+};
+export declare function extractTsConfigBase(host: Tree): void;

package/src/utils/create-ts-config.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractTsConfigBase = exports.tsConfigBaseOptions = void 0;
+const json_1 = require("nx/src/generators/utils/json");
+exports.tsConfigBaseOptions = {
+    rootDir: '.',
+    sourceMap: true,
+    declaration: false,
+    moduleResolution: 'node',
+    emitDecoratorMetadata: true,
+    experimentalDecorators: true,
+    importHelpers: true,
+    target: 'es2015',
+    module: 'esnext',
+    lib: ['es2017', 'dom'],
+    skipLibCheck: true,
+    skipDefaultLibCheck: true,
+    baseUrl: '.',
+};
+function extractTsConfigBase(host) {
+    if (host.exists('tsconfig.base.json'))
+        return;
+    const tsconfig = (0, json_1.readJson)(host, 'tsconfig.json');
+    const baseCompilerOptions = {};
+    for (let compilerOption of Object.keys(exports.tsConfigBaseOptions)) {
+        baseCompilerOptions[compilerOption] =
+            tsconfig.compilerOptions[compilerOption];
+        delete tsconfig.compilerOptions[compilerOption];
+    }
+    (0, json_1.writeJson)(host, 'tsconfig.base.json', {
+        compileOnSave: false,
+        compilerOptions: baseCompilerOptions,
+        exclude: tsconfig.exclude,
+    });
+    tsconfig.extends = './tsconfig.base.json';
+    delete tsconfig.compileOnSave;
+    delete tsconfig.exclude;
+    (0, json_1.writeJson)(host, 'tsconfig.json', tsconfig);
+    // special case for updating e2e tests.
+    if (host.exists('e2e/tsconfig.json')) {
+        (0, json_1.updateJson)(host, 'e2e/tsconfig.json', (json) => {
+            json.extends = '../tsconfig.base.json';
+            return json;
+        });
+    }
+}
+exports.extractTsConfigBase = extractTsConfigBase;
+//# sourceMappingURL=create-ts-config.js.map

package/src/utils/create-ts-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-ts-config.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/create-ts-config.ts"],"names":[],"mappings":";;;AACA,uDAA+E;AAElE,QAAA,mBAAmB,GAAG;IACjC,OAAO,EAAE,GAAG;IACZ,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,KAAK;IAClB,gBAAgB,EAAE,MAAM;IACxB,qBAAqB,EAAE,IAAI;IAC3B,sBAAsB,EAAE,IAAI;IAC5B,aAAa,EAAE,IAAI;IACnB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,GAAG,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC;IACtB,YAAY,EAAE,IAAI;IAClB,mBAAmB,EAAE,IAAI;IACzB,OAAO,EAAE,GAAG;CACb,CAAC;AAEF,SAAgB,mBAAmB,CAAC,IAAU;IAC5C,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC;QAAE,OAAO;IAE9C,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACjD,MAAM,mBAAmB,GAAG,EAAS,CAAC;IACtC,KAAK,IAAI,cAAc,IAAI,MAAM,CAAC,IAAI,CAAC,2BAAmB,CAAC,EAAE;QAC3D,mBAAmB,CAAC,cAAc,CAAC;YACjC,QAAQ,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QAC3C,OAAO,QAAQ,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;KACjD;IACD,IAAA,gBAAS,EAAC,IAAI,EAAE,oBAAoB,EAAE;QACpC,aAAa,EAAE,KAAK;QACpB,eAAe,EAAE,mBAAmB;QACpC,OAAO,EAAE,QAAQ,CAAC,OAAO;KAC1B,CAAC,CAAC;IACH,QAAQ,CAAC,OAAO,GAAG,sBAAsB,CAAC;IAC1C,OAAO,QAAQ,CAAC,aAAa,CAAC;IAC9B,OAAO,QAAQ,CAAC,OAAO,CAAC;IAExB,IAAA,gBAAS,EAAC,IAAI,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAC;IAE3C,uCAAuC;IACvC,IAAI,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE;QACpC,IAAA,iBAAU,EAAC,IAAI,EAAE,mBAAmB,EAAE,CAAC,IAAI,EAAE,EAAE;YAC7C,IAAI,CAAC,OAAO,GAAG,uBAAuB,CAAC;YACvC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AA5BD,kDA4BC"}

package/src/generators/new/files-root-app/tsconfig.base.json

@@ -1,20 +0,0 @@
-{
-  "compileOnSave": false,
-  "compilerOptions": {
-    "rootDir": ".",
-    "sourceMap": true,
-    "declaration": false,
-    "moduleResolution": "node",
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "importHelpers": true,
-    "target": "es2015",
-    "module": "esnext",
-    "lib": ["es2017", "dom"],
-    "skipLibCheck": true,
-    "skipDefaultLibCheck": true,
-    "baseUrl": ".",
-    "paths": {}
-  },
-  "exclude": ["node_modules", "tmp"]
-}