@nrwl/workspace 13.0.1 → 13.1.2
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 +5 -5
- package/src/core/dep-graph/main.es5.js +1 -1
- package/src/core/dep-graph/main.esm.js +1 -1
- package/src/core/dep-graph/polyfills.es5.js +1 -1
- package/src/core/dep-graph/polyfills.esm.js +1 -1
- package/src/core/hasher/spawn-process.js +6 -1
- package/src/core/hasher/spawn-process.js.map +1 -1
- package/src/core/project-graph/daemon/client/client.js +2 -0
- package/src/core/project-graph/daemon/client/client.js.map +1 -1
- package/src/generators/library/library.js +1 -1
- package/src/generators/library/library.js.map +1 -1
- package/src/utilities/typescript/compilation.d.ts +2 -1
- package/src/utilities/typescript/compilation.js +48 -5
- package/src/utilities/typescript/compilation.js.map +1 -1
- package/src/utils/versions.js +1 -1
|
@@ -12,7 +12,7 @@ function compileTypeScript(options) {
|
|
|
12
12
|
if (normalizedOptions.deleteOutputPath) {
|
|
13
13
|
fs_extra_1.removeSync(normalizedOptions.outputPath);
|
|
14
14
|
}
|
|
15
|
-
return createProgram(tsConfig, normalizedOptions
|
|
15
|
+
return createProgram(tsConfig, normalizedOptions);
|
|
16
16
|
}
|
|
17
17
|
exports.compileTypeScript = compileTypeScript;
|
|
18
18
|
function compileTypeScriptWatcher(options, callback) {
|
|
@@ -22,15 +22,58 @@ function compileTypeScriptWatcher(options, callback) {
|
|
|
22
22
|
fs_extra_1.removeSync(normalizedOptions.outputPath);
|
|
23
23
|
}
|
|
24
24
|
const host = ts.createWatchCompilerHost(tsConfig.fileNames, tsConfig.options, ts.sys);
|
|
25
|
-
const
|
|
25
|
+
const originalAfterProgramCreate = host.afterProgramCreate;
|
|
26
|
+
host.afterProgramCreate = (builderProgram) => {
|
|
27
|
+
const originalProgramEmit = builderProgram.emit;
|
|
28
|
+
builderProgram.emit = (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) => {
|
|
29
|
+
var _a;
|
|
30
|
+
const consumerCustomTransfomers = (_a = options.getCustomTransformers) === null || _a === void 0 ? void 0 : _a.call(options, builderProgram.getProgram());
|
|
31
|
+
const mergedCustomTransformers = mergeCustomTransformers(customTransformers, consumerCustomTransfomers);
|
|
32
|
+
return originalProgramEmit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, mergedCustomTransformers);
|
|
33
|
+
};
|
|
34
|
+
if (originalAfterProgramCreate)
|
|
35
|
+
originalAfterProgramCreate(builderProgram);
|
|
36
|
+
};
|
|
37
|
+
const originalOnWatchStatusChange = host.onWatchStatusChange;
|
|
26
38
|
host.onWatchStatusChange = (a, b, c, d) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
27
|
-
|
|
39
|
+
originalOnWatchStatusChange === null || originalOnWatchStatusChange === void 0 ? void 0 : originalOnWatchStatusChange(a, b, c, d);
|
|
28
40
|
yield (callback === null || callback === void 0 ? void 0 : callback(a, b, c, d));
|
|
29
41
|
});
|
|
30
42
|
ts.createWatchProgram(host);
|
|
31
43
|
return new Promise(() => { });
|
|
32
44
|
}
|
|
33
45
|
exports.compileTypeScriptWatcher = compileTypeScriptWatcher;
|
|
46
|
+
function mergeCustomTransformers(originalCustomTransfomers, consumerCustomTransformers) {
|
|
47
|
+
if (!consumerCustomTransformers)
|
|
48
|
+
return originalCustomTransfomers;
|
|
49
|
+
const mergedCustomTransformers = {};
|
|
50
|
+
if (consumerCustomTransformers.before) {
|
|
51
|
+
mergedCustomTransformers.before = (originalCustomTransfomers === null || originalCustomTransfomers === void 0 ? void 0 : originalCustomTransfomers.before)
|
|
52
|
+
? [
|
|
53
|
+
...originalCustomTransfomers.before,
|
|
54
|
+
...consumerCustomTransformers.before,
|
|
55
|
+
]
|
|
56
|
+
: consumerCustomTransformers.before;
|
|
57
|
+
}
|
|
58
|
+
if (consumerCustomTransformers.after) {
|
|
59
|
+
mergedCustomTransformers.after = (originalCustomTransfomers === null || originalCustomTransfomers === void 0 ? void 0 : originalCustomTransfomers.after)
|
|
60
|
+
? [
|
|
61
|
+
...originalCustomTransfomers.after,
|
|
62
|
+
...consumerCustomTransformers.after,
|
|
63
|
+
]
|
|
64
|
+
: consumerCustomTransformers.after;
|
|
65
|
+
}
|
|
66
|
+
if (consumerCustomTransformers.afterDeclarations) {
|
|
67
|
+
mergedCustomTransformers.afterDeclarations =
|
|
68
|
+
(originalCustomTransfomers === null || originalCustomTransfomers === void 0 ? void 0 : originalCustomTransfomers.afterDeclarations)
|
|
69
|
+
? [
|
|
70
|
+
...originalCustomTransfomers.afterDeclarations,
|
|
71
|
+
...consumerCustomTransformers.afterDeclarations,
|
|
72
|
+
]
|
|
73
|
+
: consumerCustomTransformers.afterDeclarations;
|
|
74
|
+
}
|
|
75
|
+
return mergedCustomTransformers;
|
|
76
|
+
}
|
|
34
77
|
function getNormalizedTsConfig(options) {
|
|
35
78
|
const tsConfig = typescript_1.readTsConfig(options.tsConfig);
|
|
36
79
|
tsConfig.options.outDir = options.outputPath;
|
|
@@ -38,7 +81,7 @@ function getNormalizedTsConfig(options) {
|
|
|
38
81
|
tsConfig.options.rootDir = options.rootDir;
|
|
39
82
|
return tsConfig;
|
|
40
83
|
}
|
|
41
|
-
function createProgram(tsconfig, projectName) {
|
|
84
|
+
function createProgram(tsconfig, { projectName, getCustomTransformers }) {
|
|
42
85
|
const host = ts.createCompilerHost(tsconfig.options);
|
|
43
86
|
const program = ts.createProgram({
|
|
44
87
|
rootNames: tsconfig.fileNames,
|
|
@@ -46,7 +89,7 @@ function createProgram(tsconfig, projectName) {
|
|
|
46
89
|
host,
|
|
47
90
|
});
|
|
48
91
|
devkit_1.logger.info(`Compiling TypeScript files for project "${projectName}"...`);
|
|
49
|
-
const results = program.emit();
|
|
92
|
+
const results = program.emit(undefined, undefined, undefined, undefined, getCustomTransformers === null || getCustomTransformers === void 0 ? void 0 : getCustomTransformers(program));
|
|
50
93
|
if (results.emitSkipped) {
|
|
51
94
|
const diagnostics = ts.formatDiagnosticsWithColorAndContext(results.diagnostics, {
|
|
52
95
|
getCurrentDirectory: () => ts.sys.getCurrentDirectory(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compilation.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/compilation.ts"],"names":[],"mappings":";;;;AAAA,yCAAsC;AACtC,uCAAsC;AACtC,iCAAiC;AAEjC,8CAA6C;
|
|
1
|
+
{"version":3,"file":"compilation.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/compilation.ts"],"names":[],"mappings":";;;;AAAA,yCAAsC;AACtC,uCAAsC;AACtC,iCAAiC;AAEjC,8CAA6C;AAoB7C,SAAgB,iBAAiB,CAAC,OAAqC;IAGrE,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACpD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;IAE1D,IAAI,iBAAiB,CAAC,gBAAgB,EAAE;QACtC,qBAAU,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;KAC1C;IAED,OAAO,aAAa,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;AACpD,CAAC;AAXD,8CAWC;AAED,SAAgB,wBAAwB,CACtC,OAAqC,EACrC,QAKyB;IAEzB,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACpD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;IAE1D,IAAI,iBAAiB,CAAC,gBAAgB,EAAE;QACtC,qBAAU,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;KAC1C;IAED,MAAM,IAAI,GAAG,EAAE,CAAC,uBAAuB,CACrC,QAAQ,CAAC,SAAS,EAClB,QAAQ,CAAC,OAAO,EAChB,EAAE,CAAC,GAAG,CACP,CAAC;IAEF,MAAM,0BAA0B,GAAG,IAAI,CAAC,kBAAkB,CAAC;IAC3D,IAAI,CAAC,kBAAkB,GAAG,CAAC,cAAc,EAAE,EAAE;QAC3C,MAAM,mBAAmB,GAAG,cAAc,CAAC,IAAI,CAAC;QAChD,cAAc,CAAC,IAAI,GAAG,CACpB,gBAAgB,EAChB,SAAS,EACT,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,EAAE;;YACF,MAAM,yBAAyB,GAAG,MAAA,OAAO,CAAC,qBAAqB,+CAA7B,OAAO,EACvC,cAAc,CAAC,UAAU,EAAE,CAC5B,CAAC;YAEF,MAAM,wBAAwB,GAAG,uBAAuB,CACtD,kBAAkB,EAClB,yBAAyB,CAC1B,CAAC;YAEF,OAAO,mBAAmB,CACxB,gBAAgB,EAChB,SAAS,EACT,iBAAiB,EACjB,gBAAgB,EAChB,wBAAwB,CACzB,CAAC;QACJ,CAAC,CAAC;QAEF,IAAI,0BAA0B;YAAE,0BAA0B,CAAC,cAAc,CAAC,CAAC;IAC7E,CAAC,CAAC;IAEF,MAAM,2BAA2B,GAAG,IAAI,CAAC,mBAAmB,CAAC;IAC7D,IAAI,CAAC,mBAAmB,GAAG,CAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;QAC9C,2BAA2B,aAA3B,2BAA2B,uBAA3B,2BAA2B,CAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1C,MAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA,CAAC;IAC/B,CAAC,CAAA,CAAC;IAEF,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAC5B,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;AAC/B,CAAC;AA7DD,4DA6DC;AAED,SAAS,uBAAuB,CAC9B,yBAAyD,EACzD,0BAA0D;IAE1D,IAAI,CAAC,0BAA0B;QAAE,OAAO,yBAAyB,CAAC;IAElE,MAAM,wBAAwB,GAAuB,EAAE,CAAC;IACxD,IAAI,0BAA0B,CAAC,MAAM,EAAE;QACrC,wBAAwB,CAAC,MAAM,GAAG,CAAA,yBAAyB,aAAzB,yBAAyB,uBAAzB,yBAAyB,CAAE,MAAM;YACjE,CAAC,CAAC;gBACE,GAAG,yBAAyB,CAAC,MAAM;gBACnC,GAAG,0BAA0B,CAAC,MAAM;aACrC;YACH,CAAC,CAAC,0BAA0B,CAAC,MAAM,CAAC;KACvC;IAED,IAAI,0BAA0B,CAAC,KAAK,EAAE;QACpC,wBAAwB,CAAC,KAAK,GAAG,CAAA,yBAAyB,aAAzB,yBAAyB,uBAAzB,yBAAyB,CAAE,KAAK;YAC/D,CAAC,CAAC;gBACE,GAAG,yBAAyB,CAAC,KAAK;gBAClC,GAAG,0BAA0B,CAAC,KAAK;aACpC;YACH,CAAC,CAAC,0BAA0B,CAAC,KAAK,CAAC;KACtC;IAED,IAAI,0BAA0B,CAAC,iBAAiB,EAAE;QAChD,wBAAwB,CAAC,iBAAiB;YACxC,CAAA,yBAAyB,aAAzB,yBAAyB,uBAAzB,yBAAyB,CAAE,iBAAiB;gBAC1C,CAAC,CAAC;oBACE,GAAG,yBAAyB,CAAC,iBAAiB;oBAC9C,GAAG,0BAA0B,CAAC,iBAAiB;iBAChD;gBACH,CAAC,CAAC,0BAA0B,CAAC,iBAAiB,CAAC;KACpD;IAED,OAAO,wBAAwB,CAAC;AAClC,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAqC;IAClE,MAAM,QAAQ,GAAG,yBAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAChD,QAAQ,CAAC,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAC7C,QAAQ,CAAC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAC3C,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,aAAa,CACpB,QAA8B,EAC9B,EAAE,WAAW,EAAE,qBAAqB,EAAgC;IAEpE,MAAM,IAAI,GAAG,EAAE,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC;QAC/B,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,IAAI;KACL,CAAC,CAAC;IACH,eAAM,CAAC,IAAI,CAAC,2CAA2C,WAAW,MAAM,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAC1B,SAAS,EACT,SAAS,EACT,SAAS,EACT,SAAS,EACT,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAG,OAAO,CAAC,CACjC,CAAC;IACF,IAAI,OAAO,CAAC,WAAW,EAAE;QACvB,MAAM,WAAW,GAAG,EAAE,CAAC,oCAAoC,CACzD,OAAO,CAAC,WAAW,EACnB;YACE,mBAAmB,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,mBAAmB,EAAE;YACvD,UAAU,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO;YAChC,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI;SACrC,CACF,CAAC;QACF,eAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;KAC9B;SAAM;QACL,eAAM,CAAC,IAAI,CACT,gDAAgD,WAAW,IAAI,CAChE,CAAC;QACF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;KAC1B;AACH,CAAC;AAED,SAAS,gBAAgB,CACvB,OAAqC;;IAErC,uCACK,OAAO,KACV,gBAAgB,EAAE,MAAA,OAAO,CAAC,gBAAgB,mCAAI,IAAI,EAClD,OAAO,EAAE,MAAA,OAAO,CAAC,OAAO,mCAAI,OAAO,CAAC,WAAW,IAC/C;AACJ,CAAC"}
|
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.tslintVersion = exports.typescriptESLintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.
|
|
4
|
+
exports.nxVersion = '13.1.2';
|
|
5
5
|
exports.angularCliVersion = '~12.2.0';
|
|
6
6
|
exports.typescriptVersion = '~4.3.5';
|
|
7
7
|
exports.prettierVersion = '^2.3.1';
|