@tramvai/cli 5.53.94 → 5.53.112

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.
Files changed (58) hide show
  1. package/bin/const.js +5 -0
  2. package/bin/platform.js +12 -6
  3. package/bin/spawn.js +6 -0
  4. package/lib/builder/webpack/tokens.d.ts +2 -0
  5. package/lib/builder/webpack/tokens.d.ts.map +1 -1
  6. package/lib/commands/update/checkVersionValidator.d.ts +1 -1
  7. package/lib/commands/update/checkVersionValidator.d.ts.map +1 -1
  8. package/lib/commands/update/checkVersionValidator.js +3 -2
  9. package/lib/commands/update/checkVersionValidator.js.map +1 -1
  10. package/lib/commands/update/command.d.ts +1 -1
  11. package/lib/commands/update/dependantLibs.d.ts +1 -1
  12. package/lib/commands/update/dependantLibs.d.ts.map +1 -1
  13. package/lib/commands/update/dependantLibs.js +3 -2
  14. package/lib/commands/update/dependantLibs.js.map +1 -1
  15. package/lib/commands/update/update.d.ts.map +1 -1
  16. package/lib/commands/update/update.js +6 -3
  17. package/lib/commands/update/update.js.map +1 -1
  18. package/lib/commands/update/updatePackageJson.d.ts +1 -1
  19. package/lib/commands/update/updatePackageJson.d.ts.map +1 -1
  20. package/lib/commands/update/updatePackageJson.js +7 -7
  21. package/lib/commands/update/updatePackageJson.js.map +1 -1
  22. package/lib/di/tokens/config.d.ts +1 -0
  23. package/lib/di/tokens/config.d.ts.map +1 -1
  24. package/lib/library/webpack/blocks/css.d.ts.map +1 -1
  25. package/lib/library/webpack/blocks/css.js +42 -15
  26. package/lib/library/webpack/blocks/css.js.map +1 -1
  27. package/lib/library/webpack/utils/browserslist.d.ts +4 -0
  28. package/lib/library/webpack/utils/browserslist.d.ts.map +1 -0
  29. package/lib/library/webpack/utils/browserslist.js +27 -0
  30. package/lib/library/webpack/utils/browserslist.js.map +1 -0
  31. package/lib/library/webpack/utils/transpiler.d.ts.map +1 -1
  32. package/lib/library/webpack/utils/transpiler.js +3 -16
  33. package/lib/library/webpack/utils/transpiler.js.map +1 -1
  34. package/lib/schema/autogeneratedSchema.json +27 -15
  35. package/lib/typings/configEntry/cli.d.ts +4 -0
  36. package/lib/typings/configEntry/cli.d.ts.map +1 -1
  37. package/lib/utils/commands/dependencies/getLatestPackageVersion.d.ts +1 -1
  38. package/lib/utils/commands/dependencies/getLatestPackageVersion.d.ts.map +1 -1
  39. package/lib/utils/commands/dependencies/getLatestPackageVersion.js +4 -2
  40. package/lib/utils/commands/dependencies/getLatestPackageVersion.js.map +1 -1
  41. package/lib/utils/commands/dependencies/packageHasVersion.d.ts +1 -1
  42. package/lib/utils/commands/dependencies/packageHasVersion.d.ts.map +1 -1
  43. package/lib/utils/commands/dependencies/packageHasVersion.js +3 -2
  44. package/lib/utils/commands/dependencies/packageHasVersion.js.map +1 -1
  45. package/package.json +15 -13
  46. package/schema.json +27 -15
  47. package/src/commands/update/checkVersionValidator.ts +4 -2
  48. package/src/commands/update/dependantLibs.ts +3 -1
  49. package/src/commands/update/update.ts +6 -3
  50. package/src/commands/update/updatePackageJson.spec.ts +19 -3
  51. package/src/commands/update/updatePackageJson.ts +7 -2
  52. package/src/library/webpack/blocks/css.ts +52 -16
  53. package/src/library/webpack/utils/browserslist.ts +29 -0
  54. package/src/library/webpack/utils/transpiler.ts +3 -18
  55. package/src/schema/autogeneratedSchema.json +27 -15
  56. package/src/typings/configEntry/cli.ts +5 -0
  57. package/src/utils/commands/dependencies/getLatestPackageVersion.ts +4 -1
  58. package/src/utils/commands/dependencies/packageHasVersion.ts +7 -2
package/bin/const.js ADDED
@@ -0,0 +1,5 @@
1
+ const restartReason = 'restart';
2
+
3
+ module.exports = {
4
+ restartReason,
5
+ };
package/bin/platform.js CHANGED
@@ -6,6 +6,8 @@ const path = require('node:path');
6
6
  const chokidar = require('chokidar');
7
7
  const chalk = require('chalk');
8
8
 
9
+ const { restartReason } = require('./const');
10
+
9
11
  let abortController;
10
12
 
11
13
  function run() {
@@ -18,13 +20,17 @@ const watchedFileName = 'tramvai.json';
18
20
  function onConfigChange() {
19
21
  console.log(chalk.yellow(`${watchedFileName} changed, restart process...`));
20
22
 
21
- abortController.abort();
23
+ abortController.abort(restartReason);
22
24
  abortController = run();
23
25
  }
24
26
 
25
- try {
26
- const tramvaiJsonPath = path.resolve(process.cwd(), watchedFileName);
27
- chokidar.watch(tramvaiJsonPath).on('change', onConfigChange);
28
- } catch (err) {
29
- console.error(`Something went wrong while watching for changes in ${watchedFileName}: ${err}`);
27
+ // Watch for tramvai.json changes only for `tramvai start` command
28
+ const isStartCommand = process.argv[2] === 'start';
29
+ if (isStartCommand) {
30
+ try {
31
+ const tramvaiJsonPath = path.resolve(process.cwd(), watchedFileName);
32
+ chokidar.watch(tramvaiJsonPath).on('change', onConfigChange);
33
+ } catch (err) {
34
+ console.error(`Something went wrong while watching for changes in ${watchedFileName}: ${err}`);
35
+ }
30
36
  }
package/bin/spawn.js CHANGED
@@ -1,6 +1,8 @@
1
1
  const { spawn: cpSpawn } = require('child_process');
2
2
  const exit = require('exit');
3
3
 
4
+ const { restartReason } = require('./const');
5
+
4
6
  const args = process.argv.slice(2);
5
7
  const maxMemory = process.env.MAX_USED_MEMORY || '3000';
6
8
  const maxSemiSpaceSize = process.env.MAX_SEMI_SPACE_SIZE || '128';
@@ -42,6 +44,10 @@ It's unexpected, please check available/used memory and cpu while running last c
42
44
  });
43
45
 
44
46
  cliInstance.on('exit', async (code, sig) => {
47
+ if (signal.aborted && signal.reason === restartReason) {
48
+ return;
49
+ }
50
+
45
51
  if (sig) {
46
52
  console.warn(`Process was exited with signal "${sig}"
47
53
  It's unexpected, please check available/used memory and cpu while running last command`);
@@ -19,6 +19,7 @@ export declare const CLIENT_CONFIG_MANAGER_TOKEN: {
19
19
  minicss: {
20
20
  useImportModule: boolean;
21
21
  };
22
+ lightningcss?: boolean;
22
23
  transpilation: {
23
24
  loader: import("../../typings/configEntry/cli").TranspilationLoader;
24
25
  include?: string[] | "all" | "only-modern" | "none";
@@ -150,6 +151,7 @@ export declare const SERVER_CONFIG_MANAGER_TOKEN: {
150
151
  minicss: {
151
152
  useImportModule: boolean;
152
153
  };
154
+ lightningcss?: boolean;
153
155
  transpilation: {
154
156
  loader: import("../../typings/configEntry/cli").TranspilationLoader;
155
157
  include?: string[] | "all" | "only-modern" | "none";
@@ -1 +1 @@
1
- {"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../../src/builder/webpack/tokens.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACjE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAC3C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAEpE,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAEvC,CAAC;AACF,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAEvC,CAAC;AACF,eAAO,MAAM,2BAA2B;;CAAsD,CAAC;AAE/F,eAAO,MAAM,2BAA2B;;CAAsD,CAAC;AAE/F,eAAO,MAAM,sBAAsB;;CAAgE,CAAC;AAEpG,eAAO,MAAM,6BAA6B;;CAEzC,CAAC;AAEF,eAAO,MAAM,6BAA6B;;CAEzC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;CAA2D,CAAC;AAE/F;;GAEG;AACH,eAAO,MAAM,qBAAqB;;CAA8D,CAAC;AAEjG,eAAO,MAAM,mBAAmB;;CAA6D,CAAC;AAE9F,eAAO,MAAM,iCAAiC;;CAE7C,CAAC;AACF,eAAO,MAAM,4BAA4B;;CAExC,CAAC;AAEF,eAAO,MAAM,kBAAkB,SAAqB,QAAQ,IAAI,CAAC,GAAG,IAAI;;CAKvE,CAAC;AACF,eAAO,MAAM,qBAAqB,SAAqB,QAAQ,IAAI,CAAC,GAAG,IAAI;;CAG1E,CAAC;AAEF,eAAO,MAAM,mBAAmB,SAAqB,QAAQ,IAAI,CAAC,GAAG,IAAI;;CAGxE,CAAC"}
1
+ {"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../../src/builder/webpack/tokens.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACjE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAC3C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAEpE,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAEvC,CAAC;AACF,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAEvC,CAAC;AACF,eAAO,MAAM,2BAA2B;;CAAsD,CAAC;AAE/F,eAAO,MAAM,2BAA2B;;CAAsD,CAAC;AAE/F,eAAO,MAAM,sBAAsB;;CAAgE,CAAC;AAEpG,eAAO,MAAM,6BAA6B;;CAEzC,CAAC;AAEF,eAAO,MAAM,6BAA6B;;CAEzC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;CAA2D,CAAC;AAE/F;;GAEG;AACH,eAAO,MAAM,qBAAqB;;CAA8D,CAAC;AAEjG,eAAO,MAAM,mBAAmB;;CAA6D,CAAC;AAE9F,eAAO,MAAM,iCAAiC;;CAE7C,CAAC;AACF,eAAO,MAAM,4BAA4B;;CAExC,CAAC;AAEF,eAAO,MAAM,kBAAkB,SAAqB,QAAQ,IAAI,CAAC,GAAG,IAAI;;CAKvE,CAAC;AACF,eAAO,MAAM,qBAAqB,SAAqB,QAAQ,IAAI,CAAC,GAAG,IAAI;;CAG1E,CAAC;AAEF,eAAO,MAAM,mBAAmB,SAAqB,QAAQ,IAAI,CAAC,GAAG,IAAI;;CAGxE,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import type { Params } from './update';
2
- export declare const checkVersion: (_: any, { to: version }: Params) => Promise<{
2
+ export declare const checkVersion: (context: any, { to: version }: Params) => Promise<{
3
3
  name: string;
4
4
  status: string;
5
5
  }>;
@@ -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,4BAAyC,MAAM;;;EAgBvE,CAAC"}
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 (_, { to: version = 'latest' }) => {
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
- if (await (0, packageHasVersion_1.packageHasVersion)('@tramvai/core', version)) {
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,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,GAAG,QAAQ,EAAU,EAAE,EAAE;IAC1E,IAAI,OAAO,KAAK,QAAQ,EAAE;QACxB,OAAO;YACL,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,IAAI;SACb,CAAC;KACH;IAED,IAAI,MAAM,IAAA,qCAAiB,EAAC,eAAe,EAAE,OAAO,CAAC,EAAE;QACrD,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;AAhBW,QAAA,YAAY,gBAgBvB"}
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: ((_: any, { to: version }: Params) => Promise<{
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,WACd,GAAG,KACX,QAAQ,MAAM,GAAG,SAAS,CAgC5B,CAAC"}
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
- return await (0, latest_version_1.default)(name, { version });
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;SACzD;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;AArCW,QAAA,oBAAoB,wBAqC/B"}
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,wBAuEE"}
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 resolvedVersion = tag ? version : await (0, getLatestPackageVersion_1.getLatestPackageVersion)('@tramvai/cli', version);
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,eAAe,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,IAAA,iDAAuB,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAC/F,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,GAAG,EAAE,SAAS,CAAC,CAC5E,CACF,CAAC;KACH;IAED,MAAM,IAAA,qCAAiB,EAAC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,CAAC,CAAC;IAEvE,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
+ {"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":"AA4DA,eAAO,MAAM,iBAAiB,YACnB,MAAM,mBACE,MAAM,kBACP,MAAM,QAChB,OAAO,iCAuCd,CAAC"}
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;YACvE,WAAW,GAAG,UAAU,CAAC;SAC1B;QAED,IAAI,WAAW,EAAE;YACf,MAAM,aAAa,GAAG,MAAM,IAAA,qCAAiB,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAEhE,kFAAkF;YAClF,gFAAgF;YAChF,OAAO,CAAC,KAAK,EAAE,CAAC;YAEhB,IAAI,aAAa,EAAE;gBACjB,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC,CAAC;gBACvC,6CAA6C;gBAC7C,YAAY,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC;aACjC;iBAAM;gBACL,OAAO,CAAC,IAAI,CACV,oBAAoB,GAAG,OAAO,WAAW;;gGAE2C,CACrF,CAAC;aACH;YAED,+CAA+C;YAC/C,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC7B;IACH,CAAC,EACD;QACE,WAAW,EAAE,EAAE;KAChB,CACF,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,iBAAiB,GAAG,KAAK,EACpC,OAAe,EACf,eAAuB,EACvB,cAAsB,EACtB,GAAa,EACb,IAAI,GAAG,GAAG,EACV,EAAE;IACF,MAAM,eAAe,GAAG,IAAA,cAAO,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,YAAE,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAE5C,MAAM,OAAO,GAAG,IAAA,aAAG,EAAC,gCAAgC,CAAC,CAAC,KAAK,EAAE,CAAC;IAE9D,IAAI;QACF,MAAM,kBAAkB,CACtB,OAAO,CAAC,YAAY,EACpB,OAAO,EACP,eAAe,EACf,cAAc,EACd,GAAG,EACH,OAAO,CACR,CAAC;QACF,MAAM,kBAAkB,CACtB,OAAO,CAAC,eAAe,EACvB,OAAO,EACP,eAAe,EACf,cAAc,EACd,GAAG,EACH,OAAO,CACR,CAAC;QACF,MAAM,kBAAkB,CACtB,OAAO,CAAC,gBAAgB,EACxB,OAAO,EACP,eAAe,EACf,cAAc,EACd,GAAG,EACH,OAAO,CACR,CAAC;QAEF,YAAE,CAAC,aAAa,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;KACrE;YAAS;QACR,OAAO,CAAC,IAAI,EAAE,CAAC;KAChB;AACH,CAAC,CAAC;AA3CW,QAAA,iBAAiB,qBA2C5B"}
1
+ {"version":3,"file":"updatePackageJson.js","sourceRoot":"","sources":["../../../src/commands/update/updatePackageJson.ts"],"names":[],"mappings":"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"}
@@ -29,6 +29,7 @@ export declare const CONFIG_MANAGER_TOKEN: {
29
29
  minicss: {
30
30
  useImportModule: boolean;
31
31
  };
32
+ lightningcss?: boolean;
32
33
  transpilation: {
33
34
  loader: import("../../typings/configEntry/cli").TranspilationLoader;
34
35
  include?: string[] | "all" | "only-modern" | "none";
@@ -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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAA+D,CAAC"}
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":"AAEA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAKvE,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,SA+Ed,CAAC;AAEJ,eAAe,sBAAsB,CAAC"}
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
- const postcssOptionsFn = (...args) => ({
54
- ...postcssCfg,
55
- plugins: [
56
- require('postcss-modules-tilda'),
57
- require('postcss-modules-values-replace')({ importsAsModuleRequests: true }),
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
- ...((0, applyOrReturn_1.default)(args, postcssCfg.plugins) || []),
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
- .use('postcss')
72
- .loader('postcss-loader')
73
- .options({
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":"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"}
1
+ {"version":3,"file":"css.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/css.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,4 @@
1
+ import type { Target } from '../../../typings/target';
2
+ export declare function getBrowserslistTargets(rootDir: string, actualTarget: Target): string[];
3
+ export declare function getActualTarget(target: any, isServer: any): any;
4
+ //# sourceMappingURL=browserslist.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"browserslist.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/utils/browserslist.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEtD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,YAW3E;AAED,wBAAgB,eAAe,CAAC,MAAM,KAAA,EAAE,QAAQ,KAAA,OAU/C"}
@@ -0,0 +1,27 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getActualTarget = exports.getBrowserslistTargets = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const browserslist_config_1 = tslib_1.__importDefault(require("@tinkoff/browserslist-config"));
6
+ const browserslist_1 = tslib_1.__importDefault(require("browserslist"));
7
+ function getBrowserslistTargets(rootDir, actualTarget) {
8
+ const browserslistConfigRaw = browserslist_1.default.findConfig(rootDir);
9
+ // Set defaults if the explicit config for browserslist was not found or the config does not contain the necessary targets
10
+ const browserslistQuery = browserslistConfigRaw?.[actualTarget] ?? browserslist_config_1.default[actualTarget] ?? browserslist_config_1.default.defaults;
11
+ return (0, browserslist_1.default)(browserslistQuery, {
12
+ mobileToDesktop: true,
13
+ env: actualTarget,
14
+ });
15
+ }
16
+ exports.getBrowserslistTargets = getBrowserslistTargets;
17
+ function getActualTarget(target, isServer) {
18
+ let actualTarget = target;
19
+ if (!target) {
20
+ if (isServer) {
21
+ actualTarget = 'node';
22
+ }
23
+ }
24
+ return actualTarget;
25
+ }
26
+ exports.getActualTarget = getActualTarget;
27
+ //# sourceMappingURL=browserslist.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"browserslist.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/browserslist.ts"],"names":[],"mappings":";;;;AAAA,+FAAsD;AACtD,wEAAwC;AAIxC,SAAgB,sBAAsB,CAAC,OAAe,EAAE,YAAoB;IAC1E,MAAM,qBAAqB,GAAG,sBAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAE/D,0HAA0H;IAC1H,MAAM,iBAAiB,GACrB,qBAAqB,EAAE,CAAC,YAAY,CAAC,IAAI,6BAAU,CAAC,YAAY,CAAC,IAAI,6BAAU,CAAC,QAAQ,CAAC;IAE3F,OAAO,IAAA,sBAAY,EAAC,iBAAiB,EAAE;QACrC,eAAe,EAAE,IAAI;QACrB,GAAG,EAAE,YAAY;KAClB,CAAC,CAAC;AACL,CAAC;AAXD,wDAWC;AAED,SAAgB,eAAe,CAAC,MAAM,EAAE,QAAQ;IAC9C,IAAI,YAAY,GAAG,MAAM,CAAC;IAE1B,IAAI,CAAC,MAAM,EAAE;QACX,IAAI,QAAQ,EAAE;YACZ,YAAY,GAAG,MAAM,CAAC;SACvB;KACF;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAVD,0CAUC"}
@@ -1 +1 @@
1
- {"version":3,"file":"transpiler.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/utils/transpiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAGnE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAE7F,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,GAAG,CAAC;IACT,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,0BAA0B,EAAE,OAAO,CAAC;IACpC,iCAAiC,EAAE,OAAO,CAAC;IAC3C,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,KAAK,GAAG,UAAU,GAAG,KAAK,CAAC;IACpC,MAAM,EAAE,OAAO,CAAC;IAChB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,OAAO,CAAC;IACb,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,aAAa,EAAE,OAAO,GAAG,oBAAoB,CAAC;IAC9C;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,mBAAmB,kBACd,cAAc,cAAc,CAAC,oBAAoB,gBAAgB,YAC1E,OAAO,GAAG,gBAkBhB,CAAC;AAEJ,eAAO,MAAM,mBAAmB,kBACf,cAAc,cAAc,CAAC,oBAC3B,QAAQ,gBAAgB,CAAC,KACzC,gBAyDF,CAAC"}
1
+ {"version":3,"file":"transpiler.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/utils/transpiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAGnE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAG7F,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,GAAG,CAAC;IACT,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,0BAA0B,EAAE,OAAO,CAAC;IACpC,iCAAiC,EAAE,OAAO,CAAC;IAC3C,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,KAAK,GAAG,UAAU,GAAG,KAAK,CAAC;IACpC,MAAM,EAAE,OAAO,CAAC;IAChB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,OAAO,CAAC;IACb,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,aAAa,EAAE,OAAO,GAAG,oBAAoB,CAAC;IAC9C;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,mBAAmB,kBACd,cAAc,cAAc,CAAC,oBAAoB,gBAAgB,YAC1E,OAAO,GAAG,gBAkBhB,CAAC;AAEJ,eAAO,MAAM,mBAAmB,kBACf,cAAc,cAAc,CAAC,oBAC3B,QAAQ,gBAAgB,CAAC,KACzC,gBAyCF,CAAC"}
@@ -1,12 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getTranspilerConfig = exports.addTranspilerLoader = void 0;
4
- const tslib_1 = require("tslib");
5
4
  const resolve_1 = require("resolve");
6
- const browserslist_config_1 = tslib_1.__importDefault(require("@tinkoff/browserslist-config"));
7
- const browserslist_1 = tslib_1.__importDefault(require("browserslist"));
8
5
  const swc_1 = require("../../swc");
9
6
  const babel_1 = require("../../babel");
7
+ const browserslist_1 = require("./browserslist");
10
8
  const addTranspilerLoader = (configManager, transpilerConfig) => (rule) => {
11
9
  const { loader } = configManager.experiments.transpilation;
12
10
  if (loader === 'swc') {
@@ -33,19 +31,8 @@ const getTranspilerConfig = (configManager, overrideOptions = {}) => {
33
31
  console.warn(`"alias" option deprecated and ignored as cli now supports baseUrl and paths from the app's tsconfig.json file.
34
32
  Just check or add configuration to your tsconfig file and remove alias from tramvai.json`);
35
33
  }
36
- let actualTarget = target;
37
- if (!target) {
38
- if (isServer) {
39
- actualTarget = 'node';
40
- }
41
- }
42
- const browserslistConfigRaw = browserslist_1.default.findConfig(rootDir);
43
- // Set defaults if the explicit config for browserslist was not found or the config does not contain the necessary targets
44
- const browserslistQuery = browserslistConfigRaw?.[actualTarget] ?? browserslist_config_1.default[actualTarget] ?? browserslist_config_1.default.defaults;
45
- const browsersListTargets = (0, browserslist_1.default)(browserslistQuery, {
46
- mobileToDesktop: true,
47
- env: actualTarget,
48
- });
34
+ const actualTarget = (0, browserslist_1.getActualTarget)(target, isServer);
35
+ const browsersListTargets = (0, browserslist_1.getBrowserslistTargets)(rootDir, actualTarget);
49
36
  return {
50
37
  isServer,
51
38
  env,
@@ -1 +1 @@
1
- {"version":3,"file":"transpiler.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/transpiler.ts"],"names":[],"mappings":";;;;AACA,qCAA0C;AAC1C,+FAAsD;AACtD,wEAAwC;AAExC,mCAA0C;AAC1C,uCAAiD;AAqC1C,MAAM,mBAAmB,GAC9B,CAAC,aAA4C,EAAE,gBAAkC,EAAE,EAAE,CACrF,CAAC,IAAgB,EAAE,EAAE;IACnB,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC;IAE3D,IAAI,MAAM,KAAK,KAAK,EAAE;QACpB,IAAI;YACF,IAAA,cAAO,EAAC,uCAAuC,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;SACtF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,KAAK,CAAC;;OAEjB,CAAC,CAAC;SACF;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAA,mBAAa,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACjF;IAED,IAAI,MAAM,KAAK,OAAO,EAAE;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,IAAA,0BAAkB,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACxF;AACH,CAAC,CAAC;AApBS,QAAA,mBAAmB,uBAoB5B;AAEG,MAAM,mBAAmB,GAAG,CACjC,aAA4C,EAC5C,kBAA6C,EAAE,EAC7B,EAAE;IACpB,MAAM,EACJ,iBAAiB,EACjB,KAAK,EACL,MAAM,EACN,OAAO,EACP,0BAA0B,EAC1B,iBAAiB,EACjB,WAAW,EAAE,EAAE,iCAAiC,EAAE,aAAa,EAAE,GAClE,GAAG,aAAa,CAAC;IAClB,MAAM,EAAE,GAAG,EAAE,GAAG,aAAa,CAAC;IAC9B,MAAM,QAAQ,GAAG,aAAa,CAAC,SAAS,KAAK,QAAQ,CAAC;IAEtD,IAAI,KAAK,EAAE;QACT,OAAO,CAAC,IAAI,CAAC;yFACwE,CAAC,CAAC;KACxF;IAED,IAAI,YAAY,GAAG,MAAM,CAAC;IAE1B,IAAI,CAAC,MAAM,EAAE;QACX,IAAI,QAAQ,EAAE;YACZ,YAAY,GAAG,MAAM,CAAC;SACvB;KACF;IAED,MAAM,qBAAqB,GAAG,sBAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAE/D,0HAA0H;IAC1H,MAAM,iBAAiB,GACrB,qBAAqB,EAAE,CAAC,YAAY,CAAC,IAAI,6BAAU,CAAC,YAAY,CAAC,IAAI,6BAAU,CAAC,QAAQ,CAAC;IAE3F,MAAM,mBAAmB,GAAG,IAAA,sBAAY,EAAC,iBAAiB,EAAE;QAC1D,eAAe,EAAE,IAAI;QACrB,GAAG,EAAE,YAAY;KAClB,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ;QACR,GAAG;QACH,iBAAiB;QACjB,OAAO,EAAE,IAAI;QACb,kBAAkB,EAAE,IAAI;QACxB,GAAG,EAAE,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO;QACvC,iBAAiB;QACjB,0BAA0B;QAC1B,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,MAAM;QACN,YAAY;QACZ,mBAAmB;QACnB,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,KAAK;QACd,UAAU,EAAE,KAAK;QACjB,iCAAiC;QACjC,aAAa;QACb,GAAG,eAAe;KACnB,CAAC;AACJ,CAAC,CAAC;AA5DW,QAAA,mBAAmB,uBA4D9B"}
1
+ {"version":3,"file":"transpiler.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/transpiler.ts"],"names":[],"mappings":";;;AACA,qCAA0C;AAI1C,mCAA0C;AAC1C,uCAAiD;AAIjD,iDAAyE;AAkClE,MAAM,mBAAmB,GAC9B,CAAC,aAA4C,EAAE,gBAAkC,EAAE,EAAE,CACrF,CAAC,IAAgB,EAAE,EAAE;IACnB,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC;IAE3D,IAAI,MAAM,KAAK,KAAK,EAAE;QACpB,IAAI;YACF,IAAA,cAAO,EAAC,uCAAuC,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;SACtF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,KAAK,CAAC;;OAEjB,CAAC,CAAC;SACF;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAA,mBAAa,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACjF;IAED,IAAI,MAAM,KAAK,OAAO,EAAE;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,IAAA,0BAAkB,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACxF;AACH,CAAC,CAAC;AApBS,QAAA,mBAAmB,uBAoB5B;AAEG,MAAM,mBAAmB,GAAG,CACjC,aAA4C,EAC5C,kBAA6C,EAAE,EAC7B,EAAE;IACpB,MAAM,EACJ,iBAAiB,EACjB,KAAK,EACL,MAAM,EACN,OAAO,EACP,0BAA0B,EAC1B,iBAAiB,EACjB,WAAW,EAAE,EAAE,iCAAiC,EAAE,aAAa,EAAE,GAClE,GAAG,aAAa,CAAC;IAClB,MAAM,EAAE,GAAG,EAAE,GAAG,aAAa,CAAC;IAC9B,MAAM,QAAQ,GAAG,aAAa,CAAC,SAAS,KAAK,QAAQ,CAAC;IAEtD,IAAI,KAAK,EAAE;QACT,OAAO,CAAC,IAAI,CAAC;yFACwE,CAAC,CAAC;KACxF;IAED,MAAM,YAAY,GAAG,IAAA,8BAAe,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACvD,MAAM,mBAAmB,GAAG,IAAA,qCAAsB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAE1E,OAAO;QACL,QAAQ;QACR,GAAG;QACH,iBAAiB;QACjB,OAAO,EAAE,IAAI;QACb,kBAAkB,EAAE,IAAI;QACxB,GAAG,EAAE,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO;QACvC,iBAAiB;QACjB,0BAA0B;QAC1B,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,MAAM;QACN,YAAY;QACZ,mBAAmB;QACnB,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,KAAK;QACd,UAAU,EAAE,KAAK;QACjB,iCAAiC;QACjC,aAAa;QACb,GAAG,eAAe;KACnB,CAAC;AACJ,CAAC,CAAC;AA5CW,QAAA,mBAAmB,uBA4C9B"}