@tramvai/cli 2.102.1 → 2.104.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/lib/api/build/providers/shared.js +1 -1
- package/lib/api/build/providers/shared.js.map +1 -1
- package/lib/api/start/providers/application/shared.js +1 -1
- package/lib/api/start/providers/application/shared.js.map +1 -1
- package/lib/api/start/providers/child-app/shared.js +1 -1
- package/lib/api/start/providers/child-app/shared.js.map +1 -1
- package/lib/api/start/providers/module/shared.js +1 -1
- package/lib/api/start/providers/module/shared.js.map +1 -1
- package/lib/api/start-prod/providers/application.js +1 -1
- package/lib/api/start-prod/providers/application.js.map +1 -1
- package/lib/api/start-prod/providers/child-app.js +1 -1
- package/lib/api/start-prod/providers/child-app.js.map +1 -1
- package/lib/config/configManager.d.ts +1 -0
- package/lib/config/configManager.js +19 -9
- package/lib/config/configManager.js.map +1 -1
- package/lib/library/webpack/blocks/pwa/client.js +13 -1
- package/lib/library/webpack/blocks/pwa/client.js.map +1 -1
- package/lib/library/webpack/blocks/pwa/shared.js +4 -2
- package/lib/library/webpack/blocks/pwa/shared.js.map +1 -1
- package/lib/schema/autogeneratedSchema.json +17 -0
- package/lib/typings/configEntry/application.d.ts +8 -0
- package/lib/typings/pwa/index.d.ts +1 -0
- package/package.json +2 -2
- package/schema.json +17 -0
- package/src/api/build/providers/shared.ts +1 -0
- package/src/api/start/providers/application/shared.ts +1 -0
- package/src/api/start/providers/child-app/shared.ts +1 -0
- package/src/api/start/providers/module/shared.ts +1 -0
- package/src/api/start-prod/providers/application.ts +1 -0
- package/src/api/start-prod/providers/child-app.ts +1 -0
- package/src/config/configManager.ts +15 -1
- package/src/library/webpack/blocks/pwa/client.ts +13 -0
- package/src/library/webpack/blocks/pwa/shared.ts +3 -0
- package/src/schema/autogeneratedSchema.json +17 -0
- package/src/typings/configEntry/application.ts +8 -0
- package/src/typings/pwa/index.ts +1 -0
|
@@ -7,7 +7,7 @@ exports.sharedProviders = [
|
|
|
7
7
|
{
|
|
8
8
|
provide: tokens_1.CONFIG_MANAGER_TOKEN,
|
|
9
9
|
useFactory: ({ configEntry, parameters, }) => {
|
|
10
|
-
return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { env: 'production', buildType: 'client' }));
|
|
10
|
+
return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { appEnv: parameters.env, env: 'production', buildType: 'client' }));
|
|
11
11
|
},
|
|
12
12
|
deps: {
|
|
13
13
|
configEntry: tokens_1.CONFIG_ENTRY_TOKEN,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/api/build/providers/shared.ts"],"names":[],"mappings":";;;AACA,+CAI4B;AAC5B,iEAAoE;AAIvD,QAAA,eAAe,GAAwB;IAClD;QACE,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EACX,WAAW,EACX,UAAU,GAIX,EAAE,EAAE;YACH,OAAO,IAAA,mCAAmB,EAAC,WAAW,kCACjC,UAAU,KACb,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF;CACF,CAAC"}
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/api/build/providers/shared.ts"],"names":[],"mappings":";;;AACA,+CAI4B;AAC5B,iEAAoE;AAIvD,QAAA,eAAe,GAAwB;IAClD;QACE,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EACX,WAAW,EACX,UAAU,GAIX,EAAE,EAAE;YACH,OAAO,IAAA,mCAAmB,EAAC,WAAW,kCACjC,UAAU,KACb,MAAM,EAAE,UAAU,CAAC,GAAG,EACtB,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF;CACF,CAAC"}
|
|
@@ -15,7 +15,7 @@ exports.sharedProviders = [
|
|
|
15
15
|
provide: tokens_2.CONFIG_MANAGER_TOKEN,
|
|
16
16
|
useFactory: ({ configEntry, parameters }) => {
|
|
17
17
|
var _a, _b;
|
|
18
|
-
return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { env: 'development', port: (0, detectPortSync_1.detectPortSync)((_a = parameters.port) !== null && _a !== void 0 ? _a : configManager_1.DEFAULT_PORT), staticPort: (0, detectPortSync_1.detectPortSync)((_b = parameters.staticPort) !== null && _b !== void 0 ? _b : configManager_1.DEFAULT_STATIC_PORT) }));
|
|
18
|
+
return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { appEnv: parameters.env, env: 'development', port: (0, detectPortSync_1.detectPortSync)((_a = parameters.port) !== null && _a !== void 0 ? _a : configManager_1.DEFAULT_PORT), staticPort: (0, detectPortSync_1.detectPortSync)((_b = parameters.staticPort) !== null && _b !== void 0 ? _b : configManager_1.DEFAULT_STATIC_PORT) }));
|
|
19
19
|
},
|
|
20
20
|
deps: {
|
|
21
21
|
configEntry: tokens_2.CONFIG_ENTRY_TOKEN,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/application/shared.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AAEzC,yCAAuE;AACvE,kDAK+B;AAC/B,uDAAoD;AAEpD,oEAI0C;AAC1C,2DAAwD;AACxD,2DAAwD;AACxD,qEAAkE;AAErD,QAAA,eAAe,GAAwB;IAClD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;;YAC1C,OAAA,IAAA,mCAAmB,EAAC,WAAqC,kCACpD,UAAU,KACb,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,IAAA,+BAAc,EAAC,MAAA,UAAU,CAAC,IAAI,mCAAI,4BAAY,CAAC,EACrD,UAAU,EAAE,IAAA,+BAAc,EAAC,MAAA,UAAU,CAAC,UAAU,mCAAI,mCAAmB,CAAC,IACxE,CAAA;SAAA;QACJ,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,YAAY,EAAE,EAAE,EAAE;YAC9C,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;oBAEjD,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,UAAU,CAAC,CAAC;gBAC3F,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;YAC/B,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF,CAAC;CACM,CAAC"}
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/application/shared.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AAEzC,yCAAuE;AACvE,kDAK+B;AAC/B,uDAAoD;AAEpD,oEAI0C;AAC1C,2DAAwD;AACxD,2DAAwD;AACxD,qEAAkE;AAErD,QAAA,eAAe,GAAwB;IAClD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;;YAC1C,OAAA,IAAA,mCAAmB,EAAC,WAAqC,kCACpD,UAAU,KACb,MAAM,EAAE,UAAU,CAAC,GAAG,EACtB,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,IAAA,+BAAc,EAAC,MAAA,UAAU,CAAC,IAAI,mCAAI,4BAAY,CAAC,EACrD,UAAU,EAAE,IAAA,+BAAc,EAAC,MAAA,UAAU,CAAC,UAAU,mCAAI,mCAAmB,CAAC,IACxE,CAAA;SAAA;QACJ,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,YAAY,EAAE,EAAE,EAAE;YAC9C,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;oBAEjD,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,UAAU,CAAC,CAAC;gBAC3F,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;YAC/B,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF,CAAC;CACM,CAAC"}
|
|
@@ -16,7 +16,7 @@ exports.sharedProviders = [
|
|
|
16
16
|
provide: tokens_2.CONFIG_MANAGER_TOKEN,
|
|
17
17
|
useFactory: ({ configEntry, parameters }) => {
|
|
18
18
|
var _a;
|
|
19
|
-
return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { env: 'development', port: (0, detectPortSync_1.detectPortSync)((_a = parameters.port) !== null && _a !== void 0 ? _a : configManager_1.DEFAULT_STATIC_MODULE_PORT) }));
|
|
19
|
+
return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { appEnv: parameters.env, env: 'development', port: (0, detectPortSync_1.detectPortSync)((_a = parameters.port) !== null && _a !== void 0 ? _a : configManager_1.DEFAULT_STATIC_MODULE_PORT) }));
|
|
20
20
|
},
|
|
21
21
|
deps: {
|
|
22
22
|
configEntry: tokens_2.CONFIG_ENTRY_TOKEN,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/child-app/shared.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AACzC,yCAAuE;AACvE,kDAK+B;AAE/B,+EAA0F;AAC1F,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AACxD,oEAAmG;AACnG,qEAAkE;AAErD,QAAA,eAAe,GAAwB;IAClD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;;YAC1C,OAAA,IAAA,mCAAmB,EAAC,WAAkC,kCACjD,UAAU,KACb,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,IAAA,+BAAc,EAAC,MAAA,UAAU,CAAC,IAAI,mCAAI,0CAA0B,CAAC,IACnE,CAAA;SAAA;QACJ,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE,EAAE;YAC9C,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;oBAErC,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC/C,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;YAC/B,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YAChC,OAAO,GAAS,EAAE;gBAChB,MAAM,IAAA,uCAAyB,EAAC,aAAa,CAAC,CAAC;YACjD,CAAC,CAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;CACM,CAAC"}
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/child-app/shared.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AACzC,yCAAuE;AACvE,kDAK+B;AAE/B,+EAA0F;AAC1F,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AACxD,oEAAmG;AACnG,qEAAkE;AAErD,QAAA,eAAe,GAAwB;IAClD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;;YAC1C,OAAA,IAAA,mCAAmB,EAAC,WAAkC,kCACjD,UAAU,KACb,MAAM,EAAE,UAAU,CAAC,GAAG,EACtB,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,IAAA,+BAAc,EAAC,MAAA,UAAU,CAAC,IAAI,mCAAI,0CAA0B,CAAC,IACnE,CAAA;SAAA;QACJ,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE,EAAE;YAC9C,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;oBAErC,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC/C,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;YAC/B,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YAChC,OAAO,GAAS,EAAE;gBAChB,MAAM,IAAA,uCAAyB,EAAC,aAAa,CAAC,CAAC;YACjD,CAAC,CAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;CACM,CAAC"}
|
|
@@ -16,7 +16,7 @@ exports.sharedProviders = [
|
|
|
16
16
|
provide: tokens_2.CONFIG_MANAGER_TOKEN,
|
|
17
17
|
useFactory: ({ configEntry, parameters }) => {
|
|
18
18
|
var _a;
|
|
19
|
-
return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { env: 'development', port: (0, detectPortSync_1.detectPortSync)((_a = parameters.port) !== null && _a !== void 0 ? _a : configManager_1.DEFAULT_STATIC_MODULE_PORT) }));
|
|
19
|
+
return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { appEnv: parameters.env, env: 'development', port: (0, detectPortSync_1.detectPortSync)((_a = parameters.port) !== null && _a !== void 0 ? _a : configManager_1.DEFAULT_STATIC_MODULE_PORT) }));
|
|
20
20
|
},
|
|
21
21
|
deps: {
|
|
22
22
|
configEntry: tokens_2.CONFIG_ENTRY_TOKEN,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/module/shared.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AACzC,yCAAuE;AACvE,kDAK+B;AAC/B,oEAAmG;AACnG,+EAA0F;AAC1F,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AACxD,qEAAkE;AAGrD,QAAA,eAAe,GAAwB;IAClD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;;YAC1C,OAAA,IAAA,mCAAmB,EAAC,WAAgC,kCAC/C,UAAU,KACb,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,IAAA,+BAAc,EAAC,MAAA,UAAU,CAAC,IAAI,mCAAI,0CAA0B,CAAC,IACnE,CAAA;SAAA;QACJ,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE,EAAE;YAC9C,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;oBAErC,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC/C,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;YAC/B,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YAChC,OAAO,GAAS,EAAE;gBAChB,IAAA,uCAAyB,EAAC,aAAa,CAAC,CAAC;YAC3C,CAAC,CAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;CACM,CAAC"}
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/module/shared.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AACzC,yCAAuE;AACvE,kDAK+B;AAC/B,oEAAmG;AACnG,+EAA0F;AAC1F,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AACxD,qEAAkE;AAGrD,QAAA,eAAe,GAAwB;IAClD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;;YAC1C,OAAA,IAAA,mCAAmB,EAAC,WAAgC,kCAC/C,UAAU,KACb,MAAM,EAAE,UAAU,CAAC,GAAG,EACtB,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,IAAA,+BAAc,EAAC,MAAA,UAAU,CAAC,IAAI,mCAAI,0CAA0B,CAAC,IACnE,CAAA;SAAA;QACJ,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE,EAAE;YAC9C,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;oBAErC,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC/C,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;YAC/B,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YAChC,OAAO,GAAS,EAAE;gBAChB,IAAA,uCAAyB,EAAC,aAAa,CAAC,CAAC;YAC3C,CAAC,CAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;CACM,CAAC"}
|
|
@@ -16,7 +16,7 @@ exports.applicationsProviders = [
|
|
|
16
16
|
provide: tokens_1.CONFIG_MANAGER_TOKEN,
|
|
17
17
|
useFactory: ({ configEntry, parameters }) => {
|
|
18
18
|
var _a, _b;
|
|
19
|
-
return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { env: 'production', buildType: 'client', port: (0, detectPortSync_1.detectPortSync)((_a = parameters.port) !== null && _a !== void 0 ? _a : configManager_1.DEFAULT_PORT), staticPort: (0, detectPortSync_1.detectPortSync)((_b = parameters.staticPort) !== null && _b !== void 0 ? _b : configManager_1.DEFAULT_STATIC_PORT) }));
|
|
19
|
+
return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { appEnv: parameters.env, env: 'production', buildType: 'client', port: (0, detectPortSync_1.detectPortSync)((_a = parameters.port) !== null && _a !== void 0 ? _a : configManager_1.DEFAULT_PORT), staticPort: (0, detectPortSync_1.detectPortSync)((_b = parameters.staticPort) !== null && _b !== void 0 ? _b : configManager_1.DEFAULT_STATIC_PORT) }));
|
|
20
20
|
},
|
|
21
21
|
deps: {
|
|
22
22
|
configEntry: tokens_1.CONFIG_ENTRY_TOKEN,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../src/api/start-prod/providers/application.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,0CAAyC;AACzC,iDAAqC;AACrC,+CAI4B;AAG5B,sCAAsE;AACtE,yDAAuD;AACvD,kEAA+D;AAC/D,4DAAyD;AAEzD,iEAIuC;AAG1B,QAAA,qBAAqB,GAAwB;IACxD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAoD,EAAE,EAAE;;YAC5F,OAAA,IAAA,mCAAmB,EAAC,WAAW,kCAC1B,UAAU,KACb,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,QAAQ,EACnB,IAAI,EAAE,IAAA,+BAAc,EAAC,MAAA,UAAU,CAAC,IAAI,mCAAI,4BAAY,CAAC,EACrD,UAAU,EAAE,IAAA,+BAAc,EAAC,MAAA,UAAU,CAAC,UAAU,mCAAI,mCAAmB,CAAC,IACxE,CAAA;SAAA;QACJ,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,EAAE,EAAE;YAC5C,MAAM,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC;YAC3B,MAAM,mBAAmB,GACvB,aACD,CAAC,YAAY,CAAC;gBACb,SAAS,EAAE,QAAQ;aACpB,CAAC,CAAC;YACH,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,mBAAmB,CAAC;YAC1D,MAAM,IAAI,GAAG,mBAAmB,CAAC,SAAS,CAAC;YAE3C,OAAO,IAAA,oBAAI,EAAC,cAAI,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,EAAE;gBAC/C,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,sBAAU,CAAC,CAAC,CAAC,EAAE;gBACjC,GAAG,EAAE,IAAI;gBACT,GAAG,4EACE,IAAA,yBAAW,EAAC,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,iBAAiB,CAAC,EAAE,IAAI,CAAC,GACjE,IAAA,yBAAW,EAAC,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,GACrD,GAAG,GACH,OAAO,CAAC,GAAG,KACd,QAAQ,EAAE,YAAY,EACtB,mBAAmB,EAAE,YAAY,EACjC,IAAI,EAAE,GAAG,IAAI,EAAE,EACf,WAAW,EAAE,GAAG,IAAI,EAAE,EACtB,aAAa,EAAE,YAAY,GAC5B;aACF,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;YACnC,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YAChC,OAAO,GAAS,EAAE;gBAChB,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;oBACnC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;wBAC9B,OAAO,EAAE,CAAC;oBACZ,CAAC,CAAC,CAAC;oBAEH,aAAa,CAAC,IAAI,EAAE,CAAC;gBACvB,CAAC,CAAC,CAAC;YACL,CAAC,CAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;CACM,CAAC"}
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../src/api/start-prod/providers/application.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,0CAAyC;AACzC,iDAAqC;AACrC,+CAI4B;AAG5B,sCAAsE;AACtE,yDAAuD;AACvD,kEAA+D;AAC/D,4DAAyD;AAEzD,iEAIuC;AAG1B,QAAA,qBAAqB,GAAwB;IACxD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAoD,EAAE,EAAE;;YAC5F,OAAA,IAAA,mCAAmB,EAAC,WAAW,kCAC1B,UAAU,KACb,MAAM,EAAE,UAAU,CAAC,GAAG,EACtB,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,QAAQ,EACnB,IAAI,EAAE,IAAA,+BAAc,EAAC,MAAA,UAAU,CAAC,IAAI,mCAAI,4BAAY,CAAC,EACrD,UAAU,EAAE,IAAA,+BAAc,EAAC,MAAA,UAAU,CAAC,UAAU,mCAAI,mCAAmB,CAAC,IACxE,CAAA;SAAA;QACJ,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,EAAE,EAAE;YAC5C,MAAM,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC;YAC3B,MAAM,mBAAmB,GACvB,aACD,CAAC,YAAY,CAAC;gBACb,SAAS,EAAE,QAAQ;aACpB,CAAC,CAAC;YACH,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,mBAAmB,CAAC;YAC1D,MAAM,IAAI,GAAG,mBAAmB,CAAC,SAAS,CAAC;YAE3C,OAAO,IAAA,oBAAI,EAAC,cAAI,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,EAAE;gBAC/C,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,sBAAU,CAAC,CAAC,CAAC,EAAE;gBACjC,GAAG,EAAE,IAAI;gBACT,GAAG,4EACE,IAAA,yBAAW,EAAC,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,iBAAiB,CAAC,EAAE,IAAI,CAAC,GACjE,IAAA,yBAAW,EAAC,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,GACrD,GAAG,GACH,OAAO,CAAC,GAAG,KACd,QAAQ,EAAE,YAAY,EACtB,mBAAmB,EAAE,YAAY,EACjC,IAAI,EAAE,GAAG,IAAI,EAAE,EACf,WAAW,EAAE,GAAG,IAAI,EAAE,EACtB,aAAa,EAAE,YAAY,GAC5B;aACF,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;YACnC,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YAChC,OAAO,GAAS,EAAE;gBAChB,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;oBACnC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;wBAC9B,OAAO,EAAE,CAAC;oBACZ,CAAC,CAAC,CAAC;oBAEH,aAAa,CAAC,IAAI,EAAE,CAAC;gBACvB,CAAC,CAAC,CAAC;YACL,CAAC,CAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;CACM,CAAC"}
|
|
@@ -10,7 +10,7 @@ exports.childAppProviders = [
|
|
|
10
10
|
provide: tokens_1.CONFIG_MANAGER_TOKEN,
|
|
11
11
|
useFactory: ({ configEntry, parameters }) => {
|
|
12
12
|
var _a;
|
|
13
|
-
return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { env: 'production', staticPort: (0, detectPortSync_1.detectPortSync)((_a = parameters.staticPort) !== null && _a !== void 0 ? _a : configManager_1.DEFAULT_STATIC_MODULE_PORT), buildType: 'client' }));
|
|
13
|
+
return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { appEnv: parameters.env, env: 'production', staticPort: (0, detectPortSync_1.detectPortSync)((_a = parameters.staticPort) !== null && _a !== void 0 ? _a : configManager_1.DEFAULT_STATIC_MODULE_PORT), buildType: 'client' }));
|
|
14
14
|
},
|
|
15
15
|
deps: {
|
|
16
16
|
configEntry: tokens_1.CONFIG_ENTRY_TOKEN,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-app.js","sourceRoot":"","sources":["../../../../src/api/start-prod/providers/child-app.ts"],"names":[],"mappings":";;;AACA,0CAAyC;AACzC,+CAI4B;AAC5B,iEAAgG;AAEhG,kEAA+D;AAElD,QAAA,iBAAiB,GAAwB;IACpD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;;YAC1C,OAAA,IAAA,mCAAmB,EAAC,WAAkC,kCACjD,UAAU,KACb,GAAG,EAAE,YAAY,EACjB,UAAU,EAAE,IAAA,+BAAc,EAAC,MAAA,UAAU,CAAC,UAAU,mCAAI,0CAA0B,CAAC,EAC/E,SAAS,EAAE,QAAQ,IACnB,CAAA;SAAA;QACJ,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;CACM,CAAC"}
|
|
1
|
+
{"version":3,"file":"child-app.js","sourceRoot":"","sources":["../../../../src/api/start-prod/providers/child-app.ts"],"names":[],"mappings":";;;AACA,0CAAyC;AACzC,+CAI4B;AAC5B,iEAAgG;AAEhG,kEAA+D;AAElD,QAAA,iBAAiB,GAAwB;IACpD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;;YAC1C,OAAA,IAAA,mCAAmB,EAAC,WAAkC,kCACjD,UAAU,KACb,MAAM,EAAE,UAAU,CAAC,GAAG,EACtB,GAAG,EAAE,YAAY,EACjB,UAAU,EAAE,IAAA,+BAAc,EAAC,MAAA,UAAU,CAAC,UAAU,mCAAI,0CAA0B,CAAC,EAC/E,SAAS,EAAE,QAAQ,IACnB,CAAA;SAAA;QACJ,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;CACM,CAAC"}
|
|
@@ -3,6 +3,7 @@ import type { Env } from '../typings/Env';
|
|
|
3
3
|
import type { ConfigEntry, OverridableOption } from '../typings/configEntry/common';
|
|
4
4
|
import type { Target } from '../typings/target';
|
|
5
5
|
export interface Settings<E extends Env> {
|
|
6
|
+
appEnv?: Record<string, any>;
|
|
6
7
|
env?: E;
|
|
7
8
|
rootDir?: string;
|
|
8
9
|
version?: string;
|
|
@@ -39,14 +39,23 @@ exports.DEFAULT_STATIC_PORT = 4000;
|
|
|
39
39
|
exports.DEFAULT_STATIC_MODULE_PORT = 4040;
|
|
40
40
|
// eslint-disable-next-line max-statements, complexity
|
|
41
41
|
const createConfigManager = (configEntry, settings) => {
|
|
42
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
|
|
42
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
|
|
43
43
|
const env = (_a = settings.env) !== null && _a !== void 0 ? _a : 'development';
|
|
44
44
|
const normalizedConfigEntry = omitEnvOptions(env, configEntry);
|
|
45
45
|
const { type } = configEntry;
|
|
46
46
|
const rootDir = (_b = settings.rootDir) !== null && _b !== void 0 ? _b : process.cwd();
|
|
47
47
|
const debug = (_c = settings.debug) !== null && _c !== void 0 ? _c : false;
|
|
48
|
-
const
|
|
49
|
-
|
|
48
|
+
const appEnv = (_d = settings.appEnv) !== null && _d !== void 0 ? _d : {};
|
|
49
|
+
// First problem, modern build is not supported for CSR mode.
|
|
50
|
+
// Second, in development mode with enabled modern, only modern JS chunks will be generated.
|
|
51
|
+
// With PWA module, only sw.modern.js file exists - but in CSR mode application needs sw.js, which is not generated.
|
|
52
|
+
// In production mode with enabled modern, everything is ok - all type of chunks generated in parallel.
|
|
53
|
+
const disableModernForCsrInDevMode = (process.env.TRAMVAI_FORCE_CLIENT_SIDE_RENDERING ||
|
|
54
|
+
appEnv.TRAMVAI_FORCE_CLIENT_SIDE_RENDERING) === 'true' && env === 'development';
|
|
55
|
+
const modern = disableModernForCsrInDevMode
|
|
56
|
+
? false
|
|
57
|
+
: getOption('modern', [settings, configEntry], true);
|
|
58
|
+
const buildType = (_e = settings.buildType) !== null && _e !== void 0 ? _e : 'client';
|
|
50
59
|
let target = 'defaults';
|
|
51
60
|
if (buildType === 'server') {
|
|
52
61
|
target = 'node';
|
|
@@ -59,10 +68,11 @@ const createConfigManager = (configEntry, settings) => {
|
|
|
59
68
|
'unknown', trace: false, host: '0.0.0.0', staticHost: 'localhost', profile: false, noClientRebuild: false, noServerRebuild: false, resolveSymlinks: true, disableProdOptimization: false, onlyBundles: [],
|
|
60
69
|
// according to measures fileCache in webpack doesn't affect
|
|
61
70
|
// performance much so enable it by default as it always was before
|
|
62
|
-
fileCache: true, showConfig: false, csr: false }), settings), {
|
|
71
|
+
fileCache: true, showConfig: false, csr: false }), settings), { appEnv,
|
|
72
|
+
env,
|
|
63
73
|
rootDir,
|
|
64
74
|
buildType,
|
|
65
|
-
debug, port: Number((
|
|
75
|
+
debug, port: Number((_f = settings.port) !== null && _f !== void 0 ? _f : exports.DEFAULT_PORT), staticPort: Number((_g = settings.staticPort) !== null && _g !== void 0 ? _g : (type === 'module' ? exports.DEFAULT_STATIC_MODULE_PORT : exports.DEFAULT_STATIC_PORT)), modern, sourceMap: debug ? true : getOption('sourceMap', [settings, normalizedConfigEntry], false), target, buildPath: '', withSettings(overrideSettings) {
|
|
66
76
|
return (0, exports.createConfigManager)(configEntry, Object.assign(Object.assign({}, settings), overrideSettings));
|
|
67
77
|
},
|
|
68
78
|
dehydrate() {
|
|
@@ -79,15 +89,15 @@ const createConfigManager = (configEntry, settings) => {
|
|
|
79
89
|
? process.env.ASSETS_PREFIX
|
|
80
90
|
: `http://${config.staticHost}:${config.staticPort}/${config.output.client.replace(/\/$/, '')}/`;
|
|
81
91
|
config.buildPath = (0, path_1.resolve)(rootDir, buildType === 'server' ? config.output.server : config.output.client);
|
|
82
|
-
const pwa = (
|
|
83
|
-
if ((
|
|
84
|
-
pwa.webmanifest = Object.assign(Object.assign({ icons: ((
|
|
92
|
+
const pwa = (_h = config.experiments) === null || _h === void 0 ? void 0 : _h.pwa;
|
|
93
|
+
if ((_j = pwa.webmanifest) === null || _j === void 0 ? void 0 : _j.enabled) {
|
|
94
|
+
pwa.webmanifest = Object.assign(Object.assign({ icons: ((_k = pwa.icon) === null || _k === void 0 ? void 0 : _k.src)
|
|
85
95
|
? pwa.icon.sizes.map((size) => ({
|
|
86
96
|
src: `${config.assetsPrefix}${pwa.icon.dest}/${size}x${size}.png`,
|
|
87
97
|
sizes: `${size}x${size}`,
|
|
88
98
|
type: 'image/png',
|
|
89
99
|
}))
|
|
90
|
-
: [] }, pwa.webmanifest), { scope: (
|
|
100
|
+
: [] }, pwa.webmanifest), { scope: (_l = pwa.webmanifest.scope) !== null && _l !== void 0 ? _l : (_m = pwa.sw) === null || _m === void 0 ? void 0 : _m.scope, name: (_o = pwa.webmanifest.name) !== null && _o !== void 0 ? _o : config.name, short_name: (_p = pwa.webmanifest.name) !== null && _p !== void 0 ? _p : config.name, theme_color: (_q = pwa.webmanifest.theme_color) !== null && _q !== void 0 ? _q : pwa.meta.themeColor });
|
|
91
101
|
if (pwa.webmanifest.dest.includes('[hash]')) {
|
|
92
102
|
const crypto = require('crypto');
|
|
93
103
|
const hashSum = crypto.createHash('sha256');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configManager.js","sourceRoot":"","sources":["../../src/config/configManager.ts"],"names":[],"mappings":";;;;AAAA,wEAA0C;AAC1C,4EAA8C;AAC9C,8EAAgD;AAChD,8EAA8C;AAC9C,4EAA+C;AAC/C,+BAA+B;AAI/B,0DAAoE;AACpE,yCAA2E;AAC3E,mFAAmD;AACnD,4DAAyD;AACzD,6CAA0C;
|
|
1
|
+
{"version":3,"file":"configManager.js","sourceRoot":"","sources":["../../src/config/configManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,9 @@ const workbox_webpack_plugin_1 = require("workbox-webpack-plugin");
|
|
|
7
7
|
const PwaIconsPlugin_1 = require("../../plugins/PwaIconsPlugin");
|
|
8
8
|
const WebManifestPlugin_1 = require("../../plugins/WebManifestPlugin");
|
|
9
9
|
const shared_1 = require("./shared");
|
|
10
|
-
const pwaBlock =
|
|
10
|
+
const pwaBlock =
|
|
11
|
+
// eslint-disable-next-line max-statements
|
|
12
|
+
(configManager) => (config) => {
|
|
11
13
|
var _a, _b, _c, _d, _e;
|
|
12
14
|
const { experiments: { pwa }, rootDir, root, output, env, modern, sourceMap, assetsPrefix, } = configManager;
|
|
13
15
|
config.batch((0, shared_1.pwaSharedBlock)(configManager));
|
|
@@ -22,7 +24,17 @@ const pwaBlock = (configManager) => (config) => {
|
|
|
22
24
|
// @todo maybe less for production?
|
|
23
25
|
maximumFileSizeToCacheInBytes: 10 * 1024 * 1024,
|
|
24
26
|
};
|
|
27
|
+
if (pwa.workbox.include) {
|
|
28
|
+
workboxOptions.include = pwa.workbox.include.map((expr) => new RegExp(expr));
|
|
29
|
+
}
|
|
30
|
+
if (pwa.workbox.exclude) {
|
|
31
|
+
workboxOptions.exclude = [
|
|
32
|
+
...workboxOptions.exclude,
|
|
33
|
+
...pwa.workbox.exclude.map((expr) => new RegExp(expr)),
|
|
34
|
+
];
|
|
35
|
+
}
|
|
25
36
|
if (env === 'production') {
|
|
37
|
+
workboxOptions.dontCacheBustURLsMatching = /\/\w+?\.[\w\d]+?\.(js|css|gif|png|jpe?g|svg)$/;
|
|
26
38
|
workboxOptions.modifyURLPrefix = {
|
|
27
39
|
'': assetsPrefix,
|
|
28
40
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../src/library/webpack/blocks/pwa/client.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,mEAAwD;AAGxD,iEAA8D;AAC9D,uEAAoE;AACpE,qCAA0C;AAEnC,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../src/library/webpack/blocks/pwa/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,13 +4,15 @@ exports.pwaSharedBlock = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
6
6
|
const pwaSharedBlock = (configManager) => (config) => {
|
|
7
|
-
const { experiments: { pwa }, rootDir, root, } = configManager;
|
|
7
|
+
const { experiments: { pwa }, rootDir, root, modern, } = configManager;
|
|
8
8
|
config.plugin('define').tap((args) => {
|
|
9
9
|
var _a, _b, _c, _d, _e, _f;
|
|
10
10
|
return [
|
|
11
11
|
Object.assign(Object.assign({}, args[0]), { 'process.env.TRAMVAI_PWA_WORKBOX_ENABLED': JSON.stringify((_a = pwa.workbox) === null || _a === void 0 ? void 0 : _a.enabled),
|
|
12
12
|
// @todo duplicated logic with path.join
|
|
13
|
-
'process.env.TRAMVAI_PWA_SW_SRC': JSON.stringify(path_1.default.join(rootDir, root, (_b = pwa.sw) === null || _b === void 0 ? void 0 : _b.src)), 'process.env.TRAMVAI_PWA_SW_DEST': JSON.stringify((_c = pwa.sw) === null || _c === void 0 ? void 0 : _c.dest), 'process.env.TRAMVAI_PWA_SW_SCOPE': JSON.stringify((_d = pwa.sw) === null || _d === void 0 ? void 0 : _d.scope), 'process.env.TRAMVAI_PWA_MANIFEST_ENABLED': JSON.stringify((_e = pwa.webmanifest) === null || _e === void 0 ? void 0 : _e.enabled), 'process.env.TRAMVAI_PWA_MANIFEST_DEST': JSON.stringify((_f = pwa.webmanifest) === null || _f === void 0 ? void 0 : _f.dest)
|
|
13
|
+
'process.env.TRAMVAI_PWA_SW_SRC': JSON.stringify(path_1.default.join(rootDir, root, (_b = pwa.sw) === null || _b === void 0 ? void 0 : _b.src)), 'process.env.TRAMVAI_PWA_SW_DEST': JSON.stringify((_c = pwa.sw) === null || _c === void 0 ? void 0 : _c.dest), 'process.env.TRAMVAI_PWA_SW_SCOPE': JSON.stringify((_d = pwa.sw) === null || _d === void 0 ? void 0 : _d.scope), 'process.env.TRAMVAI_PWA_MANIFEST_ENABLED': JSON.stringify((_e = pwa.webmanifest) === null || _e === void 0 ? void 0 : _e.enabled), 'process.env.TRAMVAI_PWA_MANIFEST_DEST': JSON.stringify((_f = pwa.webmanifest) === null || _f === void 0 ? void 0 : _f.dest),
|
|
14
|
+
// allows to detect that sw.modern.js is exists or not
|
|
15
|
+
'process.env.TRAMVAI_MODERN_BUILD': JSON.stringify(modern) }),
|
|
14
16
|
];
|
|
15
17
|
});
|
|
16
18
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/library/webpack/blocks/pwa/shared.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAKjB,MAAM,cAAc,GACzB,CAAC,aAAoD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC3E,MAAM,EACJ,WAAW,EAAE,EAAE,GAAG,EAAE,EACpB,OAAO,EACP,IAAI,
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/library/webpack/blocks/pwa/shared.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAKjB,MAAM,cAAc,GACzB,CAAC,aAAoD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC3E,MAAM,EACJ,WAAW,EAAE,EAAE,GAAG,EAAE,EACpB,OAAO,EACP,IAAI,EACJ,MAAM,GACP,GAAG,aAAa,CAAC;IAElB,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;;QAAC,OAAA;4CAE/B,IAAI,CAAC,CAAC,CAAC,KACV,yCAAyC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAA,GAAG,CAAC,OAAO,0CAAE,OAAO,CAAC;gBAC/E,wCAAwC;gBACxC,gCAAgC,EAAE,IAAI,CAAC,SAAS,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,MAAA,GAAG,CAAC,EAAE,0CAAE,GAAG,CAAC,CAAC,EACvF,iCAAiC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAA,GAAG,CAAC,EAAE,0CAAE,IAAI,CAAC,EAC/D,kCAAkC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAA,GAAG,CAAC,EAAE,0CAAE,KAAK,CAAC,EACjE,0CAA0C,EAAE,IAAI,CAAC,SAAS,CAAC,MAAA,GAAG,CAAC,WAAW,0CAAE,OAAO,CAAC,EACpF,uCAAuC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC;gBAC9E,sDAAsD;gBACtD,kCAAkC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;SAE7D,CAAA;KAAA,CAAC,CAAC;AACL,CAAC,CAAC;AAvBS,QAAA,cAAc,kBAuBvB"}
|
|
@@ -579,6 +579,20 @@
|
|
|
579
579
|
"type": "boolean"
|
|
580
580
|
}
|
|
581
581
|
]
|
|
582
|
+
},
|
|
583
|
+
"exclude": {
|
|
584
|
+
"title": "Array of regexp specifiers used to exclude assets from the precache manifest",
|
|
585
|
+
"type": "array",
|
|
586
|
+
"items": {
|
|
587
|
+
"type": "string"
|
|
588
|
+
}
|
|
589
|
+
},
|
|
590
|
+
"include": {
|
|
591
|
+
"title": "Array of regexp specifiers used to include assets in the precache manifest",
|
|
592
|
+
"type": "array",
|
|
593
|
+
"items": {
|
|
594
|
+
"type": "string"
|
|
595
|
+
}
|
|
582
596
|
}
|
|
583
597
|
},
|
|
584
598
|
"additionalProperties": false
|
|
@@ -641,6 +655,9 @@
|
|
|
641
655
|
},
|
|
642
656
|
"density": {
|
|
643
657
|
"type": "number"
|
|
658
|
+
},
|
|
659
|
+
"purpose": {
|
|
660
|
+
"type": "string"
|
|
644
661
|
}
|
|
645
662
|
},
|
|
646
663
|
"additionalProperties": false
|
|
@@ -56,6 +56,14 @@ export interface ApplicationExperiments extends Experiments {
|
|
|
56
56
|
* @default false
|
|
57
57
|
*/
|
|
58
58
|
enabled?: OverridableOption<boolean>;
|
|
59
|
+
/**
|
|
60
|
+
* @title Array of regexp specifiers used to exclude assets from the precache manifest
|
|
61
|
+
*/
|
|
62
|
+
exclude?: string[];
|
|
63
|
+
/**
|
|
64
|
+
* @title Array of regexp specifiers used to include assets in the precache manifest
|
|
65
|
+
*/
|
|
66
|
+
include?: string[];
|
|
59
67
|
};
|
|
60
68
|
/**
|
|
61
69
|
* @title WebManifest content (manifest.json or webmanifest will be generated based on this options)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tramvai/cli",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.104.0",
|
|
4
4
|
"description": "Cli инструмент для сборки и запуска приложений",
|
|
5
5
|
"files": [
|
|
6
6
|
"src",
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"@tinkoff/utils": "^2.1.3",
|
|
72
72
|
"@tinkoff/webpack-dedupe-plugin": "1.0.5",
|
|
73
73
|
"@tramvai/build": "3.1.3",
|
|
74
|
-
"@tramvai/react": "2.
|
|
74
|
+
"@tramvai/react": "2.104.0",
|
|
75
75
|
"@tramvai/tools-check-versions": "0.4.14",
|
|
76
76
|
"@tramvai/tools-migrate": "0.6.18",
|
|
77
77
|
"ajv": "^6.12.6",
|
package/schema.json
CHANGED
|
@@ -600,6 +600,20 @@
|
|
|
600
600
|
"type": "boolean"
|
|
601
601
|
}
|
|
602
602
|
]
|
|
603
|
+
},
|
|
604
|
+
"exclude": {
|
|
605
|
+
"title": "Array of regexp specifiers used to exclude assets from the precache manifest",
|
|
606
|
+
"type": "array",
|
|
607
|
+
"items": {
|
|
608
|
+
"type": "string"
|
|
609
|
+
}
|
|
610
|
+
},
|
|
611
|
+
"include": {
|
|
612
|
+
"title": "Array of regexp specifiers used to include assets in the precache manifest",
|
|
613
|
+
"type": "array",
|
|
614
|
+
"items": {
|
|
615
|
+
"type": "string"
|
|
616
|
+
}
|
|
603
617
|
}
|
|
604
618
|
},
|
|
605
619
|
"additionalProperties": false
|
|
@@ -662,6 +676,9 @@
|
|
|
662
676
|
},
|
|
663
677
|
"density": {
|
|
664
678
|
"type": "number"
|
|
679
|
+
},
|
|
680
|
+
"purpose": {
|
|
681
|
+
"type": "string"
|
|
665
682
|
}
|
|
666
683
|
},
|
|
667
684
|
"additionalProperties": false
|
|
@@ -25,6 +25,7 @@ export const sharedProviders: readonly Provider[] = [
|
|
|
25
25
|
useFactory: ({ configEntry, parameters }) =>
|
|
26
26
|
createConfigManager(configEntry as ApplicationConfigEntry, {
|
|
27
27
|
...parameters,
|
|
28
|
+
appEnv: parameters.env,
|
|
28
29
|
env: 'development',
|
|
29
30
|
port: detectPortSync(parameters.port ?? DEFAULT_PORT),
|
|
30
31
|
staticPort: detectPortSync(parameters.staticPort ?? DEFAULT_STATIC_PORT),
|
|
@@ -21,6 +21,7 @@ export const sharedProviders: readonly Provider[] = [
|
|
|
21
21
|
useFactory: ({ configEntry, parameters }) =>
|
|
22
22
|
createConfigManager(configEntry as ChildAppConfigEntry, {
|
|
23
23
|
...parameters,
|
|
24
|
+
appEnv: parameters.env,
|
|
24
25
|
env: 'development',
|
|
25
26
|
port: detectPortSync(parameters.port ?? DEFAULT_STATIC_MODULE_PORT),
|
|
26
27
|
}),
|
|
@@ -21,6 +21,7 @@ export const sharedProviders: readonly Provider[] = [
|
|
|
21
21
|
useFactory: ({ configEntry, parameters }) =>
|
|
22
22
|
createConfigManager(configEntry as ModuleConfigEntry, {
|
|
23
23
|
...parameters,
|
|
24
|
+
appEnv: parameters.env,
|
|
24
25
|
env: 'development',
|
|
25
26
|
port: detectPortSync(parameters.port ?? DEFAULT_STATIC_MODULE_PORT),
|
|
26
27
|
}),
|
|
@@ -27,6 +27,7 @@ export const applicationsProviders: readonly Provider[] = [
|
|
|
27
27
|
useFactory: ({ configEntry, parameters }: { configEntry: ConfigEntry; parameters: Params }) =>
|
|
28
28
|
createConfigManager(configEntry, {
|
|
29
29
|
...parameters,
|
|
30
|
+
appEnv: parameters.env,
|
|
30
31
|
env: 'production',
|
|
31
32
|
buildType: 'client',
|
|
32
33
|
port: detectPortSync(parameters.port ?? DEFAULT_PORT),
|
|
@@ -15,6 +15,7 @@ export const childAppProviders: readonly Provider[] = [
|
|
|
15
15
|
useFactory: ({ configEntry, parameters }) =>
|
|
16
16
|
createConfigManager(configEntry as ChildAppConfigEntry, {
|
|
17
17
|
...parameters,
|
|
18
|
+
appEnv: parameters.env,
|
|
18
19
|
env: 'production',
|
|
19
20
|
staticPort: detectPortSync(parameters.staticPort ?? DEFAULT_STATIC_MODULE_PORT),
|
|
20
21
|
buildType: 'client',
|
|
@@ -16,6 +16,9 @@ import type { Target } from '../typings/target';
|
|
|
16
16
|
|
|
17
17
|
// @TODO: maybe split settings depending on env?
|
|
18
18
|
export interface Settings<E extends Env> {
|
|
19
|
+
// env variables from @tramvai/cli JS api commands (not exists in process.env)
|
|
20
|
+
appEnv?: Record<string, any>;
|
|
21
|
+
// build environment
|
|
19
22
|
env?: E;
|
|
20
23
|
rootDir?: string;
|
|
21
24
|
version?: string;
|
|
@@ -104,7 +107,17 @@ export const createConfigManager = <C extends ConfigEntry = ConfigEntry, E exten
|
|
|
104
107
|
const { type } = configEntry;
|
|
105
108
|
const rootDir = settings.rootDir ?? process.cwd();
|
|
106
109
|
const debug = settings.debug ?? false;
|
|
107
|
-
const
|
|
110
|
+
const appEnv = settings.appEnv ?? {};
|
|
111
|
+
// First problem, modern build is not supported for CSR mode.
|
|
112
|
+
// Second, in development mode with enabled modern, only modern JS chunks will be generated.
|
|
113
|
+
// With PWA module, only sw.modern.js file exists - but in CSR mode application needs sw.js, which is not generated.
|
|
114
|
+
// In production mode with enabled modern, everything is ok - all type of chunks generated in parallel.
|
|
115
|
+
const disableModernForCsrInDevMode =
|
|
116
|
+
(process.env.TRAMVAI_FORCE_CLIENT_SIDE_RENDERING ||
|
|
117
|
+
appEnv.TRAMVAI_FORCE_CLIENT_SIDE_RENDERING) === 'true' && env === 'development';
|
|
118
|
+
const modern = disableModernForCsrInDevMode
|
|
119
|
+
? false
|
|
120
|
+
: getOption('modern', [settings, configEntry], true);
|
|
108
121
|
const buildType = settings.buildType ?? 'client';
|
|
109
122
|
let target: Target = 'defaults';
|
|
110
123
|
|
|
@@ -135,6 +148,7 @@ export const createConfigManager = <C extends ConfigEntry = ConfigEntry, E exten
|
|
|
135
148
|
showConfig: false,
|
|
136
149
|
csr: false,
|
|
137
150
|
...settings,
|
|
151
|
+
appEnv,
|
|
138
152
|
env,
|
|
139
153
|
rootDir,
|
|
140
154
|
buildType,
|
|
@@ -8,6 +8,7 @@ import { WebManifestPlugin } from '../../plugins/WebManifestPlugin';
|
|
|
8
8
|
import { pwaSharedBlock } from './shared';
|
|
9
9
|
|
|
10
10
|
export const pwaBlock =
|
|
11
|
+
// eslint-disable-next-line max-statements
|
|
11
12
|
(configManager: ConfigManager<ApplicationConfigEntry>) => (config: Config) => {
|
|
12
13
|
const {
|
|
13
14
|
experiments: { pwa },
|
|
@@ -35,7 +36,19 @@ export const pwaBlock =
|
|
|
35
36
|
maximumFileSizeToCacheInBytes: 10 * 1024 * 1024,
|
|
36
37
|
};
|
|
37
38
|
|
|
39
|
+
if (pwa.workbox.include) {
|
|
40
|
+
workboxOptions.include = pwa.workbox.include.map((expr) => new RegExp(expr));
|
|
41
|
+
}
|
|
42
|
+
if (pwa.workbox.exclude) {
|
|
43
|
+
workboxOptions.exclude = [
|
|
44
|
+
...workboxOptions.exclude,
|
|
45
|
+
...pwa.workbox.exclude.map((expr) => new RegExp(expr)),
|
|
46
|
+
];
|
|
47
|
+
}
|
|
48
|
+
|
|
38
49
|
if (env === 'production') {
|
|
50
|
+
workboxOptions.dontCacheBustURLsMatching = /\/\w+?\.[\w\d]+?\.(js|css|gif|png|jpe?g|svg)$/;
|
|
51
|
+
|
|
39
52
|
workboxOptions.modifyURLPrefix = {
|
|
40
53
|
'': assetsPrefix,
|
|
41
54
|
};
|
|
@@ -9,6 +9,7 @@ export const pwaSharedBlock =
|
|
|
9
9
|
experiments: { pwa },
|
|
10
10
|
rootDir,
|
|
11
11
|
root,
|
|
12
|
+
modern,
|
|
12
13
|
} = configManager;
|
|
13
14
|
|
|
14
15
|
config.plugin('define').tap((args) => [
|
|
@@ -21,6 +22,8 @@ export const pwaSharedBlock =
|
|
|
21
22
|
'process.env.TRAMVAI_PWA_SW_SCOPE': JSON.stringify(pwa.sw?.scope),
|
|
22
23
|
'process.env.TRAMVAI_PWA_MANIFEST_ENABLED': JSON.stringify(pwa.webmanifest?.enabled),
|
|
23
24
|
'process.env.TRAMVAI_PWA_MANIFEST_DEST': JSON.stringify(pwa.webmanifest?.dest),
|
|
25
|
+
// allows to detect that sw.modern.js is exists or not
|
|
26
|
+
'process.env.TRAMVAI_MODERN_BUILD': JSON.stringify(modern),
|
|
24
27
|
},
|
|
25
28
|
]);
|
|
26
29
|
};
|
|
@@ -579,6 +579,20 @@
|
|
|
579
579
|
"type": "boolean"
|
|
580
580
|
}
|
|
581
581
|
]
|
|
582
|
+
},
|
|
583
|
+
"exclude": {
|
|
584
|
+
"title": "Array of regexp specifiers used to exclude assets from the precache manifest",
|
|
585
|
+
"type": "array",
|
|
586
|
+
"items": {
|
|
587
|
+
"type": "string"
|
|
588
|
+
}
|
|
589
|
+
},
|
|
590
|
+
"include": {
|
|
591
|
+
"title": "Array of regexp specifiers used to include assets in the precache manifest",
|
|
592
|
+
"type": "array",
|
|
593
|
+
"items": {
|
|
594
|
+
"type": "string"
|
|
595
|
+
}
|
|
582
596
|
}
|
|
583
597
|
},
|
|
584
598
|
"additionalProperties": false
|
|
@@ -641,6 +655,9 @@
|
|
|
641
655
|
},
|
|
642
656
|
"density": {
|
|
643
657
|
"type": "number"
|
|
658
|
+
},
|
|
659
|
+
"purpose": {
|
|
660
|
+
"type": "string"
|
|
644
661
|
}
|
|
645
662
|
},
|
|
646
663
|
"additionalProperties": false
|
|
@@ -60,6 +60,14 @@ export interface ApplicationExperiments extends Experiments {
|
|
|
60
60
|
* @default false
|
|
61
61
|
*/
|
|
62
62
|
enabled?: OverridableOption<boolean>;
|
|
63
|
+
/**
|
|
64
|
+
* @title Array of regexp specifiers used to exclude assets from the precache manifest
|
|
65
|
+
*/
|
|
66
|
+
exclude?: string[];
|
|
67
|
+
/**
|
|
68
|
+
* @title Array of regexp specifiers used to include assets in the precache manifest
|
|
69
|
+
*/
|
|
70
|
+
include?: string[];
|
|
63
71
|
};
|
|
64
72
|
/**
|
|
65
73
|
* @title WebManifest content (manifest.json or webmanifest will be generated based on this options)
|