@nrwl/workspace 10.1.0-beta.2 → 10.1.0
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/builders/run-commands/run-commands.impl.d.ts +1 -0
- package/src/builders/run-commands/run-commands.impl.js +4 -2
- package/src/builders/run-commands/run-commands.impl.js.map +1 -1
- package/src/command-line/format.js +7 -24
- package/src/command-line/format.js.map +1 -1
- package/src/command-line/nx-commands.js +1 -1
- package/src/core/affected-project-graph/locators/workspace-projects.js +5 -4
- package/src/core/affected-project-graph/locators/workspace-projects.js.map +1 -1
- package/src/core/file-utils.js +3 -3
- package/src/core/file-utils.js.map +1 -1
- package/src/core/hasher/file-hasher.d.ts +1 -1
- package/src/core/hasher/file-hasher.js +7 -3
- package/src/core/hasher/file-hasher.js.map +1 -1
- package/src/schematics/library/library.js +8 -1
- package/src/schematics/library/library.js.map +1 -1
- package/src/schematics/library/schema.json +5 -0
- package/src/utils/name-utils.js +1 -0
- package/src/utils/name-utils.js.map +1 -1
- package/src/utils/versions.js +1 -1
- package/tsconfig.lib.json +0 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/workspace",
|
|
3
|
-
"version": "10.1.0
|
|
3
|
+
"version": "10.1.0",
|
|
4
4
|
"description": "Extensible Dev Tools for Monorepos",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -67,7 +67,7 @@
|
|
|
67
67
|
"yargs-parser": "10.0.0",
|
|
68
68
|
"yargs": "^11.0.0",
|
|
69
69
|
"chalk": "2.4.2",
|
|
70
|
-
"@nrwl/cli": "10.1.0
|
|
70
|
+
"@nrwl/cli": "10.1.0",
|
|
71
71
|
"axios": "0.19.2"
|
|
72
72
|
}
|
|
73
73
|
}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.LARGE_BUFFER = void 0;
|
|
3
4
|
const tslib_1 = require("tslib");
|
|
4
5
|
const architect_1 = require("@angular-devkit/architect");
|
|
5
6
|
const child_process_1 = require("child_process");
|
|
6
7
|
const rxjs_1 = require("rxjs");
|
|
7
|
-
|
|
8
|
+
exports.LARGE_BUFFER = 1024 * 1000000;
|
|
8
9
|
function loadEnvVars(path) {
|
|
9
10
|
if (path) {
|
|
10
11
|
const result = require('dotenv').config({ path });
|
|
@@ -107,7 +108,7 @@ function runSerially(options) {
|
|
|
107
108
|
function createProcess(command, readyWhen, color, cwd) {
|
|
108
109
|
return new Promise((res) => {
|
|
109
110
|
const childProcess = child_process_1.exec(command, {
|
|
110
|
-
maxBuffer:
|
|
111
|
+
maxBuffer: exports.LARGE_BUFFER,
|
|
111
112
|
env: processEnv(color),
|
|
112
113
|
cwd,
|
|
113
114
|
});
|
|
@@ -138,6 +139,7 @@ function createSyncProcess(command, color, cwd) {
|
|
|
138
139
|
child_process_1.execSync(command, {
|
|
139
140
|
env: processEnv(color),
|
|
140
141
|
stdio: [0, 1, 2],
|
|
142
|
+
maxBuffer: exports.LARGE_BUFFER,
|
|
141
143
|
cwd,
|
|
142
144
|
});
|
|
143
145
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-commands.impl.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/builders/run-commands/run-commands.impl.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-commands.impl.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/builders/run-commands/run-commands.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@ const path = require("path");
|
|
|
6
6
|
const resolve = require("resolve");
|
|
7
7
|
const shared_1 = require("./shared");
|
|
8
8
|
const fileutils_1 = require("../utils/fileutils");
|
|
9
|
-
const output_1 = require("../utils/output");
|
|
10
9
|
const project_graph_1 = require("../core/project-graph");
|
|
11
10
|
const affected_project_graph_1 = require("../core/affected-project-graph");
|
|
12
11
|
const file_utils_1 = require("../core/file-utils");
|
|
@@ -24,23 +23,10 @@ const PRETTIER_EXTENSIONS = [
|
|
|
24
23
|
'md',
|
|
25
24
|
'mdx',
|
|
26
25
|
];
|
|
26
|
+
const MATCH_ALL_PATTERN = `**/*.{${PRETTIER_EXTENSIONS.join(',')}}`;
|
|
27
27
|
function format(command, args) {
|
|
28
|
-
let patterns;
|
|
29
28
|
const { nxArgs } = utils_1.splitArgsIntoNxArgsAndOverrides(args, 'affected');
|
|
30
|
-
|
|
31
|
-
patterns = getPatterns(Object.assign(Object.assign({}, args), nxArgs));
|
|
32
|
-
}
|
|
33
|
-
catch (e) {
|
|
34
|
-
output_1.output.error({
|
|
35
|
-
title: e.message,
|
|
36
|
-
bodyLines: [
|
|
37
|
-
`Pass the SHA range: ${output_1.output.bold(`npm run format:${command} -- --base=SHA1 --head=SHA2`)}`,
|
|
38
|
-
'',
|
|
39
|
-
`Or pass the list of files: ${output_1.output.bold(`npm run format:${command} -- --files="libs/mylib/index.ts,libs/mylib2/index.ts"`)}`,
|
|
40
|
-
],
|
|
41
|
-
});
|
|
42
|
-
process.exit(1);
|
|
43
|
-
}
|
|
29
|
+
const patterns = getPatterns(Object.assign(Object.assign({}, args), nxArgs)).map((p) => `"${p}"`);
|
|
44
30
|
// Chunkify the patterns array to prevent crashing the windows terminal
|
|
45
31
|
const chunkList = chunkify(patterns, 50);
|
|
46
32
|
switch (command) {
|
|
@@ -54,29 +40,26 @@ function format(command, args) {
|
|
|
54
40
|
}
|
|
55
41
|
exports.format = format;
|
|
56
42
|
function getPatterns(args) {
|
|
57
|
-
const allFilesPattern = [
|
|
43
|
+
const allFilesPattern = [MATCH_ALL_PATTERN];
|
|
58
44
|
try {
|
|
59
45
|
if (args.all) {
|
|
60
46
|
return allFilesPattern;
|
|
61
47
|
}
|
|
62
48
|
const p = shared_1.parseFiles(args);
|
|
63
|
-
|
|
49
|
+
const patterns = p.files
|
|
64
50
|
.filter((f) => fileutils_1.fileExists(f))
|
|
65
51
|
.filter((f) => PRETTIER_EXTENSIONS.map((ext) => '.' + ext).includes(path.extname(f)));
|
|
66
|
-
|
|
67
|
-
return libsAndApp
|
|
68
|
-
? getPatternsFromApps(patterns)
|
|
69
|
-
: patterns.map((f) => `"${f}"`);
|
|
52
|
+
return args.libsAndApps ? getPatternsFromApps(patterns) : patterns;
|
|
70
53
|
}
|
|
71
54
|
catch (e) {
|
|
72
55
|
return allFilesPattern;
|
|
73
56
|
}
|
|
74
57
|
}
|
|
75
58
|
function getPatternsFromApps(affectedFiles) {
|
|
76
|
-
const graph = project_graph_1.createProjectGraph();
|
|
59
|
+
const graph = project_graph_1.onlyWorkspaceProjects(project_graph_1.createProjectGraph());
|
|
77
60
|
const affectedGraph = affected_project_graph_1.filterAffected(graph, file_utils_1.calculateFileChanges(affectedFiles));
|
|
78
61
|
const roots = shared_1.getProjectRoots(Object.keys(affectedGraph.nodes));
|
|
79
|
-
return roots.map((root) =>
|
|
62
|
+
return roots.map((root) => `${root}/${MATCH_ALL_PATTERN}`);
|
|
80
63
|
}
|
|
81
64
|
function chunkify(target, size) {
|
|
82
65
|
return target.reduce((current, value, index) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/format.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,6BAA6B;AAC7B,mCAAmC;AACnC,qCAAuD;AACvD,kDAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/format.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,7 +84,7 @@ exports.commandsObject = yargs
|
|
|
84
84
|
.version(versions_1.nxVersion)
|
|
85
85
|
.option('quiet', { type: 'boolean', hidden: true });
|
|
86
86
|
function withFormatOptions(yargs) {
|
|
87
|
-
return withAffectedOptions(yargs).option('
|
|
87
|
+
return withAffectedOptions(yargs).option('libs-and-apps', {
|
|
88
88
|
type: 'boolean',
|
|
89
89
|
});
|
|
90
90
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getImplicitlyTouchedProjects = exports.getTouchedProjects = void 0;
|
|
4
|
+
const minimatch = require("minimatch");
|
|
4
5
|
exports.getTouchedProjects = (touchedFiles, workspaceJson) => {
|
|
5
6
|
// sort project names with the most nested first,
|
|
6
7
|
// e.g. ['libs/a/b/c', 'libs/a/b', 'libs/a']
|
|
@@ -21,17 +22,17 @@ exports.getImplicitlyTouchedProjects = (fileChanges, workspaceJson, nxJson) => {
|
|
|
21
22
|
if (!nxJson.implicitDependencies) {
|
|
22
23
|
return [];
|
|
23
24
|
}
|
|
24
|
-
const touched =
|
|
25
|
+
const touched = new Set();
|
|
25
26
|
for (const [filePath, projects] of Object.entries(nxJson.implicitDependencies)) {
|
|
26
|
-
const implicitDependencyWasChanged = fileChanges.some((f) => f.file
|
|
27
|
+
const implicitDependencyWasChanged = fileChanges.some((f) => minimatch(f.file, filePath));
|
|
27
28
|
if (!implicitDependencyWasChanged) {
|
|
28
29
|
continue;
|
|
29
30
|
}
|
|
30
31
|
// File change affects all projects, just return all projects.
|
|
31
32
|
if (Array.isArray(projects)) {
|
|
32
|
-
touched.
|
|
33
|
+
projects.forEach((project) => touched.add(project));
|
|
33
34
|
}
|
|
34
35
|
}
|
|
35
|
-
return touched;
|
|
36
|
+
return Array.from(touched);
|
|
36
37
|
};
|
|
37
38
|
//# sourceMappingURL=workspace-projects.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/affected-project-graph/locators/workspace-projects.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/affected-project-graph/locators/workspace-projects.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AAG1B,QAAA,kBAAkB,GAA0B,CACvD,YAAY,EACZ,aAAa,EACH,EAAE;IACZ,iDAAiD;IACjD,4CAA4C;IAC5C,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC;SACxD,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAM,EAAE,EAAE,CAC3C,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACzC;SACA,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAEzB,OAAO,YAAY;SAChB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;YACvC,MAAM,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC9C,MAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC;YACjE,OAAO,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC,CAAC;AAEW,QAAA,4BAA4B,GAA0B,CACjE,WAAW,EACX,aAAa,EACb,MAAM,EACI,EAAE;IACZ,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE;QAChC,OAAO,EAAE,CAAC;KACX;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAElC,KAAK,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAC/C,MAAM,CAAC,oBAAoB,CAC5B,EAAE;QACD,MAAM,4BAA4B,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1D,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAC5B,CAAC;QACF,IAAI,CAAC,4BAA4B,EAAE;YACjC,SAAS;SACV;QAED,8DAA8D;QAC9D,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC3B,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;SACrD;KACF;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC"}
|
package/src/core/file-utils.js
CHANGED
|
@@ -179,11 +179,11 @@ function rootWorkspaceFileData() {
|
|
|
179
179
|
}
|
|
180
180
|
exports.rootWorkspaceFileData = rootWorkspaceFileData;
|
|
181
181
|
function readWorkspaceFiles() {
|
|
182
|
-
const workspaceJson = readWorkspaceJson();
|
|
183
182
|
perf_hooks_1.performance.mark('read workspace files:start');
|
|
184
183
|
if (file_hasher_1.defaultFileHasher.usesGitForHashing) {
|
|
185
|
-
const
|
|
186
|
-
|
|
184
|
+
const ignoredGlobs = getIgnoredGlobs();
|
|
185
|
+
const r = file_hasher_1.defaultFileHasher.workspaceFiles
|
|
186
|
+
.filter((f) => !ignoredGlobs.ignores(f))
|
|
187
187
|
.map((f) => getFileData(`${app_root_1.appRootPath}/${f}`));
|
|
188
188
|
perf_hooks_1.performance.mark('read workspace files:end');
|
|
189
189
|
perf_hooks_1.performance.measure('read workspace files', 'read workspace files:start', 'read workspace files:end');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/file-utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"file-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/file-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,11 +5,11 @@ export declare class FileHasher {
|
|
|
5
5
|
fileHashes: {
|
|
6
6
|
[path: string]: string;
|
|
7
7
|
};
|
|
8
|
+
workspaceFiles: any[];
|
|
8
9
|
usesGitForHashing: boolean;
|
|
9
10
|
constructor(hashing: HashingImp);
|
|
10
11
|
init(): void;
|
|
11
12
|
hashFile(path: string, transformer?: (x: string) => string | null): string;
|
|
12
|
-
allFiles(): string[];
|
|
13
13
|
private getHashesFromGit;
|
|
14
14
|
private processPath;
|
|
15
15
|
}
|
|
@@ -20,12 +20,14 @@ class FileHasher {
|
|
|
20
20
|
constructor(hashing) {
|
|
21
21
|
this.hashing = hashing;
|
|
22
22
|
this.fileHashes = {};
|
|
23
|
+
this.workspaceFiles = [];
|
|
23
24
|
this.usesGitForHashing = false;
|
|
24
25
|
this.init();
|
|
25
26
|
}
|
|
26
27
|
init() {
|
|
27
28
|
perf_hooks_1.performance.mark('init hashing:start');
|
|
28
29
|
this.fileHashes = {};
|
|
30
|
+
this.workspaceFiles = [];
|
|
29
31
|
this.getHashesFromGit();
|
|
30
32
|
this.usesGitForHashing = Object.keys(this.fileHashes).length > 0;
|
|
31
33
|
perf_hooks_1.performance.mark('init hashing:end');
|
|
@@ -40,13 +42,15 @@ class FileHasher {
|
|
|
40
42
|
}
|
|
41
43
|
return this.fileHashes[relativePath];
|
|
42
44
|
}
|
|
43
|
-
allFiles() {
|
|
44
|
-
return Object.keys(this.fileHashes);
|
|
45
|
-
}
|
|
46
45
|
getHashesFromGit() {
|
|
47
46
|
const sliceIndex = app_root_1.appRootPath.length + 1;
|
|
48
47
|
git_hasher_1.getFileHashes(app_root_1.appRootPath).forEach((hash, filename) => {
|
|
49
48
|
this.fileHashes[filename.substr(sliceIndex)] = hash;
|
|
49
|
+
/**
|
|
50
|
+
* we have to store it separately because fileHashes can be modified
|
|
51
|
+
* later on and can contain files that do not exist in the workspace
|
|
52
|
+
*/
|
|
53
|
+
this.workspaceFiles.push(filename.substr(sliceIndex));
|
|
50
54
|
});
|
|
51
55
|
}
|
|
52
56
|
processPath(pathAndTransformer) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/file-hasher.ts"],"names":[],"mappings":";;;AAAA,6CAA6C;AAC7C,2BAAkC;AAClC,iDAA4D;AAC5D,mDAAmD;AACnD,2CAAyC;AAOzC,SAAgB,qBAAqB,CAAC,OAAe;IACnD,IAAI;QACF,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC9B,OAAO,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;KAChC;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAPD,sDAOC;AAED,MAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/file-hasher.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const workspace_5 = require("@nrwl/workspace");
|
|
|
10
10
|
const lint_1 = require("../../utils/lint");
|
|
11
11
|
const ast_utils_1 = require("../../utils/ast-utils");
|
|
12
12
|
const file_utils_1 = require("../../core/file-utils");
|
|
13
|
+
const to_js_1 = require("../../utils/rules/to-js");
|
|
13
14
|
function addProject(options) {
|
|
14
15
|
return workspace_1.updateWorkspaceInTree((json) => {
|
|
15
16
|
const architect = {};
|
|
@@ -33,7 +34,7 @@ function updateTsConfig(options) {
|
|
|
33
34
|
throw new schematics_1.SchematicsException(`You already have a library using the import path "${options.importPath}". Make sure to specify a unique one.`);
|
|
34
35
|
}
|
|
35
36
|
c.paths[options.importPath] = [
|
|
36
|
-
`${ast_utils_1.libsDir(host)}/${options.projectDirectory}/src/index.ts
|
|
37
|
+
maybeJs(options, `${ast_utils_1.libsDir(host)}/${options.projectDirectory}/src/index.ts`),
|
|
37
38
|
];
|
|
38
39
|
return json;
|
|
39
40
|
});
|
|
@@ -42,6 +43,7 @@ function createFiles(options) {
|
|
|
42
43
|
return schematics_1.mergeWith(schematics_1.apply(schematics_1.url(`./files/lib`), [
|
|
43
44
|
schematics_1.template(Object.assign(Object.assign(Object.assign({}, options), workspace_3.names(options.name)), { cliCommand: file_utils_1.cliCommand(), tmpl: '', offsetFromRoot: workspace_5.offsetFromRoot(options.projectRoot), hasUnitTestRunner: options.unitTestRunner !== 'none' })),
|
|
44
45
|
schematics_1.move(options.projectRoot),
|
|
46
|
+
options.js ? to_js_1.toJS() : schematics_1.noop(),
|
|
45
47
|
]));
|
|
46
48
|
}
|
|
47
49
|
function updateNxJson(options) {
|
|
@@ -89,4 +91,9 @@ function normalizeOptions(host, options) {
|
|
|
89
91
|
parsedTags,
|
|
90
92
|
importPath });
|
|
91
93
|
}
|
|
94
|
+
function maybeJs(options, path) {
|
|
95
|
+
return options.js && (path.endsWith('.ts') || path.endsWith('.tsx'))
|
|
96
|
+
? path.replace(/\.tsx?$/, '.js')
|
|
97
|
+
: path;
|
|
98
|
+
}
|
|
92
99
|
//# sourceMappingURL=library.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/schematics/library/library.ts"],"names":[],"mappings":";;AAAA,2DAaoC;AACpC,+CAAuD;AAGvD,+
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/schematics/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,6 +59,11 @@
|
|
|
59
59
|
"importPath": {
|
|
60
60
|
"type": "string",
|
|
61
61
|
"description": "The library name used to import it, like @myorg/my-awesome-lib"
|
|
62
|
+
},
|
|
63
|
+
"js": {
|
|
64
|
+
"type": "boolean",
|
|
65
|
+
"description": "Generate JavaScript files rather than TypeScript files",
|
|
66
|
+
"default": false
|
|
62
67
|
}
|
|
63
68
|
},
|
|
64
69
|
"required": ["name"]
|
package/src/utils/name-utils.js
CHANGED
|
@@ -27,6 +27,7 @@ exports.toClassName = toClassName;
|
|
|
27
27
|
function toPropertyName(s) {
|
|
28
28
|
return s
|
|
29
29
|
.replace(/(-|_|\.|\s)+(.)?/g, (_, __, chr) => chr ? chr.toUpperCase() : '')
|
|
30
|
+
.replace(/[^a-zA-Z\d]/g, '')
|
|
30
31
|
.replace(/^([A-Z])/, (m) => m.toLowerCase());
|
|
31
32
|
}
|
|
32
33
|
exports.toPropertyName = toPropertyName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"name-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/name-utils.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAE7B;;GAEG;AACH,SAAgB,KAAK,CACnB,IAAY;IAOZ,OAAO;QACL,IAAI;QACJ,SAAS,EAAE,WAAW,CAAC,IAAI,CAAC;QAC5B,YAAY,EAAE,cAAc,CAAC,IAAI,CAAC;QAClC,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC;KAC3B,CAAC;AACJ,CAAC;AAdD,sBAcC;AAED;;GAEG;AACH,SAAgB,WAAW,CAAC,GAAW;IACrC,OAAO,aAAa,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;AAC5C,CAAC;AAFD,kCAEC;AAED;;GAEG;AACH,SAAgB,cAAc,CAAC,CAAS;IACtC,OAAO,CAAC;SACL,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,CAC3C,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAC7B;SACA,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;AACjD,CAAC;
|
|
1
|
+
{"version":3,"file":"name-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/name-utils.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAE7B;;GAEG;AACH,SAAgB,KAAK,CACnB,IAAY;IAOZ,OAAO;QACL,IAAI;QACJ,SAAS,EAAE,WAAW,CAAC,IAAI,CAAC;QAC5B,YAAY,EAAE,cAAc,CAAC,IAAI,CAAC;QAClC,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC;KAC3B,CAAC;AACJ,CAAC;AAdD,sBAcC;AAED;;GAEG;AACH,SAAgB,WAAW,CAAC,GAAW;IACrC,OAAO,aAAa,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;AAC5C,CAAC;AAFD,kCAEC;AAED;;GAEG;AACH,SAAgB,cAAc,CAAC,CAAS;IACtC,OAAO,CAAC;SACL,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,CAC3C,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAC7B;SACA,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;SAC3B,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;AACjD,CAAC;AAPD,wCAOC;AAED;;GAEG;AACH,SAAgB,UAAU,CAAC,CAAS;IAClC,OAAO,CAAC;SACL,OAAO,CAAC,mBAAmB,EAAE,OAAO,CAAC;SACrC,WAAW,EAAE;SACb,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;AAC3B,CAAC;AALD,gCAKC;AAED,SAAS,aAAa,CAAC,CAAS;IAC9B,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AACjD,CAAC;AAED;;;GAGG;AACH,SAAgB,gBAAgB,CAAC,UAAU;IACzC,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAClC,CAAC;AAFD,4CAEC"}
|
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.1.0
|
|
4
|
+
exports.nxVersion = '10.1.0';
|
|
5
5
|
exports.angularCliVersion = '~10.0.0';
|
|
6
6
|
exports.typescriptVersion = '~3.9.3';
|
|
7
7
|
exports.prettierVersion = '2.0.4';
|