@angular/build 22.3.0-next.0 → 22.3.0-next.1
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 +3 -3
- package/src/builders/application/chunk-optimizer.js +2 -1
- package/src/builders/application/chunk-optimizer.js.map +1 -1
- package/src/builders/application/options.js +1 -2
- package/src/builders/application/options.js.map +1 -1
- package/src/builders/dev-server/options.js +1 -1
- package/src/builders/dev-server/options.js.map +1 -1
- package/src/builders/dev-server/vite/server.js +1 -1
- package/src/builders/dev-server/vite/server.js.map +1 -1
- package/src/builders/library/builder.js +22 -16
- package/src/builders/library/builder.js.map +1 -1
- package/src/builders/library/options.js +2 -11
- package/src/builders/library/options.js.map +1 -1
- package/src/builders/library/pipeline/assets.d.ts +2 -13
- package/src/builders/library/pipeline/assets.js +4 -43
- package/src/builders/library/pipeline/assets.js.map +1 -1
- package/src/builders/library/pipeline/build-action.d.ts +25 -4
- package/src/builders/library/pipeline/build-action.js +8 -7
- package/src/builders/library/pipeline/build-action.js.map +1 -1
- package/src/builders/library/pipeline/bundler.d.ts +2 -0
- package/src/builders/library/pipeline/bundler.js +74 -16
- package/src/builders/library/pipeline/bundler.js.map +1 -1
- package/src/builders/library/pipeline/entry-points.d.ts +1 -1
- package/src/builders/library/pipeline/entry-points.js +2 -2
- package/src/builders/library/pipeline/entry-points.js.map +1 -1
- package/src/builders/ng-packagr/builder.js +2 -2
- package/src/builders/ng-packagr/builder.js.map +1 -1
- package/src/builders/unit-test/builder.js +1 -1
- package/src/builders/unit-test/builder.js.map +1 -1
- package/src/builders/unit-test/options.js +1 -2
- package/src/builders/unit-test/options.js.map +1 -1
- package/src/utils/load-proxy-config.js +12 -10
- package/src/utils/load-proxy-config.js.map +1 -1
- package/src/utils/load-rolldown.d.ts +27 -0
- package/src/utils/load-rolldown.js +79 -0
- package/src/utils/load-rolldown.js.map +1 -0
- package/src/utils/normalize-cache.d.ts +14 -1
- package/src/utils/normalize-cache.js +18 -4
- package/src/utils/normalize-cache.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@angular/build",
|
|
3
|
-
"version": "22.3.0-next.
|
|
3
|
+
"version": "22.3.0-next.1",
|
|
4
4
|
"description": "Official build system for Angular",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Angular CLI",
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"builders": "builders.json",
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"@ampproject/remapping": "2.3.0",
|
|
26
|
-
"@angular-devkit/architect": "0.2203.0-next.
|
|
26
|
+
"@angular-devkit/architect": "0.2203.0-next.1",
|
|
27
27
|
"@babel/core": "8.0.6",
|
|
28
28
|
"@inquirer/confirm": "6.3.2",
|
|
29
29
|
"@parcel/watcher": "2.6.0",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"@angular/platform-browser": "^22.0.0 || ^22.3.0-next.0",
|
|
63
63
|
"@angular/platform-server": "^22.0.0 || ^22.3.0-next.0",
|
|
64
64
|
"@angular/service-worker": "^22.0.0 || ^22.3.0-next.0",
|
|
65
|
-
"@angular/ssr": "^22.3.0-next.
|
|
65
|
+
"@angular/ssr": "^22.3.0-next.1",
|
|
66
66
|
"istanbul-lib-instrument": "^6.0.0",
|
|
67
67
|
"karma": "^6.4.0",
|
|
68
68
|
"less": "^4.2.0",
|
|
@@ -48,6 +48,7 @@ const node_assert_1 = __importDefault(require("node:assert"));
|
|
|
48
48
|
const bundler_files_1 = require("../../tools/esbuild/bundler-files");
|
|
49
49
|
const environment_options_1 = require("../../utils/environment-options");
|
|
50
50
|
const error_1 = require("../../utils/error");
|
|
51
|
+
const load_rolldown_1 = require("../../utils/load-rolldown");
|
|
51
52
|
const path_1 = require("../../utils/path");
|
|
52
53
|
/**
|
|
53
54
|
* Converts the output of a bundle build into an esbuild-compatible metafile.
|
|
@@ -240,7 +241,7 @@ async function optimizeChunks(original, sourcemap) {
|
|
|
240
241
|
},
|
|
241
242
|
];
|
|
242
243
|
if (environment_options_1.useRolldownChunks) {
|
|
243
|
-
const { rolldown } = await
|
|
244
|
+
const { rolldown } = await (0, load_rolldown_1.loadRolldown)();
|
|
244
245
|
bundle = await rolldown({
|
|
245
246
|
input: mainFile,
|
|
246
247
|
plugins,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chunk-optimizer.js","sourceRoot":"","sources":["chunk-optimizer.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"chunk-optimizer.js","sourceRoot":"","sources":["chunk-optimizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,8 +56,7 @@ async function normalizeOptions(context, projectName, options, extensions) {
|
|
|
56
56
|
const projectMetadata = await context.getProjectMetadata(projectName);
|
|
57
57
|
const { projectRoot, projectSourceRoot } = (0, project_metadata_1.getProjectRootPaths)(workspaceRoot, projectMetadata);
|
|
58
58
|
// Gather persistent caching option and provide a project specific cache location
|
|
59
|
-
const cacheOptions = (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, workspaceRoot);
|
|
60
|
-
cacheOptions.path = node_path_1.default.join(cacheOptions.path, projectName);
|
|
59
|
+
const cacheOptions = (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, workspaceRoot, projectName, context.builder.builderName);
|
|
61
60
|
const i18nOptions = (0, i18n_options_1.createI18nOptions)(projectMetadata, options.localize, context.logger, !!options.ssr);
|
|
62
61
|
i18nOptions.duplicateTranslationBehavior = options.i18nDuplicateTranslation;
|
|
63
62
|
i18nOptions.missingTranslationBehavior = options.i18nMissingTranslation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;AAkKH,4CA2XC;AA0HD,8CA0BC;AA7qBD,+CAA+D;AAC/D,0DAA6B;AAC7B,uCAAiG;AACjG,6CAAiD;AACjD,yEAAuF;AACvF,2DAA0E;AAE1E,iEAAoE;AACpE,2CAAoD;AACpD,6EAI2C;AAC3C,mEAA2F;AAC3F,iEAAoE;AACpE,yCAAoF;AACpF,qCAOkB;AAElB;;;GAGG;AACU,QAAA,cAAc,GAAG,gBAAgB,CAAC;AAE/C;;;GAGG;AACU,QAAA,iBAAiB,GAAG,mBAAmB,CAAC;AA8GrD;;;;;;;;;;GAUG;AACH,kDAAkD;AAC3C,KAAK,UAAU,gBAAgB,CACpC,OAAuB,EACvB,WAAmB,EACnB,OAA0C,EAC1C,UAAyC;IAEzC,iEAAiE;IACjE,MAAM,gBAAgB,GACpB,OAAO,CAAC,gBAAgB,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC;IAE/E,mEAAmE;IACnE,MAAM,aAAa,GAAG,IAAA,uBAAgB,EAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IACtE,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,IAAA,sCAAmB,EAAC,aAAa,EAAE,eAAe,CAAC,CAAC;IAE/F,iFAAiF;IACjF,MAAM,YAAY,GAAG,IAAA,uCAAqB,EACxC,eAAe,EACf,aAAa,EACb,WAAW,EACX,OAAO,CAAC,OAAO,CAAC,WAAW,CAC5B,CAAC;IAEF,MAAM,WAAW,GAGb,IAAA,gCAAiB,EAAC,eAAe,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACxF,WAAW,CAAC,4BAA4B,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAC5E,WAAW,CAAC,0BAA0B,GAAG,OAAO,CAAC,sBAAsB,CAAC;IACxE,IAAI,OAAO,CAAC,mBAAmB,EAAE,CAAC;QAChC,WAAW,CAAC,UAAU,GAAG,IAAI,CAAC;IAChC,CAAC;IAED,MAAM,WAAW,GAAG,oBAAoB,CACtC,aAAa,EACb,iBAAiB,EACjB,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,WAAW,CACpB,CAAC;IACF,MAAM,QAAQ,GAAG,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC5D,MAAM,mBAAmB,GAAG,IAAA,6BAAqB,EAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACxE,MAAM,gBAAgB,GAAG,IAAA,2BAAmB,EAAC,OAAO,CAAC,SAAS,IAAI,KAAK,CAAC,CAAC;IACzE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,MAAM;QACnC,CAAC,CAAC,IAAA,8BAAsB,EAAC,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,iBAAiB,CAAC;QACvF,CAAC,CAAC,SAAS,CAAC;IAEd,IAAI,gBAAoD,CAAC;IACzD,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAC7B,KAAK,MAAM,WAAW,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;YACnD,MAAM,eAAe,GAAG,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;YAEnE,IAAI,CAAC;gBACH,MAAM,IAAA,iBAAM,EAAC,eAAe,EAAE,oBAAS,CAAC,IAAI,CAAC,CAAC;YAChD,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,IAAI,KAAK,CAAC,OAAO,eAAe,4CAA4C,CAAC,CAAC;YACtF,CAAC;YAED,gBAAgB,KAAK,EAAE,CAAC;YACxB,gBAAgB,CAAC,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,GAAG,eAAe,CAAC;QACpF,CAAC;IACH,CAAC;IAED,IAAI,gBAC2E,CAAC;IAChF,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAChE,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9D,SAAS;YACX,CAAC;YACD,IACE,KAAK,KAAK,MAAM;gBAChB,KAAK,KAAK,QAAQ;gBAClB,KAAK,KAAK,MAAM;gBAChB,KAAK,KAAK,SAAS;gBACnB,KAAK,KAAK,QAAQ;gBAClB,KAAK,KAAK,OAAO,EACjB,CAAC;gBACD,SAAS;YACX,CAAC;YACD,gBAAgB,KAAK,EAAE,CAAC;YACxB,gBAAgB,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC;QACtC,CAAC;IACH,CAAC;IAED,+DAA+D;IAC/D,IAAI,OAAO,CAAC,UAAU,KAAK,mBAAU,CAAC,MAAM,EAAE,CAAC;QAC7C,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;QAC3F,CAAC;QAED,IAAI,OAAO,OAAO,CAAC,GAAG,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC;YAC5D,MAAM,IAAI,KAAK,CAAC,0EAA0E,CAAC,CAAC;QAC9F,CAAC;IACH,CAAC;IAED,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACvB,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACpB,OAAO,CAAC,GAAG,GAAG,KAAK,CAAC;QACtB,CAAC;QAED,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACpC,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,0EAA0E,CAC3E,CAAC;QACJ,CAAC;QAED,OAAO,CAAC,SAAS,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;QAErC,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YACnC,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,yEAAyE,CAC1E,CAAC;QACJ,CAAC;IACH,CAAC;IAED,kEAAkE;IAClE,MAAM,iBAAiB,GAAG,MAAM,IAAA,iDAAyB,EAAC,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC;IACxF,MAAM,oBAAoB,GAAG,MAAM,IAAA,gDAAwB,EAAC,iBAAiB,CAAC,CAAC;IAC/E,uDAAuD;IACvD,MAAM,qBAAqB,GAAG,oBAAoB;QAChD,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,MAAM,IAAA,yCAAiB,EAAC,iBAAiB,EAAE,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAE9E,IAAI,gBAAoC,CAAC;IACzC,IAAI,OAAO,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACvC,IAAI,OAAO,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACpE,CAAC;QAED,gBAAgB,GAAG,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,gBAAgB,CAAC;IACrB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACtB,MAAM,EAAE,cAAc,GAAG,IAAI,EAAE,UAAU,GAAG,SAAS,EAAE,GACrD,OAAO,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;QAEtD,gBAAgB,GAAG;YACjB,cAAc;YACd,UAAU,EAAE,UAAU,IAAI,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC;SAC/D,CAAC;IACJ,CAAC;IAED,IAAI,UAAU,CAAC;IACf,IAAI,OAAO,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC;QACzB,UAAU,GAAG,EAAE,CAAC;IAClB,CAAC;SAAM,IAAI,OAAO,OAAO,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC3C,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,iBAAQ,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;QAExD,UAAU,GAAG;YACX,KAAK,EAAE,KAAK,IAAI,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC;YAC/C,QAAQ;SACT,CAAC;IACJ,CAAC;IAED,IAAI,eAAe,CAAC;IACpB,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,eAAe,GAAG;YAChB,KAAK,EAAE,OAAO;SACf,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IACvF,MAAM,aAAa,GAA4B;QAC7C,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,QAAQ;QAChB,KAAK,EAAE,OAAO;QACd,GAAG,CAAC,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;QAC5D,IAAI,EAAE,IAAA,yCAAsB,EAC1B,mBAAI,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAC3F;QACD,KAAK,EAAE,OAAO,CAAC,gBAAgB,IAAI,IAAI;QACvC,gEAAgE;QAChE,sCAAsC;QACtC,YAAY,EACV,CAAC,CAAC,UAAU,KAAK,SAAS,IAAI,gBAAgB,KAAK,SAAS,CAAC;YAC3D,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC;YACnC,OAAO,CAAC,UAAU,KAAK,mBAAU,CAAC,MAAM;KAC3C,CAAC;IAEF,MAAM,WAAW,GAAG;QAClB,OAAO,EACL,OAAO,CAAC,aAAa,KAAK,sBAAa,CAAC,GAAG,IAAI,OAAO,CAAC,aAAa,KAAK,sBAAa,CAAC,OAAO;YAC5F,CAAC,CAAC,eAAe;YACjB,CAAC,CAAC,QAAQ;QACd,KAAK,EACH,aAAa,CAAC,KAAK;YACnB,CAAC,OAAO,CAAC,aAAa,KAAK,sBAAa,CAAC,GAAG,IAAI,OAAO,CAAC,aAAa,KAAK,sBAAa,CAAC,KAAK;gBAC3F,CAAC,CAAC,gBAAgB;gBAClB,CAAC,CAAC,SAAS,CAAC;KACjB,CAAC;IAEF,MAAM,YAAY,GAAG,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACtE,MAAM,aAAa,GAAG,sBAAsB,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACzE,IAAI,gBAAgB,CAAC;IACrB,mFAAmF;IACnF,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACvC,IAAI,UAAkB,CAAC;QACvB,IAAI,WAAmB,CAAC;QACxB,oEAAoE;QACpE,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YACtC,UAAU,GAAG,WAAW,GAAG,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QACrE,CAAC;aAAM,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,WAAW,EAAE,CAAC;YAChD,UAAU,GAAG,mBAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;YACxD,WAAW,GAAG,YAAY,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC3D,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,IAAI,YAAY,CAAC;QACrD,CAAC;QAED;;;;;;;;WAQG;QACH,MAAM,aAAa,GAAG,mBAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACjD,WAAW;YACT,CAAC,UAAU,IAAI,gBAAgB,CAAC,IAAI,aAAa,KAAK,YAAY;gBAChE,CAAC,CAAC,sBAAc;gBAChB,CAAC,CAAC,aAAa,CAAC;QAEpB,MAAM,qBAAqB,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC;QAErD,gBAAgB,GAAG;YACjB,KAAK,EAAE,UAAU;YACjB,MAAM,EAAE,WAAW;YACnB,cAAc,EAAE;gBACd,CAAC,WAAW,EAAE,IAAI,CAAC;gBACnB,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACpE,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACrE,CAAC,MAAM,EAAE,IAAI,CAAC;gBACd,cAAc;aACQ;YACxB,WAAW,EAAE,UAAU,EAAE,oBAAoB;YAC7C,gFAAgF;YAChF,cAAc,EACZ,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ;gBAC/B,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,cAAc,IAAI,qBAAqB,CAAC;gBAC1D,CAAC,CAAC,qBAAqB;SAC5B,CAAC;IACJ,CAAC;IAED,IAAI,eAAe,IAAI,UAAU,IAAI,gBAAgB,EAAE,CAAC;QACtD,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CACb,kFAAkF,CACnF,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CACb,4FAA4F,CAC7F,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;IAC9D,MAAM,QAAQ,GAAG;QACf,YAAY;QACZ,OAAO,EAAE,OAAO;YACd,CAAC,CAAC;gBACE,UAAU,EAAE,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU;aAC5D;YACH,CAAC,CAAC,SAAS;KACd,CAAC;IAEF,0BAA0B;IAC1B,MAAM,EACJ,2BAA2B,EAC3B,GAAG,GAAG,IAAI,EACV,QAAQ,EACR,WAAW,EACX,oBAAoB,EACpB,eAAe,EACf,mBAAmB,GAAG,KAAK,EAC3B,YAAY,EACZ,aAAa,EACb,IAAI,EACJ,SAAS,EACT,SAAS,EACT,UAAU,EACV,wBAAwB,EACxB,oBAAoB,EACpB,OAAO,EACP,KAAK,EACL,QAAQ,GAAG,IAAI,EACf,SAAS,EACT,gBAAgB,EAChB,WAAW,EACX,OAAO,EACP,SAAS,EACT,WAAW,EACX,MAAM,EACN,eAAe,GAAG,KAAK,EACvB,qBAAqB,EACrB,qBAAqB,EACrB,oBAAoB,GACrB,GAAG,OAAO,CAAC;IAEZ,oCAAoC;IACpC,OAAO;QACL,qBAAqB,EAAE,CAAC,CAAC,GAAG,IAAI,mBAAmB,CAAC,OAAO;QAC3D,2BAA2B;QAC3B,QAAQ;QACR,YAAY;QACZ,WAAW;QACX,oBAAoB,EAAE,kBAAkB,CAAC,oBAAoB,CAAC;QAC9D,gBAAgB,EACd,OAAO,gBAAgB,KAAK,QAAQ;YAClC,CAAC,CAAC;gBACE,GAAG,gBAAgB;gBACnB,OAAO,EAAE,kBAAkB,CAAC,gBAAgB,CAAC,OAAO,CAAC;aACtD;YACH,CAAC,CAAC,gBAAgB;QACtB,eAAe;QACf,mBAAmB;QACnB,GAAG,EAAE,CAAC,GAAG;QACT,KAAK,EAAE,CAAC,CAAC,SAAS;QAClB,SAAS,EAAE,SAAS,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACxF,IAAI;QACJ,QAAQ;QACR,gBAAgB;QAChB,wBAAwB;QACxB,oBAAoB;QACpB,gBAAgB;QAChB,gBAAgB;QAChB,eAAe;QACf,UAAU;QACV,UAAU;QACV,OAAO;QACP,KAAK;QACL,aAAa;QACb,WAAW;QACX,oBAAoB;QACpB,SAAS,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,mBAAI,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAC9E,mBAAmB;QACnB,aAAa;QACb,YAAY;QACZ,gBAAgB;QAChB,QAAQ;QACR,WAAW;QACX,MAAM;QACN,WAAW;QACX,gBAAgB;QAChB,YAAY;QACZ,aAAa;QACb,aAAa,EAAE,aAAa;YAC1B,CAAC,CAAC,mBAAI,CAAC,IAAI,CACP,aAAa,EACb,OAAO,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,sBAAsB,CAC3E;YACH,CAAC,CAAC,SAAS;QACb,gBAAgB;QAChB,qBAAqB;QACrB,oBAAoB;QACpB,WAAW;QACX,WAAW;QACX,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;QAC9C,UAAU,EAAE,SAAS;QACrB,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,SAAS;QAC9E,gBAAgB;QAChB,QAAQ,EAAE,sCAAgB;QAC1B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,IAAA,oBAAY,GAAE;QACtB,WAAW;QACX,MAAM;QACN,eAAe,EAAE,wCAAkB,IAAI,eAAe;QACtD,qBAAqB,EAAE,GAAG,IAAI,qBAAqB;QACnD,qBAAqB;QACrB,QAAQ;QACR,eAAe,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe;QAC1C,kBAAkB,EAAE,CAAC,CAAC,OAAO,CAAC,kBAAkB;QAChD,gBAAgB,EAAE,OAAO,CAAC,UAAU;QACpC,gBAAgB,EAAE,MAAM,oBAAoB,CAAC,WAAW,CAAC;KAC1D,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAS,oBAAoB,CAC3B,aAAqB,EACrB,iBAAyB,EACzB,OAA2B,EAC3B,WAA0D;IAE1D,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;IACjE,CAAC;IAED,sDAAsD;IACtD,IAAI,OAAO,IAAI,WAAW,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,uBAAuB;QACvB,OAAO,EAAE,MAAM,EAAE,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EAAE,CAAC;IACvD,CAAC;SAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACxB,oDAAoD;QACpD,OAAO,EAAE,MAAM,EAAE,mBAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,EAAE,CAAC;IAC7D,CAAC;SAAM,IAAI,WAAW,YAAY,GAAG,EAAE,CAAC;QACtC,OAAO,MAAM,CAAC,WAAW,CACvB,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,EAAE;YACvD,uHAAuH;YACvH,MAAM,cAAc,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAClD,MAAM,cAAc,GAAG,cAAc,CAAC,CAAC,CAAC,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;YAE1F,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAChC,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,2BAA2B;QAC3B,MAAM,eAAe,GAA2B,EAAE,CAAC;QACnD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,gBAAgB,GAAG,mBAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAEhD,+GAA+G;YAC/G,yFAAyF;YACzF,iIAAiI;YACjI,8DAA8D;YAC9D,MAAM,cAAc,GAAG,mBAAI,CAAC,UAAU,CAAC,UAAU,CAAC;gBAChD,CAAC,CAAC,gBAAgB,CAAC,IAAI;gBACvB,CAAC,CAAC,mBAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAE3D,uHAAuH;YACvH,MAAM,cAAc,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAClD,MAAM,cAAc,GAAG,cAAc,CAAC,CAAC,CAAC,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;YAE1F,kDAAkD;YAClD,MAAM,sBAAsB,GAAG,eAAe,CAAC,cAAc,CAAC,CAAC;YAC/D,IAAI,sBAAsB,EAAE,CAAC;gBAC3B,MAAM,IAAI,KAAK,CACb,KAAK,sBAAsB,YAAY,cAAc,yCAAyC,cAAc,KAAK;oBAC/G,uDAAuD,CAC1D,CAAC;YACJ,CAAC;YAED,eAAe,CAAC,cAAc,CAAC,GAAG,cAAc,CAAC;QACnD,CAAC;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;AACH,CAAC;AAED,SAAS,sBAAsB,CAC7B,UAA6F,EAC7F,WAAmB;IAEnB,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC;QACxB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,EAA+D,CAAC;IAEvF,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;QAClC,IAAI,KAAK,CAAC;QACV,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACjC,2DAA2D;YAC3D,KAAK,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,QAAQ,CAAC;QACnB,CAAC;QAED,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;QAEnD,gDAAgD;QAChD,MAAM,IAAI,GAAG,UAAU,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,mBAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,mBAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAE9F,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YAC7D,SAAS;QACX,CAAC;QAED,IAAI,QAAQ,CAAC,OAAO,KAAK,MAAM,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CACb,QAAQ,IAAI,wDAAwD;gBAClE,8CAA8C,CACjD,CAAC;QACJ,CAAC;QAED,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;AAC/B,CAAC;AAED,SAAgB,iBAAiB,CAC/B,WAA+B,EAAE,EACjC,IAAsD,EACtD,MAAc;IAEd,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACxC,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,cAAc,GAAG,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,OAAO,GAAG,GAAG,CAAC;IAEvE,IAAI,cAAkC,CAAC;IACvC,IAAI,cAAc,KAAK,EAAE,EAAE,CAAC;QAC1B,cAAc,GAAG,IAAA,sBAAgB,EAAC,IAAA,kBAAY,EAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;QAE1E,IAAI,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YACpC,cAAc,GAAG,IAAA,uBAAiB,EAAC,cAAc,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAED,OAAO,cAAc,CAAC;AACxB,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAS,kBAAkB,CAAC,KAA2B;IACrD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO;QACL,GAAG,IAAI,GAAG,CACR,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACd,sEAAsE;QACtE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC/D,CACF;KACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,WAAmB;IACrD,MAAM,cAAc,GAAG,IAAA,uCAAqB,EAAC,WAAW,CAAC,CAAC;IAE1D,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,cAAc,CAAC,4BAA4B,CAAC,CAAC;QAClE,MAAM,YAAY,GAAG,MAAM,IAAA,mBAAQ,EAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC3D,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAwB,CAAC;QACvE,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC;QAEvC,OAAO,OAAO,CAAC;IACjB,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CACb,kHAAkH,CACnH,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -29,7 +29,7 @@ async function normalizeOptions(context, projectName, options) {
|
|
|
29
29
|
const { workspaceRoot, logger } = context;
|
|
30
30
|
const projectMetadata = await context.getProjectMetadata(projectName);
|
|
31
31
|
const projectRoot = node_path_1.default.join(workspaceRoot, projectMetadata.root ?? '');
|
|
32
|
-
const cacheOptions = (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, workspaceRoot);
|
|
32
|
+
const cacheOptions = (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, workspaceRoot, projectName, context.builder.builderName);
|
|
33
33
|
// Target specifier defaults to the current project's build target using a development configuration
|
|
34
34
|
const buildTargetSpecifier = options.buildTarget ?? `::development`;
|
|
35
35
|
const buildTarget = (0, architect_1.targetFromTargetString)(buildTargetSpecifier, projectName, 'build');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AA0BH,
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":"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"}
|
|
@@ -140,7 +140,7 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
|
|
|
140
140
|
* (e.g., 'foo/bar'), as they are not correctly re-based from the base href.
|
|
141
141
|
*/
|
|
142
142
|
const preTransformRequests = externalMetadata.explicitBrowser.length === 0 && ssrMode === plugins_1.ServerSsrMode.NoSsr;
|
|
143
|
-
const cacheDir = (0, node_path_1.join)(serverOptions.cacheOptions.localPath ?? serverOptions.cacheOptions.path,
|
|
143
|
+
const cacheDir = (0, node_path_1.join)(serverOptions.cacheOptions.localPath ?? serverOptions.cacheOptions.path, 'vite');
|
|
144
144
|
const configuration = {
|
|
145
145
|
configFile: false,
|
|
146
146
|
envDir: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["server.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+HH,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["server.ts"],"names":[],"mappings":"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"}
|
|
@@ -101,13 +101,13 @@ async function* executeLibraryBuilder(options, context) {
|
|
|
101
101
|
const browsers = (0, supported_browsers_1.getSupportedBrowsers)(projectRoot, logger);
|
|
102
102
|
const target = (0, target_1.transformSupportedBrowsersToTargets)(browsers);
|
|
103
103
|
stylesheetBundler = createComponentStylesheetBundlerForLibrary(normalizedOptions, isWatchMode, target);
|
|
104
|
-
// Track all referenced files for watch mode
|
|
105
|
-
const
|
|
104
|
+
// Track all referenced compilation files for watch mode
|
|
105
|
+
const watchedCompilationFiles = new Set([
|
|
106
106
|
(0, path_1.toPosixPath)(tsConfigPath),
|
|
107
107
|
(0, path_1.toPosixPath)(packageJsonPath),
|
|
108
108
|
]);
|
|
109
109
|
for (const entryPoint of normalizedOptions.entryPoints.values()) {
|
|
110
|
-
|
|
110
|
+
watchedCompilationFiles.add((0, path_1.toPosixPath)(entryPoint.entryFilePath));
|
|
111
111
|
}
|
|
112
112
|
if (isWatchMode) {
|
|
113
113
|
if (progress) {
|
|
@@ -122,7 +122,7 @@ async function* executeLibraryBuilder(options, context) {
|
|
|
122
122
|
poll,
|
|
123
123
|
preserveSymlinks,
|
|
124
124
|
signal,
|
|
125
|
-
watchFiles:
|
|
125
|
+
watchFiles: watchedCompilationFiles,
|
|
126
126
|
});
|
|
127
127
|
context.addTeardown?.(() => void watcher?.close());
|
|
128
128
|
}
|
|
@@ -130,7 +130,7 @@ async function* executeLibraryBuilder(options, context) {
|
|
|
130
130
|
const initialResult = await executeBuild('Building...', {
|
|
131
131
|
options: normalizedOptions,
|
|
132
132
|
stylesheetBundler,
|
|
133
|
-
|
|
133
|
+
watchedCompilationFiles,
|
|
134
134
|
isWatchMode,
|
|
135
135
|
context,
|
|
136
136
|
buildState,
|
|
@@ -139,7 +139,7 @@ async function* executeLibraryBuilder(options, context) {
|
|
|
139
139
|
if (!isWatchMode || !watcher) {
|
|
140
140
|
return;
|
|
141
141
|
}
|
|
142
|
-
yield* runWatchLoop(watcher, normalizedOptions, stylesheetBundler,
|
|
142
|
+
yield* runWatchLoop(watcher, normalizedOptions, stylesheetBundler, watchedCompilationFiles, context, withProgress, buildState, buildAction, hasModifiedWatchedFile, signal);
|
|
143
143
|
}
|
|
144
144
|
finally {
|
|
145
145
|
(0, profiling_1.logCumulativeDurations)();
|
|
@@ -153,7 +153,7 @@ async function* executeLibraryBuilder(options, context) {
|
|
|
153
153
|
}
|
|
154
154
|
async function executeBuild(message, actionContext, withProgress, watcher, buildAction) {
|
|
155
155
|
const startTime = process.hrtime.bigint();
|
|
156
|
-
const { context,
|
|
156
|
+
const { context, watchedCompilationFiles, isWatchMode } = actionContext;
|
|
157
157
|
try {
|
|
158
158
|
await withProgress(message, () => buildAction(actionContext));
|
|
159
159
|
logBuildResult(context.logger, startTime, true);
|
|
@@ -168,14 +168,20 @@ async function executeBuild(message, actionContext, withProgress, watcher, build
|
|
|
168
168
|
return { success: false, error: error.message };
|
|
169
169
|
}
|
|
170
170
|
finally {
|
|
171
|
-
watcher
|
|
171
|
+
if (watcher) {
|
|
172
|
+
watcher.add(Array.from(watchedCompilationFiles));
|
|
173
|
+
const { assetsToEmit } = actionContext;
|
|
174
|
+
if (assetsToEmit?.length) {
|
|
175
|
+
watcher.add(assetsToEmit.map((asset) => asset.source));
|
|
176
|
+
}
|
|
177
|
+
}
|
|
172
178
|
}
|
|
173
179
|
}
|
|
174
180
|
/**
|
|
175
181
|
* Runs the watch loop, rebuilding the library as watched files are modified.
|
|
176
182
|
*/
|
|
177
|
-
async function* runWatchLoop(watcher, options, stylesheetBundler,
|
|
178
|
-
const {
|
|
183
|
+
async function* runWatchLoop(watcher, options, stylesheetBundler, watchedCompilationFiles, context, withProgress, buildState, buildAction, hasModifiedWatchedFile, signal) {
|
|
184
|
+
const { collectAssetsToEmit } = await Promise.resolve().then(() => __importStar(require('./pipeline/assets')));
|
|
179
185
|
const { workspaceRoot, packageJsonPath, assets, clearScreen } = options;
|
|
180
186
|
const posixPackageJsonPath = (0, path_1.toPosixPath)(packageJsonPath);
|
|
181
187
|
for await (const changes of watcher) {
|
|
@@ -221,7 +227,7 @@ async function* runWatchLoop(watcher, options, stylesheetBundler, allWatchedFile
|
|
|
221
227
|
throw new Error(`The package.json at '${packageJsonPath}' must contain a 'name'.`);
|
|
222
228
|
}
|
|
223
229
|
options.packageName = packageJson.name;
|
|
224
|
-
(0, entry_points_1.updateWatchedEntryPoints)(packageJson, options, buildState,
|
|
230
|
+
(0, entry_points_1.updateWatchedEntryPoints)(packageJson, options, buildState, watchedCompilationFiles, packageJsonPath);
|
|
225
231
|
hasPackageJsonChanges = true;
|
|
226
232
|
}
|
|
227
233
|
catch (error) {
|
|
@@ -238,20 +244,20 @@ async function* runWatchLoop(watcher, options, stylesheetBundler, allWatchedFile
|
|
|
238
244
|
const hasSourceChanges = !buildState.singleProgramCache ||
|
|
239
245
|
buildState.hasCompilationError ||
|
|
240
246
|
buildState.hasEntryPointsChanges ||
|
|
241
|
-
hasModifiedWatchedFile(changedFiles,
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
!checkAssetChanges(assets, workspaceRoot, changedFiles)) {
|
|
247
|
+
hasModifiedWatchedFile(changedFiles, watchedCompilationFiles, posixPackageJsonPath);
|
|
248
|
+
const assetsToEmit = await collectAssetsToEmit(assets, workspaceRoot, buildState.hasEmittedAssets ? changedFiles : undefined);
|
|
249
|
+
if (!hasSourceChanges && !hasPackageJsonChanges && assetsToEmit.length === 0) {
|
|
245
250
|
continue;
|
|
246
251
|
}
|
|
247
252
|
yield await executeBuild('Changes detected. Rebuilding...', {
|
|
248
253
|
options,
|
|
249
254
|
stylesheetBundler,
|
|
250
|
-
|
|
255
|
+
watchedCompilationFiles,
|
|
251
256
|
isWatchMode: true,
|
|
252
257
|
context,
|
|
253
258
|
buildState,
|
|
254
259
|
modifiedFiles: changedFiles,
|
|
260
|
+
assetsToEmit,
|
|
255
261
|
}, withProgress, watcher, buildAction);
|
|
256
262
|
}
|
|
257
263
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiCH,sDA+IC;AA5KD,gEAAkC;AAClC,iFAGuD;AACvD,uDAAiF;AACjF,qDAAwE;AACxE,qEAAgE;AAChE,6CAAkD;AAClD,2CAAkD;AAClD,2CAA+C;AAC/C,qDAA+D;AAC/D,yDAA+D;AAC/D,uEAAsE;AACtE,iDAAqE;AAErE,uCAAoD;AACpD,0DAAmE;AAKnE;;;;;;GAMG;AACI,KAAK,SAAS,CAAC,CAAC,qBAAqB,CAC1C,OAA8B,EAC9B,OAAkD;IAElD,IAAA,wCAA8B,EAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACtD,MAAM,IAAA,qBAAc,GAAE,CAAC;IAEvB,6BAA6B;IAC7B,MAAM,IAAA,kCAAoB,EAAC,OAAO,CAAC,CAAC;IAEpC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;IAC5C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,wCAAwC,EAAE,CAAC;QAE1E,OAAO;IACT,CAAC;IAED,MAAM,iBAAiB,GAAG,MAAM,IAAA,iCAAuB,EAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACvF,MAAM,EACJ,aAAa,EACb,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,eAAe,EACf,YAAY,EACZ,KAAK,EAAE,WAAW,EAClB,IAAI,EACJ,YAAY,EACZ,gBAAgB,EAChB,QAAQ,GACT,GAAG,iBAAiB,CAAC;IAEtB,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC5B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;QAC3B,OAAO,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAE3B,MAAM,YAAY,GAAuB,QAAQ,CAAC,CAAC,CAAC,mBAAW,CAAC,CAAC,CAAC,sBAAc,CAAC;IAEjF,yBAAyB;IACzB,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,IAAA,mCAAe,EAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACnD,CAAC;IAED,8EAA8E;IAC9E,MAAM,CACJ,EAAE,WAAW,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,EAC/D,EAAE,0CAA0C,EAAE,EAC/C,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;0DACb,yBAAyB;0DACzB,+BAA+B;KACvC,CAAC,CAAC;IAEH,IAAI,iBAA4F,CAAC;IACjG,IAAI,OAAiC,CAAC;IACtC,MAAM,UAAU,GAAG,sBAAsB,EAAE,CAAC;IAE5C,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,IAAA,yCAAoB,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,IAAA,4CAAmC,EAAC,QAAQ,CAAC,CAAC;QAC7D,iBAAiB,GAAG,0CAA0C,CAC5D,iBAAiB,EACjB,WAAW,EACX,MAAM,CACP,CAAC;QAEF,
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiCH,sDA+IC;AA5KD,gEAAkC;AAClC,iFAGuD;AACvD,uDAAiF;AACjF,qDAAwE;AACxE,qEAAgE;AAChE,6CAAkD;AAClD,2CAAkD;AAClD,2CAA+C;AAC/C,qDAA+D;AAC/D,yDAA+D;AAC/D,uEAAsE;AACtE,iDAAqE;AAErE,uCAAoD;AACpD,0DAAmE;AAKnE;;;;;;GAMG;AACI,KAAK,SAAS,CAAC,CAAC,qBAAqB,CAC1C,OAA8B,EAC9B,OAAkD;IAElD,IAAA,wCAA8B,EAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACtD,MAAM,IAAA,qBAAc,GAAE,CAAC;IAEvB,6BAA6B;IAC7B,MAAM,IAAA,kCAAoB,EAAC,OAAO,CAAC,CAAC;IAEpC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;IAC5C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,wCAAwC,EAAE,CAAC;QAE1E,OAAO;IACT,CAAC;IAED,MAAM,iBAAiB,GAAG,MAAM,IAAA,iCAAuB,EAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACvF,MAAM,EACJ,aAAa,EACb,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,eAAe,EACf,YAAY,EACZ,KAAK,EAAE,WAAW,EAClB,IAAI,EACJ,YAAY,EACZ,gBAAgB,EAChB,QAAQ,GACT,GAAG,iBAAiB,CAAC;IAEtB,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC5B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;QAC3B,OAAO,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAE3B,MAAM,YAAY,GAAuB,QAAQ,CAAC,CAAC,CAAC,mBAAW,CAAC,CAAC,CAAC,sBAAc,CAAC;IAEjF,yBAAyB;IACzB,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,IAAA,mCAAe,EAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACnD,CAAC;IAED,8EAA8E;IAC9E,MAAM,CACJ,EAAE,WAAW,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,EAC/D,EAAE,0CAA0C,EAAE,EAC/C,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;0DACb,yBAAyB;0DACzB,+BAA+B;KACvC,CAAC,CAAC;IAEH,IAAI,iBAA4F,CAAC;IACjG,IAAI,OAAiC,CAAC;IACtC,MAAM,UAAU,GAAG,sBAAsB,EAAE,CAAC;IAE5C,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,IAAA,yCAAoB,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,IAAA,4CAAmC,EAAC,QAAQ,CAAC,CAAC;QAC7D,iBAAiB,GAAG,0CAA0C,CAC5D,iBAAiB,EACjB,WAAW,EACX,MAAM,CACP,CAAC;QAEF,wDAAwD;QACxD,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAS;YAC9C,IAAA,kBAAW,EAAC,YAAY,CAAC;YACzB,IAAA,kBAAW,EAAC,eAAe,CAAC;SAC7B,CAAC,CAAC;QAEH,KAAK,MAAM,UAAU,IAAI,iBAAiB,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;YAChE,uBAAuB,CAAC,GAAG,CAAC,IAAA,kBAAW,EAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;QACrE,CAAC;QAED,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;YAClE,CAAC;YAED,MAAM,EAAE,YAAY,EAAE,GAAG,wDAAa,qBAAqB,GAAC,CAAC;YAC7D,OAAO,GAAG,MAAM,YAAY,CAAC;gBAC3B,aAAa;gBACb,WAAW;gBACX,UAAU;gBACV,YAAY;gBACZ,IAAI;gBACJ,gBAAgB;gBAChB,MAAM;gBACN,UAAU,EAAE,uBAAuB;aACpC,CAAC,CAAC;YAEH,OAAO,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QACrD,CAAC;QAED,wBAAwB;QACxB,MAAM,aAAa,GAAG,MAAM,YAAY,CACtC,aAAa,EACb;YACE,OAAO,EAAE,iBAAiB;YAC1B,iBAAiB;YACjB,uBAAuB;YACvB,WAAW;YACX,OAAO;YACP,UAAU;SACX,EACD,YAAY,EACZ,OAAO,EACP,WAAW,CACZ,CAAC;QACF,MAAM,aAAa,CAAC;QAEpB,IAAI,CAAC,WAAW,IAAI,CAAC,OAAO,EAAE,CAAC;YAC7B,OAAO;QACT,CAAC;QAED,KAAK,CAAC,CAAC,YAAY,CACjB,OAAO,EACP,iBAAiB,EACjB,iBAAiB,EACjB,uBAAuB,EACvB,OAAO,EACP,YAAY,EACZ,UAAU,EACV,WAAW,EACX,sBAAsB,EACtB,MAAM,CACP,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,IAAA,kCAAsB,GAAE,CAAC;QACzB,IAAA,sCAAsB,GAAE,CAAC;QAEzB,MAAM,OAAO,CAAC,UAAU,CAAC;YACvB,OAAO,EAAE,KAAK,EAAE;YAChB,iBAAiB,EAAE,OAAO,EAAE;YAC5B,UAAU,CAAC,kBAAkB,EAAE,mBAAmB,CAAC,KAAK,EAAE,EAAE;SAC7D,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,KAAK,UAAU,YAAY,CACzB,OAAe,EACf,aAAmE,EACnE,YAAgC,EAChC,OAAiC,EACjC,WAAiE;IAEjE,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IAC1C,MAAM,EAAE,OAAO,EAAE,uBAAuB,EAAE,WAAW,EAAE,GAAG,aAAa,CAAC;IAExE,IAAI,CAAC;QACH,MAAM,YAAY,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC;QAC9D,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QAChD,IAAI,WAAW,EAAE,CAAC;YAChB,IAAA,kCAAsB,GAAE,CAAC;QAC3B,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAA,qBAAa,EAAC,KAAK,CAAC,CAAC;QACrB,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QAEjD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;IAClD,CAAC;YAAS,CAAC;QACT,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC;YAEjD,MAAM,EAAE,YAAY,EAAE,GAAG,aAAa,CAAC;YACvC,IAAI,YAAY,EAAE,MAAM,EAAE,CAAC;gBACzB,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED;;GAEG;AACH,KAAK,SAAS,CAAC,CAAC,YAAY,CAC1B,OAAqB,EACrB,OAAiC,EACjC,iBAAgF,EAChF,uBAAoC,EACpC,OAAuB,EACvB,YAAgC,EAChC,UAA4B,EAC5B,WAAiE,EACjE,sBAAuF,EACvF,MAAoB;IAEpB,MAAM,EAAE,mBAAmB,EAAE,GAAG,wDAAa,mBAAmB,GAAC,CAAC;IAElE,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IACxE,MAAM,oBAAoB,GAAG,IAAA,kBAAW,EAAC,eAAe,CAAC,CAAC;IAE1D,IAAI,KAAK,EAAE,MAAM,OAAO,IAAI,OAAO,EAAE,CAAC;QACpC,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;YACpB,MAAM;QACR,CAAC;QAED,IAAI,WAAW,EAAE,CAAC;YAChB,sCAAsC;YACtC,OAAO,CAAC,KAAK,EAAE,CAAC;QAClB,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;QACvC,IAAI,eAAe,GAAG,KAAK,CAAC;QAC5B,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YAC/B,MAAM,SAAS,GAAG,IAAA,kBAAW,EAAC,IAAI,CAAC,CAAC;YACpC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC5B,IAAI,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;gBACxC,eAAe,GAAG,IAAI,CAAC;gBACvB,cAAc,GAAG,IAAI,CAAC;YACxB,CAAC;iBAAM,IAAI,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9C,eAAe,GAAG,IAAI,CAAC;YACzB,CAAC;QACH,CAAC;QAED,IAAI,eAAe,EAAE,CAAC;YACpB,IAAI,cAAc,EAAE,CAAC;gBACnB,IAAA,yCAAyB,GAAE,CAAC;YAC9B,CAAC;YACD,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;YACrE,IAAI,iBAAiB,EAAE,CAAC;gBACtB,KAAK,MAAM,SAAS,IAAI,iBAAiB,EAAE,CAAC;oBAC1C,YAAY,CAAC,GAAG,CAAC,IAAA,kBAAW,EAAC,SAAS,CAAC,CAAC,CAAC;gBAC3C,CAAC;YACH,CAAC;QACH,CAAC;QAED,qCAAqC;QACrC,IAAI,qBAAqB,GAAG,KAAK,CAAC;QAClC,IAAI,YAAY,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,CAAC;YAC3C,IAAI,CAAC;gBACH,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,eAAe,CAAC,CAAC;gBAC3D,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;gBAClC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;oBACtB,MAAM,IAAI,KAAK,CAAC,wBAAwB,eAAe,0BAA0B,CAAC,CAAC;gBACrF,CAAC;gBACD,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC;gBAEvC,IAAA,uCAAwB,EACtB,WAAW,EACX,OAAO,EACP,UAAU,EACV,uBAAuB,EACvB,eAAe,CAChB,CAAC;gBAEF,qBAAqB,GAAG,IAAI,CAAC;YAC/B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAA,qBAAa,EAAC,KAAK,CAAC,CAAC;gBACrB,MAAM,UAAU,CAAC,kBAAkB,EAAE,mBAAmB,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,CAAC;gBAChF,UAAU,CAAC,mBAAmB,GAAG,KAAK,CAAC;gBACvC,MAAM;oBACJ,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,oCAAoC,KAAK,CAAC,OAAO,EAAE;iBAC3D,CAAC;gBACF,SAAS;YACX,CAAC;QACH,CAAC;QAED,MAAM,gBAAgB,GACpB,CAAC,UAAU,CAAC,kBAAkB;YAC9B,UAAU,CAAC,mBAAmB;YAC9B,UAAU,CAAC,qBAAqB;YAChC,sBAAsB,CAAC,YAAY,EAAE,uBAAuB,EAAE,oBAAoB,CAAC,CAAC;QAEtF,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAC5C,MAAM,EACN,aAAa,EACb,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CACvD,CAAC;QAEF,IAAI,CAAC,gBAAgB,IAAI,CAAC,qBAAqB,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7E,SAAS;QACX,CAAC;QAED,MAAM,MAAM,YAAY,CACtB,iCAAiC,EACjC;YACE,OAAO;YACP,iBAAiB;YACjB,uBAAuB;YACvB,WAAW,EAAE,IAAI;YACjB,OAAO;YACP,UAAU;YACV,aAAa,EAAE,YAAY;YAC3B,YAAY;SACb,EACD,YAAY,EACZ,OAAO,EACP,WAAW,CACZ,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,eAAe,CAAC,eAAuB;IACpD,MAAM,OAAO,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAE5D,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAoB,CAAC;AAChD,CAAC;AAED;;GAEG;AACH,SAAS,cAAc,CAAC,MAAyB,EAAE,SAAiB,EAAE,OAAgB;IACpF,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,GAAG,SAAS,CAAC;IAC3E,MAAM,WAAW,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAEnD,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,YAAY,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACxF,MAAM,CAAC,IAAI,CAAC,4BAA4B,WAAW,IAAI,CAAC,CAAC;IAC3D,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,KAAK,CAAC,sBAAsB,WAAW,IAAI,CAAC,CAAC;IACtD,CAAC;AACH,CAAC"}
|
|
@@ -17,7 +17,6 @@ const utils_1 = require("../../utils");
|
|
|
17
17
|
const color_1 = require("../../utils/color");
|
|
18
18
|
const error_1 = require("../../utils/error");
|
|
19
19
|
const normalize_cache_1 = require("../../utils/normalize-cache");
|
|
20
|
-
const path_1 = require("../../utils/path");
|
|
21
20
|
const postcss_configuration_1 = require("../../utils/postcss-configuration");
|
|
22
21
|
const project_metadata_1 = require("../../utils/project-metadata");
|
|
23
22
|
const entry_points_1 = require("./pipeline/entry-points");
|
|
@@ -25,14 +24,6 @@ async function normalizeLibraryOptions(context, projectName, options) {
|
|
|
25
24
|
const { workspaceRoot } = context;
|
|
26
25
|
const projectMetadata = await context.getProjectMetadata(projectName);
|
|
27
26
|
const { projectRoot, projectSourceRoot } = (0, project_metadata_1.getProjectRootPaths)(workspaceRoot, projectMetadata);
|
|
28
|
-
const outputPath = options.outputPath ?? node_path_1.default.join(workspaceRoot, 'dist', projectName);
|
|
29
|
-
const resolvedOutputPath = node_path_1.default.resolve(workspaceRoot, outputPath);
|
|
30
|
-
if (resolvedOutputPath === projectRoot ||
|
|
31
|
-
(0, path_1.isSubDirectory)(resolvedOutputPath, projectRoot) ||
|
|
32
|
-
(0, path_1.isSubDirectory)(projectRoot, resolvedOutputPath)) {
|
|
33
|
-
throw new Error(`The 'outputPath' (${resolvedOutputPath}) cannot be the project root, ` +
|
|
34
|
-
`contain the project root, or be located within the project root.`);
|
|
35
|
-
}
|
|
36
27
|
const { tsConfig, assets: rawAssets, stylePreprocessorOptions, inlineStyleLanguage = 'css', compilationMode = 'partial', declarationMap = false, allowedNonPeerDependencies: rawAllowedNonPeerDependencies = [], keepLifecycleScripts = false, watch = false, poll, preserveSymlinks = process.execArgv.includes('--preserve-symlinks'), deleteOutputPath = true, progress = true, clearScreen, } = options;
|
|
37
28
|
const resolvedTsConfigPath = node_path_1.default.resolve(workspaceRoot, tsConfig);
|
|
38
29
|
const packageJsonPath = node_path_1.default.join(projectRoot, 'package.json');
|
|
@@ -77,7 +68,7 @@ async function normalizeLibraryOptions(context, projectName, options) {
|
|
|
77
68
|
});
|
|
78
69
|
}
|
|
79
70
|
const assets = (0, utils_1.normalizeAssetPatterns)([...defaultAssets, ...(rawAssets ?? [])], workspaceRoot, projectRoot, projectSourceRoot);
|
|
80
|
-
const cacheOptions = (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, workspaceRoot);
|
|
71
|
+
const cacheOptions = (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, workspaceRoot, projectName, context.builder.builderName);
|
|
81
72
|
const styleIncludePaths = (stylePreprocessorOptions?.includePaths ?? []).map((p) => node_path_1.default.resolve(workspaceRoot, p));
|
|
82
73
|
const searchDirectories = await (0, postcss_configuration_1.generateSearchDirectories)([projectRoot, workspaceRoot]);
|
|
83
74
|
const postcssConfiguration = await (0, postcss_configuration_1.loadPostcssConfiguration)(searchDirectories);
|
|
@@ -89,7 +80,7 @@ async function normalizeLibraryOptions(context, projectName, options) {
|
|
|
89
80
|
projectRoot,
|
|
90
81
|
packageName,
|
|
91
82
|
packageJson,
|
|
92
|
-
outputPath:
|
|
83
|
+
outputPath: node_path_1.default.resolve(workspaceRoot, options.outputPath ?? node_path_1.default.join('dist', projectName)),
|
|
93
84
|
deleteOutputPath,
|
|
94
85
|
packageJsonPath,
|
|
95
86
|
tsConfigPath: resolvedTsConfigPath,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAoBH,0DAqIC;AAtJD,gEAAkC;AAClC,0DAA6B;AAE7B,uCAAqD;AACrD,6CAAiD;AACjD,6CAAkD;AAClD,iEAAoE;AACpE,6EAI2C;AAC3C,mEAAmE;AACnE,0DAA+D;AAIxD,KAAK,UAAU,uBAAuB,CAC3C,OAAuB,EACvB,WAAmB,EACnB,OAA8B;IAE9B,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAClC,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IACtE,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,IAAA,sCAAmB,EAAC,aAAa,EAAE,eAAe,CAAC,CAAC;IAE/F,MAAM,EACJ,QAAQ,EACR,MAAM,EAAE,SAAS,EACjB,wBAAwB,EACxB,mBAAmB,GAAG,KAAK,EAC3B,eAAe,GAAG,SAAS,EAC3B,cAAc,GAAG,KAAK,EACtB,0BAA0B,EAAE,6BAA6B,GAAG,EAAE,EAC9D,oBAAoB,GAAG,KAAK,EAC5B,KAAK,GAAG,KAAK,EACb,IAAI,EACJ,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EACnE,gBAAgB,GAAG,IAAI,EACvB,QAAQ,GAAG,IAAI,EACf,WAAW,GACZ,GAAG,OAAO,CAAC;IAEZ,MAAM,oBAAoB,GAAG,mBAAI,CAAC,OAAO,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IACnE,MAAM,eAAe,GAAG,mBAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAE/D,IAAI,WAA4B,CAAC;IACjC,IAAI,CAAC;QACH,MAAM,kBAAkB,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QACtE,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAoB,CAAC;IAClE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAA,qBAAa,EAAC,KAAK,CAAC,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,qCAAqC,eAAe,MAAM,KAAK,CAAC,OAAO,EAAE,EAAE;YACzF,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;IACL,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,WAAW,CAAC;IAC1C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,wBAAwB,eAAe,0BAA0B,CAAC,CAAC;IACrF,CAAC;IAED,MAAM,WAAW,GAAG,IAAA,mCAAoB,EACtC,WAAW,CAAC,OAAO,EACnB,WAAW,EACX,eAAe,EACf,WAAW,CACZ,CAAC;IAEF,MAAM,0BAA0B,GAAa,CAAC,SAAS,CAAC,CAAC;IACzD,KAAK,MAAM,OAAO,IAAI,6BAA6B,EAAE,CAAC;QACpD,IAAI,CAAC;YACH,0BAA0B,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QACvD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAA,qBAAa,EAAC,KAAK,CAAC,CAAC;YACrB,MAAM,IAAI,KAAK,CACb,+BAA+B,OAAO,kDAAkD,WAAW,MAAM,KAAK,CAAC,OAAO,EAAE,EACxH,EAAE,KAAK,EAAE,KAAK,EAAE,CACjB,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,aAAa,GAAiE;QAClF,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE;QACrD,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE;KACvD,CAAC;IAEF,KAAK,MAAM,UAAU,IAAI,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;QAC9C,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;YACzB,SAAS;QACX,CAAC;QACD,aAAa,CAAC,IAAI,CAAC;YACjB,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,mBAAI,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC;YAC7C,MAAM,EAAE,UAAU,CAAC,IAAI;SACxB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,8BAAsB,EACnC,CAAC,GAAG,aAAa,EAAE,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,EACxC,aAAa,EACb,WAAW,EACX,iBAAiB,CAClB,CAAC;IAEF,MAAM,YAAY,GAAG,IAAA,uCAAqB,EACxC,eAAe,EACf,aAAa,EACb,WAAW,EACX,OAAO,CAAC,OAAO,CAAC,WAAW,CAC5B,CAAC;IAEF,MAAM,iBAAiB,GAAG,CAAC,wBAAwB,EAAE,YAAY,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CACzF,mBAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,CAC/B,CAAC;IAEF,MAAM,iBAAiB,GAAG,MAAM,IAAA,iDAAyB,EAAC,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC;IACxF,MAAM,oBAAoB,GAAG,MAAM,IAAA,gDAAwB,EAAC,iBAAiB,CAAC,CAAC;IAC/E,MAAM,qBAAqB,GAAG,oBAAoB;QAChD,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,MAAM,IAAA,yCAAiB,EAAC,iBAAiB,EAAE,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAE9E,OAAO;QACL,aAAa;QACb,WAAW;QACX,WAAW;QACX,WAAW;QACX,UAAU,EAAE,mBAAI,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,UAAU,IAAI,mBAAI,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC7F,gBAAgB;QAChB,eAAe;QACf,YAAY,EAAE,oBAAoB;QAClC,WAAW;QACX,mBAAmB;QACnB,iBAAiB;QACjB,IAAI,EAAE,wBAAwB,EAAE,IAAmD;QACnF,MAAM;QACN,eAAe;QACf,cAAc;QACd,0BAA0B;QAC1B,oBAAoB;QACpB,KAAK;QACL,IAAI;QACJ,gBAAgB;QAChB,QAAQ;QACR,WAAW;QACX,YAAY;QACZ,MAAM,EAAE,IAAA,oBAAY,GAAE;QACtB,oBAAoB;QACpB,qBAAqB;KACtB,CAAC;AACJ,CAAC"}
|
|
@@ -8,22 +8,11 @@
|
|
|
8
8
|
import type { NormalizedLibraryOptions } from '../types';
|
|
9
9
|
import { type DiskOutputFile } from './utils';
|
|
10
10
|
/**
|
|
11
|
-
* Resolves and collects configured library assets to be emitted to disk
|
|
12
|
-
* and registers their source paths with the watch set.
|
|
11
|
+
* Resolves and collects configured library assets to be emitted to disk.
|
|
13
12
|
*
|
|
14
13
|
* @param assets The normalized asset patterns.
|
|
15
14
|
* @param workspaceRoot The workspace root directory path.
|
|
16
|
-
* @param allWatchedFiles Set collecting all watched file paths for watch mode.
|
|
17
15
|
* @param modifiedFiles Optional set of modified file paths for incremental copying in watch mode.
|
|
18
16
|
* @returns An array of disk file emission descriptors.
|
|
19
17
|
*/
|
|
20
|
-
export declare function collectAssetsToEmit(assets: NormalizedLibraryOptions['assets'], workspaceRoot: string,
|
|
21
|
-
/**
|
|
22
|
-
* Checks whether any configured library assets were modified.
|
|
23
|
-
*
|
|
24
|
-
* @param assets The normalized asset patterns.
|
|
25
|
-
* @param workspaceRoot The workspace root directory path.
|
|
26
|
-
* @param changedFiles Set of changed file paths.
|
|
27
|
-
* @returns True if any asset file was modified.
|
|
28
|
-
*/
|
|
29
|
-
export declare function checkAssetChanges(assets: NormalizedLibraryOptions['assets'], workspaceRoot: string, changedFiles: ReadonlySet<string>): boolean;
|
|
18
|
+
export declare function collectAssetsToEmit(assets: NormalizedLibraryOptions['assets'], workspaceRoot: string, modifiedFiles?: ReadonlySet<string>): Promise<DiskOutputFile[]>;
|
|
@@ -11,7 +11,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
11
11
|
};
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.collectAssetsToEmit = collectAssetsToEmit;
|
|
14
|
-
exports.checkAssetChanges = checkAssetChanges;
|
|
15
14
|
const node_fs_1 = require("node:fs");
|
|
16
15
|
const node_path_1 = __importDefault(require("node:path"));
|
|
17
16
|
const picomatch_1 = __importDefault(require("picomatch"));
|
|
@@ -19,23 +18,18 @@ const path_1 = require("../../../utils/path");
|
|
|
19
18
|
const resolve_assets_1 = require("../../../utils/resolve-assets");
|
|
20
19
|
const utils_1 = require("./utils");
|
|
21
20
|
/**
|
|
22
|
-
* Resolves and collects configured library assets to be emitted to disk
|
|
23
|
-
* and registers their source paths with the watch set.
|
|
21
|
+
* Resolves and collects configured library assets to be emitted to disk.
|
|
24
22
|
*
|
|
25
23
|
* @param assets The normalized asset patterns.
|
|
26
24
|
* @param workspaceRoot The workspace root directory path.
|
|
27
|
-
* @param allWatchedFiles Set collecting all watched file paths for watch mode.
|
|
28
25
|
* @param modifiedFiles Optional set of modified file paths for incremental copying in watch mode.
|
|
29
26
|
* @returns An array of disk file emission descriptors.
|
|
30
27
|
*/
|
|
31
|
-
async function collectAssetsToEmit(assets, workspaceRoot,
|
|
32
|
-
if (assets.length === 0) {
|
|
28
|
+
async function collectAssetsToEmit(assets, workspaceRoot, modifiedFiles) {
|
|
29
|
+
if (assets.length === 0 || modifiedFiles?.size === 0) {
|
|
33
30
|
return [];
|
|
34
31
|
}
|
|
35
32
|
if (modifiedFiles) {
|
|
36
|
-
if (modifiedFiles.size === 0) {
|
|
37
|
-
return [];
|
|
38
|
-
}
|
|
39
33
|
const matchers = createAssetMatchers(assets, workspaceRoot);
|
|
40
34
|
const filesToEmit = [];
|
|
41
35
|
for (const file of modifiedFiles) {
|
|
@@ -51,46 +45,13 @@ async function collectAssetsToEmit(assets, workspaceRoot, allWatchedFiles, modif
|
|
|
51
45
|
}
|
|
52
46
|
if ((0, node_fs_1.statSync)(resolvedFile, { throwIfNoEntry: false })?.isFile()) {
|
|
53
47
|
filesToEmit.push((0, utils_1.createDiskOutputFile)(resolvedFile, node_path_1.default.join(asset.output, relative)));
|
|
54
|
-
allWatchedFiles.add(posixFile);
|
|
55
48
|
}
|
|
56
49
|
}
|
|
57
50
|
}
|
|
58
51
|
return filesToEmit;
|
|
59
52
|
}
|
|
60
53
|
const resolvedAssets = await (0, resolve_assets_1.resolveAssets)(assets, workspaceRoot);
|
|
61
|
-
|
|
62
|
-
for (const { source, destination } of resolvedAssets) {
|
|
63
|
-
filesToEmit.push((0, utils_1.createDiskOutputFile)(source, destination));
|
|
64
|
-
allWatchedFiles.add((0, path_1.toPosixPath)(source));
|
|
65
|
-
}
|
|
66
|
-
return filesToEmit;
|
|
67
|
-
}
|
|
68
|
-
/**
|
|
69
|
-
* Checks whether any configured library assets were modified.
|
|
70
|
-
*
|
|
71
|
-
* @param assets The normalized asset patterns.
|
|
72
|
-
* @param workspaceRoot The workspace root directory path.
|
|
73
|
-
* @param changedFiles Set of changed file paths.
|
|
74
|
-
* @returns True if any asset file was modified.
|
|
75
|
-
*/
|
|
76
|
-
function checkAssetChanges(assets, workspaceRoot, changedFiles) {
|
|
77
|
-
if (assets.length === 0 || changedFiles.size === 0) {
|
|
78
|
-
return false;
|
|
79
|
-
}
|
|
80
|
-
const matchers = createAssetMatchers(assets, workspaceRoot);
|
|
81
|
-
for (const file of changedFiles) {
|
|
82
|
-
const resolvedFile = node_path_1.default.isAbsolute(file) ? file : node_path_1.default.resolve(workspaceRoot, file);
|
|
83
|
-
const posixFile = (0, path_1.toPosixPath)(resolvedFile);
|
|
84
|
-
for (const { posixInputPrefix, isMatch } of matchers) {
|
|
85
|
-
if (posixFile.startsWith(posixInputPrefix)) {
|
|
86
|
-
const relative = posixFile.slice(posixInputPrefix.length);
|
|
87
|
-
if (isMatch(relative)) {
|
|
88
|
-
return true;
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
return false;
|
|
54
|
+
return resolvedAssets.map(({ source, destination }) => (0, utils_1.createDiskOutputFile)(source, destination));
|
|
94
55
|
}
|
|
95
56
|
function createAssetMatchers(assets, workspaceRoot) {
|
|
96
57
|
return assets.map((asset) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets.js","sourceRoot":"","sources":["assets.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;
|
|
1
|
+
{"version":3,"file":"assets.js","sourceRoot":"","sources":["assets.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAkBH,kDAuCC;AAvDD,qCAAmC;AACnC,0DAA6B;AAC7B,0DAAkC;AAClC,8CAAkD;AAClD,kEAAoF;AAEpF,mCAAoE;AAEpE;;;;;;;GAOG;AACI,KAAK,UAAU,mBAAmB,CACvC,MAA0C,EAC1C,aAAqB,EACrB,aAAmC;IAEnC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,EAAE,IAAI,KAAK,CAAC,EAAE,CAAC;QACrD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,QAAQ,GAAG,mBAAmB,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAqB,EAAE,CAAC;QAEzC,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,YAAY,GAAG,mBAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,mBAAI,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;YACtF,MAAM,SAAS,GAAG,IAAA,kBAAW,EAAC,YAAY,CAAC,CAAC;YAE5C,KAAK,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,IAAI,QAAQ,EAAE,CAAC;gBAC5D,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;oBAC5C,SAAS;gBACX,CAAC;gBAED,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;gBAC1D,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACvB,SAAS;gBACX,CAAC;gBAED,IAAI,IAAA,kBAAQ,EAAC,YAAY,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;oBAChE,WAAW,CAAC,IAAI,CAAC,IAAA,4BAAoB,EAAC,YAAY,EAAE,mBAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;gBAC1F,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAa,EAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAElE,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,IAAA,4BAAoB,EAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;AACpG,CAAC;AAED,SAAS,mBAAmB,CAAC,MAA0C,EAAE,aAAqB;IAC5F,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC1B,MAAM,QAAQ,GAAG,mBAAI,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1D,MAAM,UAAU,GAAG,IAAA,kBAAW,EAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC7D,MAAM,OAAO,GAAG,IAAA,mBAAS,EAAC,KAAK,CAAC,IAAI,EAAE;YACpC,GAAG,EAAE,IAAI;YACT,MAAM,EAAE,CAAC,GAAG,qCAAoB,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;SAC3D,CAAC,CAAC;QAEH,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,GAAG,UAAU,GAAG,EAAE,OAAO,EAAE,CAAC;IAChE,CAAC,CAAC,CAAC;AACL,CAAC"}
|