@nrwl/workspace 10.4.0 → 10.4.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/src/migrations/update-10-4-0/add-explicit-dep-on-tao.js +1 -1
- package/src/migrations/update-10-4-0/add-explicit-dep-on-tao.js.map +1 -1
- package/src/schematics/library/files/lib/src/lib/__fileName__.spec.ts__tmpl__ +7 -0
- package/src/schematics/library/files/lib/src/lib/__fileName__.ts__tmpl__ +3 -0
- package/src/schematics/library/library.js +36 -26
- package/src/schematics/library/library.js.map +1 -1
- package/src/schematics/library/schema.json +8 -2
- package/src/utils/rules/to-js.d.ts +6 -0
- package/src/utils/rules/to-js.js +68 -13
- package/src/utils/rules/to-js.js.map +1 -1
- package/src/utils/versions.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/workspace",
|
|
3
|
-
"version": "10.4.
|
|
3
|
+
"version": "10.4.4",
|
|
4
4
|
"description": "Extensible Dev Tools for Monorepos",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"@angular-devkit/architect": "~0.1001.3",
|
|
56
56
|
"@angular-devkit/core": "~10.1.3",
|
|
57
57
|
"@angular-devkit/schematics": "~10.1.3",
|
|
58
|
-
"@nrwl/cli": "10.4.
|
|
58
|
+
"@nrwl/cli": "10.4.4",
|
|
59
59
|
"cosmiconfig": "^4.0.0",
|
|
60
60
|
"fs-extra": "7.0.1",
|
|
61
61
|
"dotenv": "6.2.0",
|
|
@@ -5,7 +5,7 @@ const workspace_1 = require("@nrwl/workspace");
|
|
|
5
5
|
const versions_1 = require("../../../src/utils/versions");
|
|
6
6
|
function update() {
|
|
7
7
|
return schematics_1.chain([
|
|
8
|
-
workspace_1.addDepsToPackageJson({}, { '@nrwl/cli': versions_1.nxVersion }),
|
|
8
|
+
workspace_1.addDepsToPackageJson({}, { '@nrwl/tao': versions_1.nxVersion, '@nrwl/cli': versions_1.nxVersion }),
|
|
9
9
|
workspace_1.formatFiles(),
|
|
10
10
|
]);
|
|
11
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-explicit-dep-on-tao.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-10-4-0/add-explicit-dep-on-tao.ts"],"names":[],"mappings":";;AAAA,2DAAyD;AACzD,+CAAoE;AACpE,0DAAwD;AAExD,SAAwB,MAAM;IAC5B,OAAO,kBAAK,CAAC;QACX,gCAAoB,
|
|
1
|
+
{"version":3,"file":"add-explicit-dep-on-tao.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-10-4-0/add-explicit-dep-on-tao.ts"],"names":[],"mappings":";;AAAA,2DAAyD;AACzD,+CAAoE;AACpE,0DAAwD;AAExD,SAAwB,MAAM;IAC5B,OAAO,kBAAK,CAAC;QACX,gCAAoB,CAClB,EAAE,EACF,EAAE,WAAW,EAAE,oBAAS,EAAE,WAAW,EAAE,oBAAS,EAAE,CACnD;QACD,uBAAW,EAAE;KACd,CAAC,CAAC;AACL,CAAC;AARD,yBAQC"}
|
|
@@ -3,10 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
4
4
|
const core_1 = require("@angular-devkit/core");
|
|
5
5
|
const workspace_1 = require("@nrwl/workspace");
|
|
6
|
-
const workspace_2 = require("@nrwl/workspace");
|
|
7
|
-
const workspace_3 = require("@nrwl/workspace");
|
|
8
|
-
const workspace_4 = require("@nrwl/workspace");
|
|
9
|
-
const workspace_5 = require("@nrwl/workspace");
|
|
10
6
|
const lint_1 = require("../../utils/lint");
|
|
11
7
|
const ast_utils_1 = require("../../utils/ast-utils");
|
|
12
8
|
const file_utils_1 = require("../../core/file-utils");
|
|
@@ -26,7 +22,7 @@ function addProject(options) {
|
|
|
26
22
|
});
|
|
27
23
|
}
|
|
28
24
|
function updateTsConfig(options) {
|
|
29
|
-
return (host) =>
|
|
25
|
+
return (host) => workspace_1.updateJsonInTree('tsconfig.base.json', (json) => {
|
|
30
26
|
const c = json.compilerOptions;
|
|
31
27
|
c.paths = c.paths || {};
|
|
32
28
|
delete c.paths[options.name];
|
|
@@ -34,53 +30,63 @@ function updateTsConfig(options) {
|
|
|
34
30
|
throw new schematics_1.SchematicsException(`You already have a library using the import path "${options.importPath}". Make sure to specify a unique one.`);
|
|
35
31
|
}
|
|
36
32
|
c.paths[options.importPath] = [
|
|
37
|
-
maybeJs(options, `${ast_utils_1.libsDir(host)}/${options.projectDirectory}/src/index.ts`),
|
|
33
|
+
to_js_1.maybeJs(options, `${ast_utils_1.libsDir(host)}/${options.projectDirectory}/src/index.ts`),
|
|
38
34
|
];
|
|
39
35
|
return json;
|
|
40
36
|
});
|
|
41
37
|
}
|
|
42
38
|
function createFiles(options) {
|
|
39
|
+
const { className, name, propertyName } = workspace_1.names(options.name);
|
|
43
40
|
return schematics_1.mergeWith(schematics_1.apply(schematics_1.url(`./files/lib`), [
|
|
44
|
-
schematics_1.template(Object.assign(Object.assign(
|
|
41
|
+
schematics_1.template(Object.assign(Object.assign({}, options), { className,
|
|
42
|
+
name,
|
|
43
|
+
propertyName, cliCommand: file_utils_1.cliCommand(), tmpl: '', offsetFromRoot: workspace_1.offsetFromRoot(options.projectRoot), hasUnitTestRunner: options.unitTestRunner !== 'none' })),
|
|
45
44
|
schematics_1.move(options.projectRoot),
|
|
45
|
+
addTestFiles(options),
|
|
46
46
|
options.js ? to_js_1.toJS() : schematics_1.noop(),
|
|
47
47
|
]));
|
|
48
48
|
}
|
|
49
49
|
function updateNxJson(options) {
|
|
50
50
|
return ast_utils_1.addProjectToNxJsonInTree(options.name, { tags: options.parsedTags });
|
|
51
51
|
}
|
|
52
|
+
function addJest(options) {
|
|
53
|
+
return options.unitTestRunner !== 'none'
|
|
54
|
+
? schematics_1.externalSchematic('@nrwl/jest', 'jest-project', {
|
|
55
|
+
project: options.name,
|
|
56
|
+
setupFile: 'none',
|
|
57
|
+
supportTsx: true,
|
|
58
|
+
babelJest: options.babelJest,
|
|
59
|
+
skipSerializers: true,
|
|
60
|
+
testEnvironment: options.testEnvironment,
|
|
61
|
+
})
|
|
62
|
+
: schematics_1.noop();
|
|
63
|
+
}
|
|
52
64
|
function default_1(schema) {
|
|
53
65
|
return (host, context) => {
|
|
54
66
|
const options = normalizeOptions(host, schema);
|
|
55
67
|
return schematics_1.chain([
|
|
56
68
|
lint_1.addLintFiles(options.projectRoot, options.linter),
|
|
57
69
|
createFiles(options),
|
|
70
|
+
options.js ? to_js_1.updateTsConfigsToJs(options) : schematics_1.noop(),
|
|
58
71
|
!options.skipTsConfig ? updateTsConfig(options) : schematics_1.noop(),
|
|
59
72
|
addProject(options),
|
|
60
73
|
updateNxJson(options),
|
|
61
|
-
options
|
|
62
|
-
|
|
63
|
-
project: options.name,
|
|
64
|
-
setupFile: 'none',
|
|
65
|
-
supportTsx: true,
|
|
66
|
-
babelJest: options.babelJest,
|
|
67
|
-
skipSerializers: true,
|
|
68
|
-
testEnvironment: options.testEnvironment,
|
|
69
|
-
})
|
|
70
|
-
: schematics_1.noop(),
|
|
71
|
-
workspace_4.formatFiles(options),
|
|
74
|
+
addJest(options),
|
|
75
|
+
workspace_1.formatFiles(options),
|
|
72
76
|
])(host, context);
|
|
73
77
|
};
|
|
74
78
|
}
|
|
75
79
|
exports.default = default_1;
|
|
76
80
|
function normalizeOptions(host, options) {
|
|
77
|
-
const name =
|
|
81
|
+
const name = workspace_1.toFileName(options.name);
|
|
78
82
|
const projectDirectory = options.directory
|
|
79
|
-
? `${
|
|
83
|
+
? `${workspace_1.toFileName(options.directory)}/${name}`
|
|
80
84
|
: name;
|
|
81
85
|
const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
|
|
82
|
-
const fileName =
|
|
83
|
-
|
|
86
|
+
const fileName = getCaseAwareFileName({
|
|
87
|
+
fileName: options.simpleModuleName ? name : projectName,
|
|
88
|
+
pascalCaseFiles: options.pascalCaseFiles,
|
|
89
|
+
});
|
|
84
90
|
const projectRoot = `${ast_utils_1.libsDir(host)}/${projectDirectory}`;
|
|
85
91
|
const parsedTags = options.tags
|
|
86
92
|
? options.tags.split(',').map((s) => s.trim())
|
|
@@ -92,9 +98,13 @@ function normalizeOptions(host, options) {
|
|
|
92
98
|
parsedTags,
|
|
93
99
|
importPath });
|
|
94
100
|
}
|
|
95
|
-
function
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
101
|
+
function getCaseAwareFileName(options) {
|
|
102
|
+
const normalized = workspace_1.names(options.fileName);
|
|
103
|
+
return options.pascalCaseFiles ? normalized.className : normalized.fileName;
|
|
104
|
+
}
|
|
105
|
+
function addTestFiles(options) {
|
|
106
|
+
return options.unitTestRunner === 'none'
|
|
107
|
+
? schematics_1.filter((path) => !(path.endsWith('.ts') || path.endsWith('.tsx')))
|
|
108
|
+
: schematics_1.noop();
|
|
99
109
|
}
|
|
100
110
|
//# sourceMappingURL=library.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/schematics/library/library.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/schematics/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,8 +47,8 @@
|
|
|
47
47
|
},
|
|
48
48
|
"skipTsConfig": {
|
|
49
49
|
"type": "boolean",
|
|
50
|
-
"
|
|
51
|
-
"
|
|
50
|
+
"description": "Do not update tsconfig.json for development experience.",
|
|
51
|
+
"default": false
|
|
52
52
|
},
|
|
53
53
|
"testEnvironment": {
|
|
54
54
|
"type": "string",
|
|
@@ -65,6 +65,12 @@
|
|
|
65
65
|
"description": "Use babel instead ts-jest",
|
|
66
66
|
"default": false
|
|
67
67
|
},
|
|
68
|
+
"pascalCaseFiles": {
|
|
69
|
+
"type": "boolean",
|
|
70
|
+
"description": "Use pascal case file names.",
|
|
71
|
+
"alias": "P",
|
|
72
|
+
"default": false
|
|
73
|
+
},
|
|
68
74
|
"js": {
|
|
69
75
|
"type": "boolean",
|
|
70
76
|
"description": "Generate JavaScript files rather than TypeScript files",
|
|
@@ -1,2 +1,8 @@
|
|
|
1
1
|
import { Rule } from '@angular-devkit/schematics';
|
|
2
2
|
export declare function toJS(): Rule;
|
|
3
|
+
export declare function updateTsConfigsToJs(options: {
|
|
4
|
+
projectRoot: string;
|
|
5
|
+
}): Rule;
|
|
6
|
+
export declare function maybeJs(options: {
|
|
7
|
+
js: boolean;
|
|
8
|
+
}, path: string): string;
|
package/src/utils/rules/to-js.js
CHANGED
|
@@ -1,22 +1,77 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.toJS = void 0;
|
|
3
|
+
exports.maybeJs = exports.updateTsConfigsToJs = exports.toJS = void 0;
|
|
4
4
|
const typescript_1 = require("typescript");
|
|
5
5
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
6
6
|
const core_1 = require("@angular-devkit/core");
|
|
7
|
+
const ast_utils_1 = require("../ast-utils");
|
|
7
8
|
function toJS() {
|
|
8
|
-
return schematics_1.
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
9
|
+
return schematics_1.chain([
|
|
10
|
+
schematics_1.forEach(schematics_1.when((path) => path.endsWith('.ts') || path.endsWith('.tsx'), (entry) => {
|
|
11
|
+
const original = entry.content.toString('utf-8');
|
|
12
|
+
const result = typescript_1.transpile(original, {
|
|
13
|
+
allowJs: true,
|
|
14
|
+
jsx: typescript_1.JsxEmit.Preserve,
|
|
15
|
+
target: typescript_1.ScriptTarget.ESNext,
|
|
16
|
+
});
|
|
17
|
+
return {
|
|
18
|
+
content: Buffer.from(result, 'utf-8'),
|
|
19
|
+
path: core_1.normalize(entry.path.replace(/\.tsx?$/, '.js')),
|
|
20
|
+
};
|
|
21
|
+
})),
|
|
22
|
+
]);
|
|
20
23
|
}
|
|
21
24
|
exports.toJS = toJS;
|
|
25
|
+
function updateTsConfigsToJs(options) {
|
|
26
|
+
const paths = {
|
|
27
|
+
tsConfig: core_1.normalize(`${options.projectRoot}/tsconfig.json`),
|
|
28
|
+
tsConfigLib: core_1.normalize(`${options.projectRoot}/tsconfig.lib.json`),
|
|
29
|
+
tsConfigApp: core_1.normalize(`${options.projectRoot}/tsconfig.app.json`),
|
|
30
|
+
};
|
|
31
|
+
const getProjectType = (tree) => {
|
|
32
|
+
if (tree.exists(paths.tsConfigApp)) {
|
|
33
|
+
return 'application';
|
|
34
|
+
}
|
|
35
|
+
if (tree.exists(paths.tsConfigLib)) {
|
|
36
|
+
return 'library';
|
|
37
|
+
}
|
|
38
|
+
throw new schematics_1.SchematicsException(`project is missing tsconfig.lib.json or tsconfig.app.json`);
|
|
39
|
+
};
|
|
40
|
+
const getConfigFileForUpdate = (tree) => {
|
|
41
|
+
const projectType = getProjectType(tree);
|
|
42
|
+
if (projectType === 'library') {
|
|
43
|
+
return paths.tsConfigLib;
|
|
44
|
+
}
|
|
45
|
+
if (projectType === 'application') {
|
|
46
|
+
return paths.tsConfigApp;
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
return schematics_1.chain([
|
|
50
|
+
ast_utils_1.updateJsonInTree(paths.tsConfig, (json) => {
|
|
51
|
+
if (json.compilerOptions) {
|
|
52
|
+
json.compilerOptions.allowJs = true;
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
json.compilerOptions = { allowJs: true };
|
|
56
|
+
}
|
|
57
|
+
return json;
|
|
58
|
+
}),
|
|
59
|
+
(tree) => {
|
|
60
|
+
const updateConfigPath = getConfigFileForUpdate(tree);
|
|
61
|
+
return ast_utils_1.updateJsonInTree(updateConfigPath, (json) => {
|
|
62
|
+
json.include = uniq([...json.include, '**/*.js']);
|
|
63
|
+
json.exclude = uniq([...json.exclude, '**/*.spec.js']);
|
|
64
|
+
return json;
|
|
65
|
+
});
|
|
66
|
+
},
|
|
67
|
+
]);
|
|
68
|
+
}
|
|
69
|
+
exports.updateTsConfigsToJs = updateTsConfigsToJs;
|
|
70
|
+
const uniq = (value) => [...new Set(value)];
|
|
71
|
+
function maybeJs(options, path) {
|
|
72
|
+
return options.js && (path.endsWith('.ts') || path.endsWith('.tsx'))
|
|
73
|
+
? path.replace(/\.tsx?$/, '.js')
|
|
74
|
+
: path;
|
|
75
|
+
}
|
|
76
|
+
exports.maybeJs = maybeJs;
|
|
22
77
|
//# sourceMappingURL=to-js.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"to-js.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utils/rules/to-js.ts"],"names":[],"mappings":";;;AAAA,2CAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"to-js.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utils/rules/to-js.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '10.4.
|
|
4
|
+
exports.nxVersion = '10.4.4';
|
|
5
5
|
exports.angularCliVersion = '~10.1.3';
|
|
6
6
|
exports.typescriptVersion = '~4.0.3';
|
|
7
7
|
exports.prettierVersion = '2.1.2';
|