@tramvai/cli 5.53.81 → 5.53.111
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/README.md +1 -1
- package/bin/const.js +5 -0
- package/bin/platform.js +12 -6
- package/bin/spawn.js +6 -0
- package/lib/api/analyze/index.d.ts.map +1 -1
- package/lib/api/analyze/index.js +1 -13
- package/lib/api/analyze/index.js.map +1 -1
- package/lib/api/benchmark/build.d.ts +1 -6
- package/lib/api/benchmark/build.d.ts.map +1 -1
- package/lib/api/benchmark/build.js +59 -23
- package/lib/api/benchmark/build.js.map +1 -1
- package/lib/api/benchmark/const.d.ts +2 -0
- package/lib/api/benchmark/const.d.ts.map +1 -0
- package/lib/api/benchmark/const.js +5 -0
- package/lib/api/benchmark/const.js.map +1 -0
- package/lib/api/benchmark/index.d.ts +4 -6
- package/lib/api/benchmark/index.d.ts.map +1 -1
- package/lib/api/benchmark/index.js.map +1 -1
- package/lib/api/benchmark/start.d.ts +1 -7
- package/lib/api/benchmark/start.d.ts.map +1 -1
- package/lib/api/benchmark/start.js +56 -49
- package/lib/api/benchmark/start.js.map +1 -1
- package/lib/api/benchmark/types.d.ts +76 -12
- package/lib/api/benchmark/types.d.ts.map +1 -1
- package/lib/api/benchmark/utils/compilationUtils.d.ts +4 -0
- package/lib/api/benchmark/utils/compilationUtils.d.ts.map +1 -0
- package/lib/api/benchmark/utils/compilationUtils.js +157 -0
- package/lib/api/benchmark/utils/compilationUtils.js.map +1 -0
- package/lib/api/benchmark/utils/stats.d.ts +2 -7
- package/lib/api/benchmark/utils/stats.d.ts.map +1 -1
- package/lib/api/benchmark/utils/stats.js +36 -22
- package/lib/api/benchmark/utils/stats.js.map +1 -1
- package/lib/api/build/index.d.ts +1 -0
- package/lib/api/build/index.d.ts.map +1 -1
- package/lib/api/build/index.js.map +1 -1
- package/lib/api/index.js +1 -1
- package/lib/api/index.js.map +1 -1
- package/lib/api/start/index.d.ts +1 -0
- package/lib/api/start/index.d.ts.map +1 -1
- package/lib/api/start/index.js.map +1 -1
- package/lib/builder/webpack/analyzePlugins/rsdoctor.d.ts +5 -5
- package/lib/builder/webpack/analyzePlugins/rsdoctor.d.ts.map +1 -1
- package/lib/builder/webpack/analyzePlugins/rsdoctor.js +7 -9
- package/lib/builder/webpack/analyzePlugins/rsdoctor.js.map +1 -1
- package/lib/builder/webpack/index.d.ts.map +1 -1
- package/lib/builder/webpack/index.js +14 -12
- package/lib/builder/webpack/index.js.map +1 -1
- package/lib/builder/webpack/providers/build/client.d.ts.map +1 -1
- package/lib/builder/webpack/providers/build/client.js +3 -2
- package/lib/builder/webpack/providers/build/client.js.map +1 -1
- package/lib/builder/webpack/providers/build/server.d.ts.map +1 -1
- package/lib/builder/webpack/providers/build/server.js +3 -2
- package/lib/builder/webpack/providers/build/server.js.map +1 -1
- package/lib/builder/webpack/providers/shared.d.ts.map +1 -1
- package/lib/builder/webpack/providers/shared.js +39 -5
- package/lib/builder/webpack/providers/shared.js.map +1 -1
- package/lib/builder/webpack/providers/start/shared.d.ts.map +1 -1
- package/lib/builder/webpack/providers/start/shared.js +6 -2
- package/lib/builder/webpack/providers/start/shared.js.map +1 -1
- package/lib/builder/webpack/tokens.d.ts +10 -16
- package/lib/builder/webpack/tokens.d.ts.map +1 -1
- package/lib/cli/index.d.ts.map +1 -1
- package/lib/cli/index.js +12 -12
- package/lib/cli/index.js.map +1 -1
- package/lib/commands/analyze/command.d.ts +1 -1
- package/lib/commands/analyze/command.d.ts.map +1 -1
- package/lib/commands/benchmark/benchmark.d.ts +3 -1
- package/lib/commands/benchmark/benchmark.d.ts.map +1 -1
- package/lib/commands/benchmark/benchmark.js +130 -31
- package/lib/commands/benchmark/benchmark.js.map +1 -1
- package/lib/commands/benchmark/command.d.ts +9 -0
- package/lib/commands/benchmark/command.d.ts.map +1 -1
- package/lib/commands/benchmark/command.js +12 -0
- package/lib/commands/benchmark/command.js.map +1 -1
- package/lib/commands/build/command.d.ts.map +1 -1
- package/lib/commands/build/command.js +5 -0
- package/lib/commands/build/command.js.map +1 -1
- package/lib/commands/start/command.d.ts.map +1 -1
- package/lib/commands/start/command.js +5 -0
- package/lib/commands/start/command.js.map +1 -1
- package/lib/commands/update/checkVersionValidator.d.ts +1 -1
- package/lib/commands/update/checkVersionValidator.d.ts.map +1 -1
- package/lib/commands/update/checkVersionValidator.js +3 -2
- package/lib/commands/update/checkVersionValidator.js.map +1 -1
- package/lib/commands/update/command.d.ts +1 -1
- package/lib/commands/update/dependantLibs.d.ts +1 -1
- package/lib/commands/update/dependantLibs.d.ts.map +1 -1
- package/lib/commands/update/dependantLibs.js +3 -2
- package/lib/commands/update/dependantLibs.js.map +1 -1
- package/lib/commands/update/update.d.ts.map +1 -1
- package/lib/commands/update/update.js +6 -3
- package/lib/commands/update/update.js.map +1 -1
- package/lib/commands/update/updatePackageJson.d.ts +1 -1
- package/lib/commands/update/updatePackageJson.d.ts.map +1 -1
- package/lib/commands/update/updatePackageJson.js +7 -7
- package/lib/commands/update/updatePackageJson.js.map +1 -1
- package/lib/config/configManager.d.ts +2 -0
- package/lib/config/configManager.d.ts.map +1 -1
- package/lib/config/configManager.js +2 -0
- package/lib/config/configManager.js.map +1 -1
- package/lib/di/tokens/config.d.ts +5 -8
- package/lib/di/tokens/config.d.ts.map +1 -1
- package/lib/library/webpack/blocks/css.d.ts.map +1 -1
- package/lib/library/webpack/blocks/css.js +42 -15
- package/lib/library/webpack/blocks/css.js.map +1 -1
- package/lib/library/webpack/blocks/js.d.ts.map +1 -1
- package/lib/library/webpack/blocks/js.js +57 -11
- package/lib/library/webpack/blocks/js.js.map +1 -1
- package/lib/library/webpack/common/main.d.ts.map +1 -1
- package/lib/library/webpack/common/main.js +7 -0
- package/lib/library/webpack/common/main.js.map +1 -1
- package/lib/library/webpack/utils/browserslist.d.ts +4 -0
- package/lib/library/webpack/utils/browserslist.d.ts.map +1 -0
- package/lib/library/webpack/utils/browserslist.js +27 -0
- package/lib/library/webpack/utils/browserslist.js.map +1 -0
- package/lib/library/webpack/utils/rsdoctor.d.ts +2 -0
- package/lib/library/webpack/utils/rsdoctor.d.ts.map +1 -0
- package/lib/library/webpack/utils/rsdoctor.js +27 -0
- package/lib/library/webpack/utils/rsdoctor.js.map +1 -0
- package/lib/library/webpack/utils/threadLoader.d.ts.map +1 -1
- package/lib/library/webpack/utils/threadLoader.js +3 -3
- package/lib/library/webpack/utils/threadLoader.js.map +1 -1
- package/lib/library/webpack/utils/transpiler.d.ts.map +1 -1
- package/lib/library/webpack/utils/transpiler.js +3 -16
- package/lib/library/webpack/utils/transpiler.js.map +1 -1
- package/lib/schema/autogeneratedSchema.json +240 -120
- package/lib/typings/build/Builder.d.ts +6 -2
- package/lib/typings/build/Builder.d.ts.map +1 -1
- package/lib/typings/configEntry/cli.d.ts +9 -0
- package/lib/typings/configEntry/cli.d.ts.map +1 -1
- package/lib/utils/commands/dependencies/getLatestPackageVersion.d.ts +1 -1
- package/lib/utils/commands/dependencies/getLatestPackageVersion.d.ts.map +1 -1
- package/lib/utils/commands/dependencies/getLatestPackageVersion.js +4 -2
- package/lib/utils/commands/dependencies/getLatestPackageVersion.js.map +1 -1
- package/lib/utils/commands/dependencies/packageHasVersion.d.ts +1 -1
- package/lib/utils/commands/dependencies/packageHasVersion.d.ts.map +1 -1
- package/lib/utils/commands/dependencies/packageHasVersion.js +3 -2
- package/lib/utils/commands/dependencies/packageHasVersion.js.map +1 -1
- package/package.json +19 -18
- package/schema.json +240 -120
- package/src/api/analyze/index.ts +3 -16
- package/src/api/benchmark/__integration__/start.test.ts +10 -12
- package/src/api/benchmark/build.ts +75 -30
- package/src/api/benchmark/const.ts +1 -0
- package/src/api/benchmark/index.ts +4 -6
- package/src/api/benchmark/start.ts +69 -65
- package/src/api/benchmark/types.ts +82 -14
- package/src/api/benchmark/utils/compilationUtils.ts +213 -0
- package/src/api/benchmark/utils/stats.ts +45 -28
- package/src/api/build/index.ts +1 -0
- package/src/api/index.ts +1 -1
- package/src/api/start/index.ts +1 -0
- package/src/builder/webpack/analyzePlugins/rsdoctor.ts +11 -14
- package/src/builder/webpack/index.ts +16 -21
- package/src/builder/webpack/providers/build/client.ts +7 -2
- package/src/builder/webpack/providers/build/server.ts +7 -2
- package/src/builder/webpack/providers/shared.ts +53 -5
- package/src/builder/webpack/providers/start/shared.ts +7 -2
- package/src/cli/index.ts +3 -2
- package/src/commands/analyze/command.ts +1 -1
- package/src/commands/benchmark/benchmark.ts +168 -33
- package/src/commands/benchmark/command.ts +12 -0
- package/src/commands/build/command.ts +6 -0
- package/src/commands/new/templates/shared/package.json.hbs +1 -1
- package/src/commands/start/command.ts +6 -0
- package/src/commands/update/checkVersionValidator.ts +4 -2
- package/src/commands/update/dependantLibs.ts +3 -1
- package/src/commands/update/update.ts +6 -3
- package/src/commands/update/updatePackageJson.spec.ts +19 -3
- package/src/commands/update/updatePackageJson.ts +7 -2
- package/src/config/configManager.ts +4 -0
- package/src/library/webpack/blocks/css.ts +52 -16
- package/src/library/webpack/blocks/js.ts +61 -12
- package/src/library/webpack/common/main.ts +8 -0
- package/src/library/webpack/utils/browserslist.ts +29 -0
- package/src/library/webpack/utils/rsdoctor.ts +26 -0
- package/src/library/webpack/utils/threadLoader.ts +1 -0
- package/src/library/webpack/utils/transpiler.ts +3 -18
- package/src/models/config.spec.ts +4 -0
- package/src/schema/autogeneratedSchema.json +240 -120
- package/src/schema/tramvai.spec.ts +2 -0
- package/src/typings/build/Builder.ts +7 -2
- package/src/typings/configEntry/cli.ts +11 -0
- package/src/utils/commands/dependencies/getLatestPackageVersion.ts +4 -1
- package/src/utils/commands/dependencies/packageHasVersion.ts +7 -2
- package/lib/api/analyze/providers/shared.d.ts +0 -3
- package/lib/api/analyze/providers/shared.d.ts.map +0 -1
- package/lib/api/analyze/providers/shared.js +0 -23
- package/lib/api/analyze/providers/shared.js.map +0 -1
- package/lib/builder/webpack/providers/analyze/shared.d.ts +0 -3
- package/lib/builder/webpack/providers/analyze/shared.d.ts.map +0 -1
- package/lib/builder/webpack/providers/analyze/shared.js +0 -141
- package/lib/builder/webpack/providers/analyze/shared.js.map +0 -1
- package/src/api/analyze/providers/shared.ts +0 -26
- package/src/api/benchmark/utils/stats.spec.ts +0 -36
- package/src/builder/webpack/providers/analyze/shared.ts +0 -160
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/commands/start/command.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/commands/start/command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkVersionValidator.d.ts","sourceRoot":"","sources":["../../../src/commands/update/checkVersionValidator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,eAAO,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"checkVersionValidator.d.ts","sourceRoot":"","sources":["../../../src/commands/update/checkVersionValidator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,eAAO,MAAM,YAAY,kCAA+C,MAAM;;;EAkB7E,CAAC"}
|
|
@@ -2,14 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.checkVersion = void 0;
|
|
4
4
|
const packageHasVersion_1 = require("../../utils/commands/dependencies/packageHasVersion");
|
|
5
|
-
const checkVersion = async (
|
|
5
|
+
const checkVersion = async (context, { to: version = 'latest' }) => {
|
|
6
6
|
if (version === 'latest') {
|
|
7
7
|
return {
|
|
8
8
|
name: 'checkVersion',
|
|
9
9
|
status: 'ok',
|
|
10
10
|
};
|
|
11
11
|
}
|
|
12
|
-
|
|
12
|
+
const registryUrl = await context.packageManager.getRegistryUrl();
|
|
13
|
+
if (await (0, packageHasVersion_1.packageHasVersion)('@tramvai/core', version, registryUrl)) {
|
|
13
14
|
return {
|
|
14
15
|
name: 'checkVersion',
|
|
15
16
|
status: 'ok',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkVersionValidator.js","sourceRoot":"","sources":["../../../src/commands/update/checkVersionValidator.ts"],"names":[],"mappings":";;;AAAA,2FAAwF;AAGjF,MAAM,YAAY,GAAG,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"checkVersionValidator.js","sourceRoot":"","sources":["../../../src/commands/update/checkVersionValidator.ts"],"names":[],"mappings":";;;AAAA,2FAAwF;AAGjF,MAAM,YAAY,GAAG,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,OAAO,GAAG,QAAQ,EAAU,EAAE,EAAE;IAChF,IAAI,OAAO,KAAK,QAAQ,EAAE;QACxB,OAAO;YACL,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,IAAI;SACb,CAAC;KACH;IAED,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;IAElE,IAAI,MAAM,IAAA,qCAAiB,EAAC,eAAe,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAClE,OAAO;YACL,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,IAAI;SACb,CAAC;KACH;IAED,MAAM,IAAI,KAAK,CAAC,mBAAmB,OAAO,iBAAiB,CAAC,CAAC;AAC/D,CAAC,CAAC;AAlBW,QAAA,YAAY,gBAkBvB"}
|
|
@@ -11,7 +11,7 @@ declare class UpdateCommand extends CLICommand {
|
|
|
11
11
|
description: string;
|
|
12
12
|
}[];
|
|
13
13
|
alias: string;
|
|
14
|
-
validators: ((
|
|
14
|
+
validators: ((context: any, { to: version }: Params) => Promise<{
|
|
15
15
|
name: string;
|
|
16
16
|
status: string;
|
|
17
17
|
}>)[];
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { Ora } from 'ora';
|
|
2
|
-
export declare const getLibPackageVersion: (name: string, version: string, resolvedVersion: string, spinner: Ora) => Promise<string | undefined>;
|
|
2
|
+
export declare const getLibPackageVersion: (name: string, version: string, resolvedVersion: string, registryUrl: string, spinner: Ora) => Promise<string | undefined>;
|
|
3
3
|
//# sourceMappingURL=dependantLibs.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependantLibs.d.ts","sourceRoot":"","sources":["../../../src/commands/update/dependantLibs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG/B,eAAO,MAAM,oBAAoB,SACzB,MAAM,WACH,MAAM,mBACE,MAAM,
|
|
1
|
+
{"version":3,"file":"dependantLibs.d.ts","sourceRoot":"","sources":["../../../src/commands/update/dependantLibs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG/B,eAAO,MAAM,oBAAoB,SACzB,MAAM,WACH,MAAM,mBACE,MAAM,eACV,MAAM,WACV,GAAG,KACX,QAAQ,MAAM,GAAG,SAAS,CAiC5B,CAAC"}
|
|
@@ -5,11 +5,12 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const latest_version_1 = tslib_1.__importDefault(require("latest-version"));
|
|
6
6
|
const package_json_1 = tslib_1.__importDefault(require("package-json"));
|
|
7
7
|
const tramvaiVersions_1 = require("../../utils/tramvaiVersions");
|
|
8
|
-
const getLibPackageVersion = async (name, version, resolvedVersion, spinner) => {
|
|
8
|
+
const getLibPackageVersion = async (name, version, resolvedVersion, registryUrl, spinner) => {
|
|
9
9
|
const unifiedModule = tramvaiVersions_1.DEPENDANT_LIBS_MAP.get(name);
|
|
10
10
|
if (!unifiedModule) {
|
|
11
11
|
try {
|
|
12
|
-
|
|
12
|
+
// @ts-expect-error uncomplete type definition, `registryUrl` is supported
|
|
13
|
+
return await (0, latest_version_1.default)(name, { version, registryUrl });
|
|
13
14
|
}
|
|
14
15
|
catch (e) {
|
|
15
16
|
// clear the spinner to be able to log info that should be preserved in the output
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependantLibs.js","sourceRoot":"","sources":["../../../src/commands/update/dependantLibs.ts"],"names":[],"mappings":";;;;AAAA,4EAAqD;AACrD,wEAA0C;AAE1C,iEAAiE;AAE1D,MAAM,oBAAoB,GAAG,KAAK,EACvC,IAAY,EACZ,OAAe,EACf,eAAuB,EACvB,OAAY,EACiB,EAAE;IAC/B,MAAM,aAAa,GAAG,oCAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,aAAa,EAAE;QAClB,IAAI;YACF,OAAO,MAAM,IAAA,wBAAuB,EAAC,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"dependantLibs.js","sourceRoot":"","sources":["../../../src/commands/update/dependantLibs.ts"],"names":[],"mappings":";;;;AAAA,4EAAqD;AACrD,wEAA0C;AAE1C,iEAAiE;AAE1D,MAAM,oBAAoB,GAAG,KAAK,EACvC,IAAY,EACZ,OAAe,EACf,eAAuB,EACvB,WAAmB,EACnB,OAAY,EACiB,EAAE;IAC/B,MAAM,aAAa,GAAG,oCAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,aAAa,EAAE;QAClB,IAAI;YACF,0EAA0E;YAC1E,OAAO,MAAM,IAAA,wBAAuB,EAAC,IAAI,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;SACtE;QAAC,OAAO,CAAC,EAAE;YACV,kFAAkF;YAClF,gFAAgF;YAChF,OAAO,CAAC,KAAK,EAAE,CAAC;YAEhB,OAAO,CAAC,IAAI,CAAC,6CAA6C,IAAI;6CACvB,CAAC,CAAC;YAEzC,OAAO;SACR;KACF;IAED,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAA,sBAAc,EAAC,aAAa,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC;IAE3F,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;QACvB,kFAAkF;QAClF,gFAAgF;QAChF,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,OAAO,CAAC,IAAI,CAAC,6CAA6C,IAAI;6CACrB,CAAC,CAAC;QAE3C,OAAO;KACR;IAED,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC,CAAC;AAvCW,QAAA,oBAAoB,wBAuC/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/commands/update/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAQ1D,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;kCAGS,OAAO,wBACiB,MAAM,KACtC,QAAQ,aAAa,CAAC;AAHzB,
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/commands/update/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAQ1D,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;kCAGS,OAAO,wBACiB,MAAM,KACtC,QAAQ,aAAa,CAAC;AAHzB,wBA0EE"}
|
|
@@ -6,7 +6,10 @@ const updatePackageJson_1 = require("./updatePackageJson");
|
|
|
6
6
|
const checkVersions_1 = require("../../utils/commands/dependencies/checkVersions");
|
|
7
7
|
const findTramvaiVersion_1 = require("../../utils/commands/dependencies/findTramvaiVersion");
|
|
8
8
|
exports.default = async (context, { to: version = 'latest', tag }) => {
|
|
9
|
-
const
|
|
9
|
+
const registry = await context.packageManager.getRegistryUrl();
|
|
10
|
+
const resolvedVersion = tag
|
|
11
|
+
? version
|
|
12
|
+
: await (0, getLatestPackageVersion_1.getLatestPackageVersion)('@tramvai/cli', registry, version);
|
|
10
13
|
const currentVersion = await (0, findTramvaiVersion_1.findTramvaiVersion)();
|
|
11
14
|
if (!currentVersion) {
|
|
12
15
|
throw new Error('Could not resolve tramvai version from package.json. Do you have @tramvai/core installed?');
|
|
@@ -20,9 +23,9 @@ exports.default = async (context, { to: version = 'latest', tag }) => {
|
|
|
20
23
|
message: `Next tramvai version resolved to ${tag ? 'tag' : 'version'} "${resolvedVersion}", current version is "${currentVersion}"`,
|
|
21
24
|
});
|
|
22
25
|
if (context.packageManager.workspaces) {
|
|
23
|
-
await Promise.all(context.packageManager.workspaces.map((directory) => (0, updatePackageJson_1.updatePackageJson)(version, resolvedVersion, currentVersion, tag, directory)));
|
|
26
|
+
await Promise.all(context.packageManager.workspaces.map((directory) => (0, updatePackageJson_1.updatePackageJson)(version, resolvedVersion, currentVersion, registry, tag, directory)));
|
|
24
27
|
}
|
|
25
|
-
await (0, updatePackageJson_1.updatePackageJson)(version, resolvedVersion, currentVersion, tag);
|
|
28
|
+
await (0, updatePackageJson_1.updatePackageJson)(version, resolvedVersion, currentVersion, registry, tag);
|
|
26
29
|
context.logger.event({
|
|
27
30
|
type: 'info',
|
|
28
31
|
event: 'install',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/commands/update/update.ts"],"names":[],"mappings":";;AAEA,uGAAoG;AACpG,uEAAoE;AACpE,2DAAwD;AACxD,mFAAgF;AAEhF,6FAA0F;AAO1F,kBAAe,KAAK,EAClB,OAAgB,EAChB,EAAE,EAAE,EAAE,OAAO,GAAG,QAAQ,EAAE,GAAG,EAAU,EACf,EAAE;IAC1B,MAAM,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/commands/update/update.ts"],"names":[],"mappings":";;AAEA,uGAAoG;AACpG,uEAAoE;AACpE,2DAAwD;AACxD,mFAAgF;AAEhF,6FAA0F;AAO1F,kBAAe,KAAK,EAClB,OAAgB,EAChB,EAAE,EAAE,EAAE,OAAO,GAAG,QAAQ,EAAE,GAAG,EAAU,EACf,EAAE;IAC1B,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;IAC/D,MAAM,eAAe,GAAG,GAAG;QACzB,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,MAAM,IAAA,iDAAuB,EAAC,cAAc,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IACrE,MAAM,cAAc,GAAG,MAAM,IAAA,uCAAkB,GAAE,CAAC;IAElD,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,2FAA2F,CAC5F,CAAC;KACH;IAED,IAAI,cAAc,KAAK,OAAO,IAAI,cAAc,KAAK,eAAe,EAAE;QACpE,MAAM,IAAI,KAAK,CACb,+EAA+E,CAChF,CAAC;KACH;IAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACnB,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,mBAAmB;QAC1B,OAAO,EAAE,oCAAoC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,KAAK,eAAe,0BAA0B,cAAc,GAAG;KACpI,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,cAAc,CAAC,UAAU,EAAE;QACrC,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAClD,IAAA,qCAAiB,EAAC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,CAAC,CACtF,CACF,CAAC;KACH;IAED,MAAM,IAAA,qCAAiB,EAAC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;IAEjF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACnB,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,SAAS;QAChB,OAAO,EAAE,yBAAyB;KACnC,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAE3D,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,KAAK,KAAK,EAAE;QACzC,6CAA6C;QAC7C,8BAA8B;QAC9B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACnB,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,QAAQ;YACf,OAAO,EAAE,0BAA0B;SACpC,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;KAC3D;IAED,MAAM,IAAA,iBAAO,EAAC,OAAO,CAAC,CAAC;IAEvB,MAAM,IAAA,6BAAa,EAAC,OAAO,CAAC,CAAC;IAE7B,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,KAAK,KAAK,EAAE;QACzC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACnB,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,QAAQ;YACf,OAAO,EACL,8FAA8F;SACjG,CAAC,CAAC;KACJ;IAED,OAAO,OAAO,CAAC,OAAO,CAAC;QACrB,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const updatePackageJson: (version: string, resolvedVersion: string, currentVersion: string, tag?: boolean, path?: string) => Promise<void>;
|
|
1
|
+
export declare const updatePackageJson: (version: string, resolvedVersion: string, currentVersion: string, registryUrl: string, tag?: boolean, path?: string) => Promise<void>;
|
|
2
2
|
//# sourceMappingURL=updatePackageJson.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updatePackageJson.d.ts","sourceRoot":"","sources":["../../../src/commands/update/updatePackageJson.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"updatePackageJson.d.ts","sourceRoot":"","sources":["../../../src/commands/update/updatePackageJson.ts"],"names":[],"mappings":"AA6DA,eAAO,MAAM,iBAAiB,YACnB,MAAM,mBACE,MAAM,kBACP,MAAM,eACT,MAAM,QACb,OAAO,iCA0Cd,CAAC"}
|
|
@@ -9,7 +9,7 @@ const path_1 = require("path");
|
|
|
9
9
|
const packageHasVersion_1 = require("../../utils/commands/dependencies/packageHasVersion");
|
|
10
10
|
const dependantLibs_1 = require("./dependantLibs");
|
|
11
11
|
const tramvaiVersions_1 = require("../../utils/tramvaiVersions");
|
|
12
|
-
const updateDependencies = (dependencies = {}, version, resolvedVersion, currentVersion, tag, spinner) => {
|
|
12
|
+
const updateDependencies = (dependencies = {}, version, resolvedVersion, currentVersion, tag, registryUrl, spinner) => {
|
|
13
13
|
return (0, p_map_1.default)(Object.keys(dependencies), async (dep) => {
|
|
14
14
|
let nextVersion;
|
|
15
15
|
if ((0, tramvaiVersions_1.isUnifiedVersion)(dep) && dependencies[dep] === currentVersion) {
|
|
@@ -18,11 +18,11 @@ const updateDependencies = (dependencies = {}, version, resolvedVersion, current
|
|
|
18
18
|
else if ((0, tramvaiVersions_1.isDependantLib)(dep)) {
|
|
19
19
|
const libVersion = tag
|
|
20
20
|
? resolvedVersion
|
|
21
|
-
: await (0, dependantLibs_1.getLibPackageVersion)(dep, version, resolvedVersion, spinner);
|
|
21
|
+
: await (0, dependantLibs_1.getLibPackageVersion)(dep, version, resolvedVersion, registryUrl, spinner);
|
|
22
22
|
nextVersion = libVersion;
|
|
23
23
|
}
|
|
24
24
|
if (nextVersion) {
|
|
25
|
-
const depHasVersion = await (0, packageHasVersion_1.packageHasVersion)(dep, nextVersion);
|
|
25
|
+
const depHasVersion = await (0, packageHasVersion_1.packageHasVersion)(dep, nextVersion, registryUrl);
|
|
26
26
|
// clear the spinner to be able to log info that should be preserved in the output
|
|
27
27
|
// the idea borrowed from [here](https://github.com/sindresorhus/ora/issues/120)
|
|
28
28
|
spinner.clear();
|
|
@@ -43,15 +43,15 @@ const updateDependencies = (dependencies = {}, version, resolvedVersion, current
|
|
|
43
43
|
concurrency: 10,
|
|
44
44
|
});
|
|
45
45
|
};
|
|
46
|
-
const updatePackageJson = async (version, resolvedVersion, currentVersion, tag, path = '.') => {
|
|
46
|
+
const updatePackageJson = async (version, resolvedVersion, currentVersion, registryUrl, tag, path = '.') => {
|
|
47
47
|
const packageJsonPath = (0, path_1.resolve)(path, 'package.json');
|
|
48
48
|
const file = fs_1.default.readFileSync(packageJsonPath);
|
|
49
49
|
const content = JSON.parse(file.toString());
|
|
50
50
|
const spinner = (0, ora_1.default)(`Updating package.json versions`).start();
|
|
51
51
|
try {
|
|
52
|
-
await updateDependencies(content.dependencies, version, resolvedVersion, currentVersion, tag, spinner);
|
|
53
|
-
await updateDependencies(content.devDependencies, version, resolvedVersion, currentVersion, tag, spinner);
|
|
54
|
-
await updateDependencies(content.peerDependencies, version, resolvedVersion, currentVersion, tag, spinner);
|
|
52
|
+
await updateDependencies(content.dependencies, version, resolvedVersion, currentVersion, tag, registryUrl, spinner);
|
|
53
|
+
await updateDependencies(content.devDependencies, version, resolvedVersion, currentVersion, tag, registryUrl, spinner);
|
|
54
|
+
await updateDependencies(content.peerDependencies, version, resolvedVersion, currentVersion, tag, registryUrl, spinner);
|
|
55
55
|
fs_1.default.writeFileSync(packageJsonPath, JSON.stringify(content, null, 2));
|
|
56
56
|
}
|
|
57
57
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updatePackageJson.js","sourceRoot":"","sources":["../../../src/commands/update/updatePackageJson.ts"],"names":[],"mappings":";;;;AAAA,oDAAoB;AACpB,0DAAyB;AAEzB,sDAAsB;AACtB,+BAA+B;AAC/B,2FAAwF;AACxF,mDAAuD;AACvD,iEAA+E;AAE/E,MAAM,kBAAkB,GAAG,CACzB,eAAuC,EAAE,EACzC,OAAe,EACf,eAAuB,EACvB,cAAsB,EACtB,GAAY,EACZ,OAAY,EACZ,EAAE;IACF,OAAO,IAAA,eAAI,EACT,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EACzB,KAAK,EAAE,GAAG,EAAE,EAAE;QACZ,IAAI,WAA+B,CAAC;QAEpC,IAAI,IAAA,kCAAgB,EAAC,GAAG,CAAC,IAAI,YAAY,CAAC,GAAG,CAAC,KAAK,cAAc,EAAE;YACjE,WAAW,GAAG,eAAe,CAAC;SAC/B;aAAM,IAAI,IAAA,gCAAc,EAAC,GAAG,CAAC,EAAE;YAC9B,MAAM,UAAU,GAAG,GAAG;gBACpB,CAAC,CAAC,eAAe;gBACjB,CAAC,CAAC,MAAM,IAAA,oCAAoB,EAAC,GAAG,EAAE,OAAO,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"updatePackageJson.js","sourceRoot":"","sources":["../../../src/commands/update/updatePackageJson.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,9 +20,11 @@ export interface Settings<E extends Env> {
|
|
|
20
20
|
profile?: boolean;
|
|
21
21
|
noServerRebuild?: boolean;
|
|
22
22
|
noClientRebuild?: boolean;
|
|
23
|
+
benchmark?: boolean;
|
|
23
24
|
resolveSymlinks?: boolean;
|
|
24
25
|
showConfig?: boolean;
|
|
25
26
|
onlyBundles?: string[];
|
|
27
|
+
analyze?: false | 'bundle' | 'whybundled' | 'statoscope' | 'rsdoctor';
|
|
26
28
|
disableProdOptimization?: boolean;
|
|
27
29
|
fileCache?: boolean;
|
|
28
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configManager.d.ts","sourceRoot":"","sources":["../../src/config/configManager.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAMpF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAIhD,MAAM,WAAW,QAAQ,CAAC,CAAC,SAAS,GAAG;IAErC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE7B,GAAG,CAAC,EAAE,CAAC,CAAC;IACR,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAgBD,KAAK,eAAe,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI;KACnD,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,iBAAiB,CAAC,MAAM,CAAC,CAAC,GACvD,CAAC,GACD,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAChC,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GACvB,CAAC,CAAC,GAAG,CAAC;CACb,CAAC;AAmBF,MAAM,MAAM,aAAa,CACvB,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,GAAG,GAAG,GAAG,IACjB,eAAe,CAAC,CAAC,CAAC,GACpB,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACzD,SAAS,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CACjC,CAAC;AAEJ,eAAO,MAAM,mBAAmB,cAAc,CAAC;AAG/C,eAAO,MAAM,mBAAmB,
|
|
1
|
+
{"version":3,"file":"configManager.d.ts","sourceRoot":"","sources":["../../src/config/configManager.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAMpF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAIhD,MAAM,WAAW,QAAQ,CAAC,CAAC,SAAS,GAAG;IAErC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE7B,GAAG,CAAC,EAAE,CAAC,CAAC;IACR,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,OAAO,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,YAAY,GAAG,YAAY,GAAG,UAAU,CAAC;IACtE,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAgBD,KAAK,eAAe,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI;KACnD,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,iBAAiB,CAAC,MAAM,CAAC,CAAC,GACvD,CAAC,GACD,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAChC,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GACvB,CAAC,CAAC,GAAG,CAAC;CACb,CAAC;AAmBF,MAAM,MAAM,aAAa,CACvB,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,GAAG,GAAG,GAAG,IACjB,eAAe,CAAC,CAAC,CAAC,GACpB,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACzD,SAAS,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CACjC,CAAC;AAEJ,eAAO,MAAM,mBAAmB,cAAc,CAAC;AAG/C,eAAO,MAAM,mBAAmB,0HA+I/B,CAAC"}
|
|
@@ -63,8 +63,10 @@ const createConfigManager = (configEntry, settings) => {
|
|
|
63
63
|
profile: false,
|
|
64
64
|
noClientRebuild: false,
|
|
65
65
|
noServerRebuild: false,
|
|
66
|
+
benchmark: false,
|
|
66
67
|
resolveSymlinks: true,
|
|
67
68
|
disableProdOptimization: false,
|
|
69
|
+
analyze: false,
|
|
68
70
|
onlyBundles: [],
|
|
69
71
|
// according to measures fileCache in webpack doesn't affect
|
|
70
72
|
// performance much so enable it by default as it always was before
|
|
@@ -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;AAC/B,oDAAoB;AAIpB,0DAAoE;AACpE,yCAA2E;AAC3E,mFAAmD;AACnD,4DAAyD;AACzD,6CAA0C;AAE1C,yDAAqD;
|
|
1
|
+
{"version":3,"file":"configManager.js","sourceRoot":"","sources":["../../src/config/configManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,21 +21,18 @@ export declare const CONFIG_MANAGER_TOKEN: {
|
|
|
21
21
|
integrity: boolean | import("../../typings/configEntry/cli").IntegrityOptions;
|
|
22
22
|
experiments: {
|
|
23
23
|
webpack: {
|
|
24
|
-
|
|
25
|
-
|
|
24
|
+
[x: string]: any;
|
|
25
|
+
[x: number]: any;
|
|
26
26
|
cacheUnaffected: boolean;
|
|
27
|
-
|
|
28
|
-
layers?: boolean;
|
|
29
|
-
outputModule?: boolean;
|
|
30
|
-
syncWebAssembly?: boolean;
|
|
31
|
-
topLevelAwait?: boolean;
|
|
32
|
-
deferImport?: boolean;
|
|
27
|
+
backCompat: boolean;
|
|
33
28
|
};
|
|
34
29
|
minicss: {
|
|
35
30
|
useImportModule: boolean;
|
|
36
31
|
};
|
|
32
|
+
lightningcss?: boolean;
|
|
37
33
|
transpilation: {
|
|
38
34
|
loader: import("../../typings/configEntry/cli").TranspilationLoader;
|
|
35
|
+
include?: string[] | "all" | "only-modern" | "none";
|
|
39
36
|
};
|
|
40
37
|
minifier: import("../../typings/configEntry/cli").Minifier;
|
|
41
38
|
autoResolveSharedRequiredVersions: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/di/tokens/config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAEpE,eAAO,MAAM,kBAAkB;;CAAqC,CAAC;AACrE,eAAO,MAAM,qBAAqB;;CAAwC,CAAC;AAE3E,eAAO,MAAM,gBAAgB;;;;EAAiC,CAAC;AAC/D,eAAO,MAAM,kBAAkB;;CAA2C,CAAC;AAC3E,eAAO,MAAM,oBAAoB
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/di/tokens/config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAEpE,eAAO,MAAM,kBAAkB;;CAAqC,CAAC;AACrE,eAAO,MAAM,qBAAqB;;CAAwC,CAAC;AAE3E,eAAO,MAAM,gBAAgB;;;;EAAiC,CAAC;AAC/D,eAAO,MAAM,kBAAkB;;CAA2C,CAAC;AAC3E,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAA+D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"css.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/css.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"css.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/css.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAKxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAMvE,eAAO,MAAM,oBAAoB,kBAAmB,cAAc,cAAc,CAAC,WAEhF,CAAC;AAEF,UAAU,OAAO;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,sBAAsB,kBACjB,cAAc,cAAc,CAAC,YAAW,OAAO,cACtD,MAAM,SAkHd,CAAC;AAEJ,eAAe,sBAAsB,CAAC"}
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.cssWebpackRulesFactory = exports.getPostcssConfigPath = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const applyOrReturn_1 = tslib_1.__importDefault(require("@tinkoff/utils/function/applyOrReturn"));
|
|
6
5
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
7
6
|
const mini_css_extract_plugin_1 = tslib_1.__importDefault(require("mini-css-extract-plugin"));
|
|
8
7
|
const minicss_class_generator_1 = require("@tinkoff/minicss-class-generator");
|
|
9
8
|
const safeRequire_1 = require("../../../utils/safeRequire");
|
|
9
|
+
const browserslist_1 = require("../utils/browserslist");
|
|
10
10
|
const cssLocalIdentNameDevDefault = '[name]__[local]_[minicss]';
|
|
11
11
|
const cssLocalIdentNameProdDefault = '[minicss]';
|
|
12
12
|
const getPostcssConfigPath = (configManager) => {
|
|
@@ -14,10 +14,13 @@ const getPostcssConfigPath = (configManager) => {
|
|
|
14
14
|
};
|
|
15
15
|
exports.getPostcssConfigPath = getPostcssConfigPath;
|
|
16
16
|
const cssWebpackRulesFactory = (configManager, options = {}) => (config) => {
|
|
17
|
-
const { env, sourceMap, buildType } = configManager;
|
|
18
|
-
const { postcss: { config: postcssConfig, cssLocalIdentName = env === 'production'
|
|
17
|
+
const { env, sourceMap, buildType, experiments, target } = configManager;
|
|
18
|
+
const { rootDir, postcss: { config: postcssConfig, cssLocalIdentName = env === 'production'
|
|
19
19
|
? cssLocalIdentNameProdDefault
|
|
20
20
|
: cssLocalIdentNameDevDefault, cssModulePattern, }, } = configManager;
|
|
21
|
+
const isServer = configManager.buildType === 'server';
|
|
22
|
+
const actualTarget = (0, browserslist_1.getActualTarget)(target, isServer);
|
|
23
|
+
const browsersListTargets = (0, browserslist_1.getBrowserslistTargets)(rootDir, actualTarget);
|
|
21
24
|
const localIdentName = options.localIdentName ?? cssLocalIdentName;
|
|
22
25
|
const configCssLoader = (cfg) => {
|
|
23
26
|
cfg
|
|
@@ -50,17 +53,32 @@ const cssWebpackRulesFactory = (configManager, options = {}) => (config) => {
|
|
|
50
53
|
// ignore missed file if users haven't provided any value
|
|
51
54
|
// in case the path was provided it should exist
|
|
52
55
|
typeof postcssConfig === 'undefined') ?? {};
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
56
|
+
// https://github.com/webpack-contrib/postcss-loader/blob/master/src/config.d.ts
|
|
57
|
+
const postcssOptionsFn = (loaderContext) => {
|
|
58
|
+
const isFnConfig = typeof postcssCfg === 'function';
|
|
59
|
+
// TODO: async config fn support?
|
|
60
|
+
const defaultConfig = isFnConfig ? postcssCfg(loaderContext) : postcssCfg;
|
|
61
|
+
// eslint-disable-next-line no-nested-ternary
|
|
62
|
+
const defaultPlugins = defaultConfig.plugins ? defaultConfig.plugins : [];
|
|
63
|
+
return {
|
|
64
|
+
config: false,
|
|
65
|
+
...defaultConfig,
|
|
58
66
|
// TODO: придумать как прокинуть настройки browserslist в autoprefixer - сейчас autoprefixer добавляется в самом приложении и из
|
|
59
67
|
// конфига нет возможности задавать динамический env в зависимости от сборки. Подсунуть в сам autoprefixer после его инициализации тоже
|
|
60
68
|
// тоже не получится - https://github.com/postcss/autoprefixer/blob/10.3.1/lib/autoprefixer.js#L108
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
69
|
+
plugins: Array.isArray(defaultPlugins)
|
|
70
|
+
? [
|
|
71
|
+
require('postcss-modules-tilda'),
|
|
72
|
+
require('postcss-modules-values-replace')({ importsAsModuleRequests: true }),
|
|
73
|
+
...defaultPlugins,
|
|
74
|
+
]
|
|
75
|
+
: {
|
|
76
|
+
'postcss-modules-tilda': {},
|
|
77
|
+
'postcss-modules-values-replace': { importsAsModuleRequests: true },
|
|
78
|
+
...defaultPlugins,
|
|
79
|
+
},
|
|
80
|
+
};
|
|
81
|
+
};
|
|
64
82
|
// otherwise postcss-loader will use cosmiconfig to resolve postcss configuration file
|
|
65
83
|
// https://github.com/webpack-contrib/postcss-loader/blob/6f470db420f6febbea729080921050e8fe353226/src/index.js#L38
|
|
66
84
|
Object.assign(postcssOptionsFn, { config: false });
|
|
@@ -68,12 +86,21 @@ const cssWebpackRulesFactory = (configManager, options = {}) => (config) => {
|
|
|
68
86
|
.rule('css')
|
|
69
87
|
.test(/\.css$/)
|
|
70
88
|
.batch(configCssLoader)
|
|
71
|
-
.
|
|
72
|
-
|
|
73
|
-
|
|
89
|
+
.when(experiments.lightningcss, (cfg) => {
|
|
90
|
+
const lightningcss = require('lightningcss');
|
|
91
|
+
return cfg
|
|
92
|
+
.use('lightningcss')
|
|
93
|
+
.loader('lightningcss-loader')
|
|
94
|
+
.options({
|
|
95
|
+
options: {
|
|
96
|
+
implementation: lightningcss,
|
|
97
|
+
targets: browsersListTargets,
|
|
98
|
+
},
|
|
99
|
+
});
|
|
100
|
+
}, (cfg) => cfg.use('postcss').loader('postcss-loader').options({
|
|
74
101
|
sourceMap,
|
|
75
102
|
postcssOptions: postcssOptionsFn,
|
|
76
|
-
});
|
|
103
|
+
}));
|
|
77
104
|
};
|
|
78
105
|
exports.cssWebpackRulesFactory = cssWebpackRulesFactory;
|
|
79
106
|
exports.default = exports.cssWebpackRulesFactory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"css.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/css.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"css.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/css.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,8FAAuD;AACvD,8EAAmE;AAEnE,4DAAyD;AAGzD,wDAAgF;AAEhF,MAAM,2BAA2B,GAAG,2BAA2B,CAAC;AAChE,MAAM,4BAA4B,GAAG,WAAW,CAAC;AAE1C,MAAM,oBAAoB,GAAG,CAAC,aAA4C,EAAE,EAAE;IACnF,OAAO,aAAa,CAAC,OAAO,CAAC,MAAM,IAAI,gBAAgB,CAAC;AAC1D,CAAC,CAAC;AAFW,QAAA,oBAAoB,wBAE/B;AAMK,MAAM,sBAAsB,GACjC,CAAC,aAA4C,EAAE,UAAmB,EAAE,EAAE,EAAE,CACxE,CAAC,MAAc,EAAE,EAAE;IACjB,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IACzE,MAAM,EACJ,OAAO,EACP,OAAO,EAAE,EACP,MAAM,EAAE,aAAa,EACrB,iBAAiB,GAAG,GAAG,KAAK,YAAY;QACtC,CAAC,CAAC,4BAA4B;QAC9B,CAAC,CAAC,2BAA2B,EAC/B,gBAAgB,GACjB,GACF,GAAG,aAAa,CAAC;IAClB,MAAM,QAAQ,GAAG,aAAa,CAAC,SAAS,KAAK,QAAQ,CAAC;IACtD,MAAM,YAAY,GAAG,IAAA,8BAAe,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACvD,MAAM,mBAAmB,GAAG,IAAA,qCAAsB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAC1E,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,iBAAiB,CAAC;IAEnE,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,EAAE;QAC9B,GAAG;aACA,GAAG,CAAC,aAAa,CAAC;aAClB,MAAM,CAAC,iCAAgB,CAAC,MAAM,CAAC;aAC/B,OAAO,CAAC;YACP,QAAQ,EAAE,KAAK;YACf,uFAAuF;YACvF,IAAI,EAAE,SAAS,KAAK,QAAQ;SACK,CAAC,CAAC;QAEvC,MAAM,iBAAiB,GAAwB;YAC7C,cAAc;SACf,CAAC;QAEF,IAAI,gBAAgB,EAAE;YACpB,iBAAiB,CAAC,IAAI,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAAC;SACvD;QAED,2GAA2G;QAC3G,8EAA8E;QAC9E,IAAI,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;YACrC,iBAAiB,CAAC,aAAa,GAAG,IAAA,yCAAe,GAAE,CAAC;SACrD;QAED,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;YAC1C,OAAO,EAAE,iBAAiB;YAC1B,SAAS;YACT,aAAa,EAAE,CAAC;YAChB,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,UAAU,GACd,IAAA,yBAAW,EACT,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,IAAA,4BAAoB,EAAC,aAAa,CAAC,CAAC;IACxE,yDAAyD;IACzD,gDAAgD;IAChD,OAAO,aAAa,KAAK,WAAW,CACrC,IAAI,EAAE,CAAC;IAEV,gFAAgF;IAChF,MAAM,gBAAgB,GAAG,CAAC,aAAkB,EAAE,EAAE;QAC9C,MAAM,UAAU,GAAG,OAAO,UAAU,KAAK,UAAU,CAAC;QACpD,iCAAiC;QACjC,MAAM,aAAa,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;QAC1E,6CAA6C;QAC7C,MAAM,cAAc,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QAE1E,OAAO;YACL,MAAM,EAAE,KAAK;YACb,GAAG,aAAa;YAChB,gIAAgI;YAChI,uIAAuI;YACvI,mGAAmG;YACnG,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC;gBACpC,CAAC,CAAC;oBACE,OAAO,CAAC,uBAAuB,CAAC;oBAChC,OAAO,CAAC,gCAAgC,CAAC,CAAC,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAAC;oBAC5E,GAAG,cAAc;iBAClB;gBACH,CAAC,CAAC;oBACE,uBAAuB,EAAE,EAAE;oBAC3B,gCAAgC,EAAE,EAAE,uBAAuB,EAAE,IAAI,EAAE;oBACnE,GAAG,cAAc;iBAClB;SACN,CAAC;IACJ,CAAC,CAAC;IAEF,sFAAsF;IACtF,mHAAmH;IACnH,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAEnD,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,KAAK,CAAC;SACX,IAAI,CAAC,QAAQ,CAAC;SACd,KAAK,CAAC,eAAe,CAAC;SACtB,IAAI,CACH,WAAW,CAAC,YAAY,EACxB,CAAC,GAAG,EAAE,EAAE;QACN,MAAM,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;QAE7C,OAAO,GAAG;aACP,GAAG,CAAC,cAAc,CAAC;aACnB,MAAM,CAAC,qBAAqB,CAAC;aAC7B,OAAO,CAAC;YACP,OAAO,EAAE;gBACP,cAAc,EAAE,YAAY;gBAC5B,OAAO,EAAE,mBAAmB;aAC7B;SACF,CAAC,CAAC;IACP,CAAC,EACD,CAAC,GAAG,EAAE,EAAE,CACN,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC;QAClD,SAAS;QACT,cAAc,EAAE,gBAAgB;KACjC,CAAC,CACL,CAAC;AACN,CAAC,CAAC;AApHS,QAAA,sBAAsB,0BAoH/B;AAEJ,kBAAe,8BAAsB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"js.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/js.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"js.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/js.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAEnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;wCA4BxC,cAAc,cAAc,CAAC,cAAc,MAAM;AAAhF,wBAgDE"}
|
|
@@ -1,24 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const node_path_1 = tslib_1.__importDefault(require("node:path"));
|
|
3
5
|
const is_modern_lib_1 = require("@tinkoff/is-modern-lib");
|
|
4
6
|
const threadLoader_1 = require("../utils/threadLoader");
|
|
5
7
|
const transpiler_1 = require("../utils/transpiler");
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
const rule = config.module
|
|
10
|
-
.rule('js')
|
|
11
|
-
.test(/\.[cm]?js[x]?$/)
|
|
12
|
-
.batch((0, threadLoader_1.applyThreadLoader)(configManager));
|
|
8
|
+
const projectRulesName = 'project';
|
|
9
|
+
const nodeModuleRulesName = 'node_module';
|
|
10
|
+
const applyProjectRules = (rule, configManager) => {
|
|
13
11
|
rule
|
|
14
|
-
.oneOf(
|
|
12
|
+
.oneOf(projectRulesName)
|
|
15
13
|
.exclude.add(/node_modules/)
|
|
16
14
|
.end()
|
|
17
15
|
.use('transpiler')
|
|
18
|
-
.batch((0, transpiler_1.addTranspilerLoader)(configManager, (0, transpiler_1.getTranspilerConfig)(configManager)))
|
|
16
|
+
.batch((0, transpiler_1.addTranspilerLoader)(configManager, (0, transpiler_1.getTranspilerConfig)(configManager)))
|
|
17
|
+
.end();
|
|
18
|
+
};
|
|
19
|
+
const applyNodeModulesRules = (rule, configManager) => {
|
|
19
20
|
rule
|
|
20
|
-
.oneOf(
|
|
21
|
-
.when(transpileOnlyModernLibs, (cfg) => cfg.include.add(is_modern_lib_1.modernLibsFilter))
|
|
21
|
+
.oneOf(nodeModuleRulesName)
|
|
22
22
|
.merge({
|
|
23
23
|
// true value forces to use file extensions for importing mjs modules
|
|
24
24
|
// but we want to use mjs if it exists anyway
|
|
@@ -27,4 +27,50 @@ exports.default = (configManager) => (config) => {
|
|
|
27
27
|
.use('transpiler')
|
|
28
28
|
.batch((0, transpiler_1.addTranspilerLoader)(configManager, (0, transpiler_1.getTranspilerConfig)(configManager, { hot: false })));
|
|
29
29
|
};
|
|
30
|
+
// eslint-disable-next-line import/no-default-export
|
|
31
|
+
exports.default = (configManager) => (config) => {
|
|
32
|
+
const { transpileOnlyModernLibs } = configManager;
|
|
33
|
+
const { include } = configManager.experiments.transpilation;
|
|
34
|
+
const shouldTranspileOnlyModern = transpileOnlyModernLibs || include === 'only-modern';
|
|
35
|
+
const rule = config.module
|
|
36
|
+
.rule('js')
|
|
37
|
+
.test(/\.[cm]?js[x]?$/)
|
|
38
|
+
.batch((0, threadLoader_1.applyThreadLoader)(configManager));
|
|
39
|
+
if (configManager.env === 'production') {
|
|
40
|
+
applyProjectRules(rule, configManager);
|
|
41
|
+
applyNodeModulesRules(rule, configManager);
|
|
42
|
+
if (shouldTranspileOnlyModern) {
|
|
43
|
+
rule.oneOf(nodeModuleRulesName).include.add(is_modern_lib_1.modernLibsFilter);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
const shouldSkipTranspiling = include === 'none';
|
|
48
|
+
const shouldSelectiveTranspile = Array.isArray(include);
|
|
49
|
+
if (shouldSkipTranspiling) {
|
|
50
|
+
rule.exclude
|
|
51
|
+
.add(/node_modules/)
|
|
52
|
+
.end()
|
|
53
|
+
.use('transpiler')
|
|
54
|
+
.batch((0, transpiler_1.addTranspilerLoader)(configManager, (0, transpiler_1.getTranspilerConfig)(configManager)));
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
applyProjectRules(rule, configManager);
|
|
58
|
+
applyNodeModulesRules(rule, configManager);
|
|
59
|
+
if (shouldSelectiveTranspile) {
|
|
60
|
+
const includeForTranspiling = include.map((includePath) =>
|
|
61
|
+
// require.resolve return absolute path to entrypoint of dependency
|
|
62
|
+
// but we need root dirname of dependency inside node_modules
|
|
63
|
+
node_path_1.default.dirname(require.resolve(`${includePath}/package.json`)));
|
|
64
|
+
includeForTranspiling.forEach((includePath) => {
|
|
65
|
+
rule.oneOf(nodeModuleRulesName).include.add(includePath);
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
else if (shouldTranspileOnlyModern) {
|
|
69
|
+
if (shouldTranspileOnlyModern) {
|
|
70
|
+
rule.oneOf(nodeModuleRulesName).include.add(is_modern_lib_1.modernLibsFilter);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
};
|
|
30
76
|
//# sourceMappingURL=js.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"js.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/js.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"js.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/js.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/common/main.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/common/main.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAQxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAEnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;wCAqBxC,cAAc,cAAc,CAAC,cAAc,MAAM;AAAhF,wBAkHE"}
|
|
@@ -5,11 +5,13 @@ const webpack_1 = tslib_1.__importDefault(require("webpack"));
|
|
|
5
5
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
6
6
|
const fs_extra_1 = require("fs-extra");
|
|
7
7
|
const find_cache_dir_1 = tslib_1.__importDefault(require("find-cache-dir"));
|
|
8
|
+
const webpack_plugin_1 = require("@rsdoctor/webpack-plugin");
|
|
8
9
|
const warningsFilter_1 = require("../utils/warningsFilter");
|
|
9
10
|
const resolve_1 = tslib_1.__importDefault(require("../blocks/resolve"));
|
|
10
11
|
const ignoreLocales_1 = tslib_1.__importDefault(require("../blocks/ignoreLocales"));
|
|
11
12
|
const safeRequire_1 = require("../../../utils/safeRequire");
|
|
12
13
|
const css_1 = require("../blocks/css");
|
|
14
|
+
const rsdoctor_1 = require("../utils/rsdoctor");
|
|
13
15
|
const filterNonExisted = (filePaths) => {
|
|
14
16
|
return filePaths.filter((filePath) => {
|
|
15
17
|
return filePath && (0, fs_extra_1.existsSync)(filePath);
|
|
@@ -100,6 +102,11 @@ exports.default = (configManager) => (config) => {
|
|
|
100
102
|
'process.env.DISABLE_EXTERNAL_SCRIPTS': process.env.DISABLE_EXTERNAL_SCRIPTS || false,
|
|
101
103
|
},
|
|
102
104
|
]);
|
|
105
|
+
if (configManager.benchmark) {
|
|
106
|
+
config
|
|
107
|
+
.plugin('rsdoctor-benchmark')
|
|
108
|
+
.use(webpack_plugin_1.RsdoctorWebpackMultiplePlugin, [(0, rsdoctor_1.getRsdoctorOptions)(configManager.buildType)]);
|
|
109
|
+
}
|
|
103
110
|
// TODO: remove after dropping support for node@14
|
|
104
111
|
if (configManager.buildType === 'server') {
|
|
105
112
|
config.plugin('node-performance').use(webpack_1.default.ProvidePlugin, [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../src/library/webpack/common/main.ts"],"names":[],"mappings":";;;AAAA,8DAA8B;AAE9B,wDAAwB;AACxB,uCAAsC;AACtC,4EAA0C;AAC1C,4DAAyD;AACzD,wEAAwC;AACxC,oFAAoD;AAEpD,4DAAgE;AAEhE,uCAAqD;
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../src/library/webpack/common/main.ts"],"names":[],"mappings":"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"}
|