@nrwl/workspace 15.3.0-beta.9 → 15.3.0-rc.0
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +1 -1
- package/package.json +29 -30
- package/src/generators/library/files/lib/tsconfig.lib.json +2 -2
- package/src/generators/library/library.d.ts +1 -1
- package/src/generators/library/library.js +19 -17
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/move/lib/update-imports.js +4 -3
- package/src/generators/move/lib/update-imports.js.map +1 -1
- package/src/generators/new/files-integrated-repo/package.json__tmpl__ +0 -1
- package/src/generators/new/files-root-app/package.json__tmpl__ +0 -1
- package/src/generators/preset/preset.js +1 -4
- package/src/generators/preset/preset.js.map +1 -1
- package/src/generators/remove/lib/update-tsconfig.d.ts +2 -2
- package/src/generators/remove/lib/update-tsconfig.js +22 -14
- package/src/generators/remove/lib/update-tsconfig.js.map +1 -1
- package/src/generators/remove/remove.js +1 -1
- package/src/generators/remove/remove.js.map +1 -1
- package/src/utils/create-ts-config.d.ts +17 -0
- package/src/utils/create-ts-config.js +48 -0
- package/src/utils/create-ts-config.js.map +1 -0
- package/src/generators/new/files-root-app/tsconfig.base.json +0 -20
package/CHANGELOG.md
CHANGED
@@ -3,6 +3,6 @@
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
5
5
|
|
6
|
-
# [15.3.0-
|
6
|
+
# [15.3.0-rc.0](https://github.com/nrwl/nx/compare/15.2.0...15.3.0-rc.0) (2022-12-05)
|
7
7
|
|
8
8
|
**Note:** Version bump only for package @nrwl/workspace
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@nrwl/workspace",
|
3
|
-
"version": "15.3.0-
|
3
|
+
"version": "15.3.0-rc.0",
|
4
4
|
"private": false,
|
5
5
|
"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.",
|
6
6
|
"repository": {
|
@@ -33,31 +33,31 @@
|
|
33
33
|
"requirements": {},
|
34
34
|
"migrations": "./migrations.json",
|
35
35
|
"packageGroup": {
|
36
|
-
"@nrwl/angular": "15.3.0-
|
37
|
-
"@nrwl/cli": "15.3.0-
|
38
|
-
"@nrwl/cypress": "15.3.0-
|
39
|
-
"@nrwl/detox": "15.3.0-
|
40
|
-
"@nrwl/devkit": "15.3.0-
|
41
|
-
"@nrwl/esbuild": "15.3.0-
|
42
|
-
"@nrwl/eslint-plugin-nx": "15.3.0-
|
43
|
-
"@nrwl/expo": "15.3.0-
|
44
|
-
"@nrwl/express": "15.3.0-
|
45
|
-
"@nrwl/jest": "15.3.0-
|
46
|
-
"@nrwl/js": "15.3.0-
|
47
|
-
"@nrwl/linter": "15.3.0-
|
48
|
-
"@nrwl/nest": "15.3.0-
|
49
|
-
"@nrwl/next": "15.3.0-
|
50
|
-
"@nrwl/node": "15.3.0-
|
36
|
+
"@nrwl/angular": "15.3.0-rc.0",
|
37
|
+
"@nrwl/cli": "15.3.0-rc.0",
|
38
|
+
"@nrwl/cypress": "15.3.0-rc.0",
|
39
|
+
"@nrwl/detox": "15.3.0-rc.0",
|
40
|
+
"@nrwl/devkit": "15.3.0-rc.0",
|
41
|
+
"@nrwl/esbuild": "15.3.0-rc.0",
|
42
|
+
"@nrwl/eslint-plugin-nx": "15.3.0-rc.0",
|
43
|
+
"@nrwl/expo": "15.3.0-rc.0",
|
44
|
+
"@nrwl/express": "15.3.0-rc.0",
|
45
|
+
"@nrwl/jest": "15.3.0-rc.0",
|
46
|
+
"@nrwl/js": "15.3.0-rc.0",
|
47
|
+
"@nrwl/linter": "15.3.0-rc.0",
|
48
|
+
"@nrwl/nest": "15.3.0-rc.0",
|
49
|
+
"@nrwl/next": "15.3.0-rc.0",
|
50
|
+
"@nrwl/node": "15.3.0-rc.0",
|
51
51
|
"@nrwl/nx-cloud": "latest",
|
52
|
-
"@nrwl/nx-plugin": "15.3.0-
|
53
|
-
"@nrwl/react": "15.3.0-
|
54
|
-
"@nrwl/react-native": "15.3.0-
|
55
|
-
"@nrwl/rollup": "15.3.0-
|
56
|
-
"@nrwl/storybook": "15.3.0-
|
57
|
-
"@nrwl/tao": "15.3.0-
|
58
|
-
"@nrwl/web": "15.3.0-
|
59
|
-
"@nrwl/webpack": "15.3.0-
|
60
|
-
"nx": "15.3.0-
|
52
|
+
"@nrwl/nx-plugin": "15.3.0-rc.0",
|
53
|
+
"@nrwl/react": "15.3.0-rc.0",
|
54
|
+
"@nrwl/react-native": "15.3.0-rc.0",
|
55
|
+
"@nrwl/rollup": "15.3.0-rc.0",
|
56
|
+
"@nrwl/storybook": "15.3.0-rc.0",
|
57
|
+
"@nrwl/tao": "15.3.0-rc.0",
|
58
|
+
"@nrwl/web": "15.3.0-rc.0",
|
59
|
+
"@nrwl/webpack": "15.3.0-rc.0",
|
60
|
+
"nx": "15.3.0-rc.0"
|
61
61
|
}
|
62
62
|
},
|
63
63
|
"peerDependencies": {
|
@@ -69,9 +69,8 @@
|
|
69
69
|
}
|
70
70
|
},
|
71
71
|
"dependencies": {
|
72
|
-
"@nrwl/devkit": "15.3.0-
|
73
|
-
"@nrwl/
|
74
|
-
"@nrwl/linter": "15.3.0-beta.9",
|
72
|
+
"@nrwl/devkit": "15.3.0-rc.0",
|
73
|
+
"@nrwl/linter": "15.3.0-rc.0",
|
75
74
|
"@parcel/watcher": "2.0.4",
|
76
75
|
"chalk": "4.1.0",
|
77
76
|
"chokidar": "^3.5.1",
|
@@ -86,7 +85,7 @@
|
|
86
85
|
"ignore": "^5.0.4",
|
87
86
|
"minimatch": "3.0.5",
|
88
87
|
"npm-run-path": "^4.0.1",
|
89
|
-
"nx": "15.3.0-
|
88
|
+
"nx": "15.3.0-rc.0",
|
90
89
|
"open": "^8.4.0",
|
91
90
|
"rxjs": "^6.5.4",
|
92
91
|
"semver": "7.3.4",
|
@@ -99,5 +98,5 @@
|
|
99
98
|
"access": "public"
|
100
99
|
},
|
101
100
|
"types": "./index.d.ts",
|
102
|
-
"gitHead": "
|
101
|
+
"gitHead": "5d910c0f1a9ec3ba6d7ebd78072af5cc5caf86c5"
|
103
102
|
}
|
@@ -5,6 +5,6 @@
|
|
5
5
|
"declaration": true,
|
6
6
|
"types": []
|
7
7
|
},
|
8
|
-
"include": ["
|
9
|
-
"exclude": ["jest.config.ts","
|
8
|
+
"include": ["src/**/*.ts"<% if (js) { %>, "src/**/*.js"<% } %>],
|
9
|
+
"exclude": ["jest.config.ts","src/**/*.spec.ts"<% if (js) { %>, "src/**/*.spec.js"<% } %>]
|
10
10
|
}
|
@@ -8,10 +8,6 @@ const path_2 = require("path");
|
|
8
8
|
const run_tasks_in_serial_1 = require("../../utilities/run-tasks-in-serial");
|
9
9
|
const typescript_1 = require("../../utilities/typescript");
|
10
10
|
const versions_1 = require("../../utils/versions");
|
11
|
-
// nx-ignore-next-line
|
12
|
-
const { jestProjectGenerator } = require('@nrwl/jest');
|
13
|
-
// nx-ignore-next-line
|
14
|
-
const { lintProjectGenerator, Linter } = require('@nrwl/linter');
|
15
11
|
function addProject(tree, options) {
|
16
12
|
const projectConfiguration = {
|
17
13
|
root: options.projectRoot,
|
@@ -38,18 +34,22 @@ function addProject(tree, options) {
|
|
38
34
|
(0, devkit_1.addProjectConfiguration)(tree, options.name, projectConfiguration, options.standaloneConfig);
|
39
35
|
}
|
40
36
|
function addLint(tree, options) {
|
41
|
-
return
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
37
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
38
|
+
yield (0, devkit_1.ensurePackage)(tree, '@nrwl/linter', versions_1.nxVersion);
|
39
|
+
const { lintProjectGenerator } = require('@nrwl/linter');
|
40
|
+
return lintProjectGenerator(tree, {
|
41
|
+
project: options.name,
|
42
|
+
linter: options.linter,
|
43
|
+
skipFormat: true,
|
44
|
+
tsConfigPaths: [
|
45
|
+
(0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
|
46
|
+
],
|
47
|
+
unitTestRunner: options.unitTestRunner,
|
48
|
+
eslintFilePatterns: [
|
49
|
+
`${options.projectRoot}/**/*.${options.js ? 'js' : 'ts'}`,
|
50
|
+
],
|
51
|
+
setParserOptionsProject: options.setParserOptionsProject,
|
52
|
+
});
|
53
53
|
});
|
54
54
|
}
|
55
55
|
exports.addLint = addLint;
|
@@ -97,6 +97,8 @@ function createFiles(tree, options) {
|
|
97
97
|
}
|
98
98
|
function addJest(tree, options) {
|
99
99
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
100
|
+
yield (0, devkit_1.ensurePackage)(tree, '@nrwl/jest', versions_1.nxVersion);
|
101
|
+
const { jestProjectGenerator } = require('@nrwl/jest');
|
100
102
|
return yield jestProjectGenerator(tree, Object.assign(Object.assign({}, options), { project: options.name, setupFile: 'none', supportTsx: true, babelJest: options.babelJest, skipSerializers: true, testEnvironment: options.testEnvironment, skipFormat: true }));
|
101
103
|
});
|
102
104
|
}
|
@@ -133,7 +135,7 @@ function normalizeOptions(tree, options) {
|
|
133
135
|
options.unitTestRunner = 'jest';
|
134
136
|
}
|
135
137
|
if (!options.linter) {
|
136
|
-
options.linter =
|
138
|
+
options.linter = 'eslint';
|
137
139
|
}
|
138
140
|
const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
|
139
141
|
const fileName = getCaseAwareFileName({
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCAiBsB;AACtB,4CAAkD;AAClD,+BAA4B;AAC5B,6EAAuE;AACvE,2DAGoC;AACpC,mDAAiD;AAajD,SAAS,UAAU,CAAC,IAAU,EAAE,OAAyB;IACvD,MAAM,oBAAoB,GAAyB;QACjD,IAAI,EAAE,OAAO,CAAC,WAAW;QACzB,UAAU,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC;QACzD,WAAW,EAAE,SAAS;QACtB,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,OAAO,CAAC,UAAU;KACzB,CAAC;IAEF,IAAI,OAAO,CAAC,SAAS,EAAE;QACrB,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,oBAAS,EAAE,CAAC,CAAC;QAClE,oBAAoB,CAAC,OAAO,CAAC,KAAK,GAAG;YACnC,QAAQ,EAAE,cAAc;YACxB,OAAO,EAAE,CAAC,sBAAsB,CAAC;YACjC,OAAO,EAAE;gBACP,UAAU,EACR,OAAO,CAAC,OAAO,IAAI,GAAG;oBACpB,CAAC,CAAC,QAAQ,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,gBAAgB,EAAE;oBACvD,CAAC,CAAC,QAAQ,OAAO,CAAC,gBAAgB,EAAE;gBACxC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,YAAY,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;gBACvE,QAAQ,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB;gBACpD,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,OAAO,CAAC;aACxC;SACF,CAAC;KACH;IAED,IAAA,gCAAuB,EACrB,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,oBAAoB,EACpB,OAAO,CAAC,gBAAgB,CACzB,CAAC;AACJ,CAAC;AAED,SAAsB,OAAO,CAC3B,IAAU,EACV,OAAyB;;QAEzB,MAAM,IAAA,sBAAa,EAAC,IAAI,EAAE,cAAc,EAAE,oBAAS,CAAC,CAAC;QACrD,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;QACzD,OAAO,oBAAoB,CAAC,IAAI,EAAE;YAChC,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,UAAU,EAAE,IAAI;YAChB,aAAa,EAAE;gBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC;aAC5D;YACD,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,kBAAkB,EAAE;gBAClB,GAAG,OAAO,CAAC,WAAW,SAAS,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;aAC1D;YACD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;SACzD,CAAC,CAAC;IACL,CAAC;CAAA;AAnBD,0BAmBC;AAED,SAAS,cAAc,CAAC,IAAU,EAAE,OAAyB;IAC3D,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,IAAI,CAAC,eAAe,mCACf,IAAI,CAAC,eAAe,KACvB,gCAAgC,EAAE,IAAI,EACtC,MAAM,EAAE,IAAI,EACZ,iBAAiB,EAAE,IAAI,EACvB,0BAA0B,EAAE,IAAI,GACjC,CAAC;SACH;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU,EAAE,OAAyB;IAC/D,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,sCAAyB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,IAAA,0BAAiB,EACf,OAAO,CAAC,WAAW,EACnB,OAAO,EACP,QAAQ,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CACtC;SACF,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,OAAyB;IACxD,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9D,MAAM,UAAU,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACvD,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,aAAa,CAAC,EAAE,OAAO,CAAC,WAAW,kCAClE,OAAO,KACV,GAAG,EAAE,GAAG,EACR,SAAS;QACT,IAAI;QACJ,YAAY,EACZ,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,EAChB,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,EAAE,EACR,cAAc,EAAE,UAAU,EAC1B,gBAAgB,EAAE,IAAA,0CAA6B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,EAC1E,iBAAiB,EAAE,OAAO,CAAC,cAAc,KAAK,MAAM,EACpD,SAAS,EAAE,OAAO,CAAC,MAAM,KAAK,MAAM,IACpC,CAAC;IAEH,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,IAAI,CAAC,MAAM,CACT,IAAA,WAAI,EAAC,OAAO,CAAC,WAAW,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,QAAQ,UAAU,CAAC,CACpE,CAAC;KACH;IAED,IAAI,OAAO,CAAC,WAAW,EAAE;QACvB,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC;KACpD;IAED,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;KACZ;IAED,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;QACtB,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;KACxD;IAED,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAChC,CAAC;AAED,SAAe,OAAO,CACpB,IAAU,EACV,OAAyB;;QAEzB,MAAM,IAAA,sBAAa,EAAC,IAAI,EAAE,YAAY,EAAE,oBAAS,CAAC,CAAC;QACnD,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;QACvD,OAAO,MAAM,oBAAoB,CAAC,IAAI,kCACjC,OAAO,KACV,OAAO,EAAE,OAAO,CAAC,IAAI,EACrB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,IAAI,EAChB,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,eAAe,EAAE,IAAI,EACrB,eAAe,EAAE,OAAO,CAAC,eAAe,EACxC,UAAU,EAAE,IAAI,IAChB,CAAC;IACL,CAAC;CAAA;AAED,SAAsB,gBAAgB,CAAC,IAAU,EAAE,MAAc;;QAC/D,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3B,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YACzB,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACnC;QACD,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1B,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE;YAC7B,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAClD,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAC1B;QACD,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;YACrC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAClD,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAC1B;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AA1BD,4CA0BC;AAED,kBAAe,gBAAgB,CAAC;AACnB,QAAA,gBAAgB,GAAG,IAAA,2BAAkB,EAAC,gBAAgB,CAAC,CAAC;AAErE,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;IACnD,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAClE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAC1E,CAAC;IAEF,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC3B,OAAO,CAAC,cAAc,GAAG,MAAM,CAAC;KACjC;IAED,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACnB,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC;KAC3B;IAED,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACxE,MAAM,QAAQ,GAAG,oBAAoB,CAAC;QACpC,QAAQ,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW;QACvD,eAAe,EAAE,OAAO,CAAC,eAAe;KACzC,CAAC,CAAC;IAEH,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IACvE,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,cAAc,CAAC;IAElD,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAEjE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,UAAU,GACd,OAAO,CAAC,UAAU,IAAI,IAAA,oBAAa,EAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IAElE,uCACK,OAAO,KACV,QAAQ,EACR,IAAI,EAAE,WAAW,EACjB,WAAW;QACX,gBAAgB;QAChB,UAAU;QACV,UAAU;QACV,OAAO,IACP;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,OAG7B;IACC,MAAM,UAAU,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3C,OAAO,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC;AAC9E,CAAC"}
|
@@ -7,6 +7,7 @@ const ts = require("typescript");
|
|
7
7
|
const typescript_1 = require("../../../utilities/typescript");
|
8
8
|
const typescript_2 = require("nx/src/utils/typescript");
|
9
9
|
const utils_1 = require("./utils");
|
10
|
+
const path_2 = require("path");
|
10
11
|
/**
|
11
12
|
* Updates all the imports in the workspace and modifies the tsconfig appropriately.
|
12
13
|
*
|
@@ -50,8 +51,8 @@ function updateImports(tree, schema, project) {
|
|
50
51
|
}
|
51
52
|
}
|
52
53
|
const projectRoot = {
|
53
|
-
from: project.root
|
54
|
-
to: schema.
|
54
|
+
from: project.root,
|
55
|
+
to: schema.relativeToRootDestination,
|
55
56
|
};
|
56
57
|
if (tsConfig) {
|
57
58
|
const path = tsConfig.compilerOptions.paths[projectRef.from];
|
@@ -61,7 +62,7 @@ function updateImports(tree, schema, project) {
|
|
61
62
|
`${tsConfigPath} compilerOptions.paths`,
|
62
63
|
].join(' '));
|
63
64
|
}
|
64
|
-
const updatedPath = path.map((x) =>
|
65
|
+
const updatedPath = path.map((x) => (0, devkit_1.joinPathFragments)(projectRoot.to, (0, path_2.relative)(projectRoot.from, x)));
|
65
66
|
if (schema.updateImportPath) {
|
66
67
|
tsConfig.compilerOptions.paths[projectRef.to] = updatedPath;
|
67
68
|
delete tsConfig.compilerOptions.paths[projectRef.from];
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-imports.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-imports.ts"],"names":[],"mappings":"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"}
|
@@ -81,11 +81,8 @@ function createPreset(tree, options) {
|
|
81
81
|
style: options.style,
|
82
82
|
linter: options.linter,
|
83
83
|
standaloneConfig: options.standaloneConfig,
|
84
|
+
bundler: 'vite',
|
84
85
|
});
|
85
|
-
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
86
|
-
'@ungap/custom-elements': '0.1.6',
|
87
|
-
});
|
88
|
-
addPolyfills(tree, `apps/${(0, devkit_1.names)(options.name).fileName}/src/polyfills.ts`, ['@ungap/custom-elements']);
|
89
86
|
}
|
90
87
|
else if (options.preset === presets_1.Preset.Nest) {
|
91
88
|
const { applicationGenerator: nestApplicationGenerator } = require('@nrwl' +
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":"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"}
|
@@ -1,8 +1,8 @@
|
|
1
|
-
import {
|
1
|
+
import { Tree } from '@nrwl/devkit';
|
2
2
|
import { Schema } from '../schema';
|
3
3
|
/**
|
4
4
|
* Updates the tsconfig paths to remove the project.
|
5
5
|
*
|
6
6
|
* @param schema The options provided to the schematic
|
7
7
|
*/
|
8
|
-
export declare function updateTsconfig(tree: Tree, schema: Schema
|
8
|
+
export declare function updateTsconfig(tree: Tree, schema: Schema): Promise<void>;
|
@@ -1,27 +1,35 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.updateTsconfig = void 0;
|
4
|
+
const tslib_1 = require("tslib");
|
4
5
|
const devkit_1 = require("@nrwl/devkit");
|
5
|
-
const path_1 = require("nx/src/utils/path");
|
6
6
|
const typescript_1 = require("../../../utilities/typescript");
|
7
|
+
const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
|
7
8
|
/**
|
8
9
|
* Updates the tsconfig paths to remove the project.
|
9
10
|
*
|
10
11
|
* @param schema The options provided to the schematic
|
11
12
|
*/
|
12
|
-
function updateTsconfig(tree, schema
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
13
|
+
function updateTsconfig(tree, schema) {
|
14
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
15
|
+
const tsConfigPath = (0, typescript_1.getRootTsConfigPathInTree)(tree);
|
16
|
+
if (tree.exists(tsConfigPath)) {
|
17
|
+
const graph = yield (0, devkit_1.createProjectGraphAsync)();
|
18
|
+
const projectMapping = (0, find_project_for_path_1.createProjectRootMappings)(graph.nodes);
|
19
|
+
(0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
|
20
|
+
for (const importPath in json.compilerOptions.paths) {
|
21
|
+
for (const path of json.compilerOptions.paths[importPath]) {
|
22
|
+
const project = (0, find_project_for_path_1.findProjectForPath)((0, devkit_1.normalizePath)(path), projectMapping);
|
23
|
+
if (project === schema.projectName) {
|
24
|
+
delete json.compilerOptions.paths[importPath];
|
25
|
+
break;
|
26
|
+
}
|
27
|
+
}
|
28
|
+
}
|
29
|
+
return json;
|
30
|
+
});
|
31
|
+
}
|
32
|
+
});
|
25
33
|
}
|
26
34
|
exports.updateTsconfig = updateTsconfig;
|
27
35
|
//# sourceMappingURL=update-tsconfig.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-tsconfig.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-tsconfig.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AACtB,8DAA0E;AAE1E,4FAG0D;AAE1D;;;;GAIG;AACH,SAAsB,cAAc,CAAC,IAAU,EAAE,MAAc;;QAC7D,MAAM,YAAY,GAAG,IAAA,sCAAyB,EAAC,IAAI,CAAC,CAAC;QAErD,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;YAC7B,MAAM,KAAK,GAAiB,MAAM,IAAA,gCAAuB,GAAE,CAAC;YAC5D,MAAM,cAAc,GAAG,IAAA,iDAAyB,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC9D,IAAA,mBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;gBACtC,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE;oBACnD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE;wBACzD,MAAM,OAAO,GAAG,IAAA,0CAAkB,EAChC,IAAA,sBAAa,EAAC,IAAI,CAAC,EACnB,cAAc,CACf,CAAC;wBACF,IAAI,OAAO,KAAK,MAAM,CAAC,WAAW,EAAE;4BAClC,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;4BAC9C,MAAM;yBACP;qBACF;iBACF;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAtBD,wCAsBC"}
|
@@ -17,7 +17,7 @@ function removeGenerator(tree, schema) {
|
|
17
17
|
(0, update_jest_config_1.updateJestConfig)(tree, schema, project);
|
18
18
|
(0, remove_project_config_1.removeProjectConfig)(tree, schema);
|
19
19
|
(0, remove_project_1.removeProject)(tree, project);
|
20
|
-
(0, update_tsconfig_1.updateTsconfig)(tree, schema
|
20
|
+
yield (0, update_tsconfig_1.updateTsconfig)(tree, schema);
|
21
21
|
if (!schema.skipFormat) {
|
22
22
|
yield (0, devkit_1.formatFiles)(tree);
|
23
23
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/remove/remove.ts"],"names":[],"mappings":";;;;AAAA,
|
1
|
+
{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/remove/remove.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AAEtB,iEAA6D;AAC7D,uDAAmD;AACnD,yDAAqD;AACrD,2DAAuD;AACvD,uEAAkE;AAElE,iEAA4D;AAE5D,SAAsB,eAAe,CAAC,IAAU,EAAE,MAAc;;QAC9D,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;QACnE,MAAM,IAAA,sCAAiB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACtC,IAAA,4BAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3B,IAAA,qCAAgB,EAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACxC,IAAA,2CAAmB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAClC,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7B,MAAM,IAAA,gCAAc,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAXD,0CAWC;AAED,kBAAe,eAAe,CAAC;AAElB,QAAA,eAAe,GAAG,IAAA,2BAAkB,EAAC,eAAe,CAAC,CAAC"}
|
@@ -0,0 +1,17 @@
|
|
1
|
+
import { Tree } from 'nx/src/generators/tree';
|
2
|
+
export declare const tsConfigBaseOptions: {
|
3
|
+
rootDir: string;
|
4
|
+
sourceMap: boolean;
|
5
|
+
declaration: boolean;
|
6
|
+
moduleResolution: string;
|
7
|
+
emitDecoratorMetadata: boolean;
|
8
|
+
experimentalDecorators: boolean;
|
9
|
+
importHelpers: boolean;
|
10
|
+
target: string;
|
11
|
+
module: string;
|
12
|
+
lib: string[];
|
13
|
+
skipLibCheck: boolean;
|
14
|
+
skipDefaultLibCheck: boolean;
|
15
|
+
baseUrl: string;
|
16
|
+
};
|
17
|
+
export declare function extractTsConfigBase(host: Tree): void;
|
@@ -0,0 +1,48 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.extractTsConfigBase = exports.tsConfigBaseOptions = void 0;
|
4
|
+
const json_1 = require("nx/src/generators/utils/json");
|
5
|
+
exports.tsConfigBaseOptions = {
|
6
|
+
rootDir: '.',
|
7
|
+
sourceMap: true,
|
8
|
+
declaration: false,
|
9
|
+
moduleResolution: 'node',
|
10
|
+
emitDecoratorMetadata: true,
|
11
|
+
experimentalDecorators: true,
|
12
|
+
importHelpers: true,
|
13
|
+
target: 'es2015',
|
14
|
+
module: 'esnext',
|
15
|
+
lib: ['es2017', 'dom'],
|
16
|
+
skipLibCheck: true,
|
17
|
+
skipDefaultLibCheck: true,
|
18
|
+
baseUrl: '.',
|
19
|
+
};
|
20
|
+
function extractTsConfigBase(host) {
|
21
|
+
if (host.exists('tsconfig.base.json'))
|
22
|
+
return;
|
23
|
+
const tsconfig = (0, json_1.readJson)(host, 'tsconfig.json');
|
24
|
+
const baseCompilerOptions = {};
|
25
|
+
for (let compilerOption of Object.keys(exports.tsConfigBaseOptions)) {
|
26
|
+
baseCompilerOptions[compilerOption] =
|
27
|
+
tsconfig.compilerOptions[compilerOption];
|
28
|
+
delete tsconfig.compilerOptions[compilerOption];
|
29
|
+
}
|
30
|
+
(0, json_1.writeJson)(host, 'tsconfig.base.json', {
|
31
|
+
compileOnSave: false,
|
32
|
+
compilerOptions: baseCompilerOptions,
|
33
|
+
exclude: tsconfig.exclude,
|
34
|
+
});
|
35
|
+
tsconfig.extends = './tsconfig.base.json';
|
36
|
+
delete tsconfig.compileOnSave;
|
37
|
+
delete tsconfig.exclude;
|
38
|
+
(0, json_1.writeJson)(host, 'tsconfig.json', tsconfig);
|
39
|
+
// special case for updating e2e tests.
|
40
|
+
if (host.exists('e2e/tsconfig.json')) {
|
41
|
+
(0, json_1.updateJson)(host, 'e2e/tsconfig.json', (json) => {
|
42
|
+
json.extends = '../tsconfig.base.json';
|
43
|
+
return json;
|
44
|
+
});
|
45
|
+
}
|
46
|
+
}
|
47
|
+
exports.extractTsConfigBase = extractTsConfigBase;
|
48
|
+
//# sourceMappingURL=create-ts-config.js.map
|
@@ -0,0 +1 @@
|
|
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"}
|
@@ -1,20 +0,0 @@
|
|
1
|
-
{
|
2
|
-
"compileOnSave": false,
|
3
|
-
"compilerOptions": {
|
4
|
-
"rootDir": ".",
|
5
|
-
"sourceMap": true,
|
6
|
-
"declaration": false,
|
7
|
-
"moduleResolution": "node",
|
8
|
-
"emitDecoratorMetadata": true,
|
9
|
-
"experimentalDecorators": true,
|
10
|
-
"importHelpers": true,
|
11
|
-
"target": "es2015",
|
12
|
-
"module": "esnext",
|
13
|
-
"lib": ["es2017", "dom"],
|
14
|
-
"skipLibCheck": true,
|
15
|
-
"skipDefaultLibCheck": true,
|
16
|
-
"baseUrl": ".",
|
17
|
-
"paths": {}
|
18
|
-
},
|
19
|
-
"exclude": ["node_modules", "tmp"]
|
20
|
-
}
|