@tramvai/cli 2.160.1 → 2.160.4

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.
@@ -1,2 +1,2 @@
1
- export declare const getLibPackageVersion: (name: string, unifiedVersion: string) => Promise<string | undefined>;
1
+ export declare const getLibPackageVersion: (name: string, unifiedVersion: string, prerelease: boolean) => Promise<string | undefined>;
2
2
  //# sourceMappingURL=dependantLibs.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"dependantLibs.d.ts","sourceRoot":"","sources":["../../../src/commands/update/dependantLibs.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,oBAAoB,SACzB,MAAM,kBACI,MAAM,KACrB,QAAQ,MAAM,GAAG,SAAS,CAmB5B,CAAC"}
1
+ {"version":3,"file":"dependantLibs.d.ts","sourceRoot":"","sources":["../../../src/commands/update/dependantLibs.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,oBAAoB,SACzB,MAAM,kBACI,MAAM,cACV,OAAO,KAClB,QAAQ,MAAM,GAAG,SAAS,CAmB5B,CAAC"}
@@ -5,10 +5,10 @@ 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 = (name, unifiedVersion) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
8
+ const getLibPackageVersion = (name, unifiedVersion, prerelease) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
9
9
  const unifiedModule = tramvaiVersions_1.DEPENDANT_LIBS_MAP.get(name);
10
10
  if (!unifiedModule) {
11
- return (0, latest_version_1.default)(name);
11
+ return (0, latest_version_1.default)(name, { version: prerelease ? 'prerelease' : 'latest' });
12
12
  }
13
13
  const { dependencies } = yield (0, package_json_1.default)(unifiedModule, { version: unifiedVersion });
14
14
  if (!dependencies[name]) {
@@ -1 +1 @@
1
- {"version":3,"file":"dependantLibs.js","sourceRoot":"","sources":["../../../src/commands/update/dependantLibs.ts"],"names":[],"mappings":";;;;AAAA,4EAAqD;AACrD,wEAA0C;AAC1C,iEAAiE;AAE1D,MAAM,oBAAoB,GAAG,CAClC,IAAY,EACZ,cAAsB,EACO,EAAE;IAC/B,MAAM,aAAa,GAAG,oCAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,aAAa,EAAE;QAClB,OAAO,IAAA,wBAAuB,EAAC,IAAI,CAAC,CAAC;KACtC;IAED,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAA,sBAAc,EAAC,aAAa,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;IAE1F,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;QACvB,OAAO,CAAC,IAAI,CACV,6CAA6C,IAAI;6CACV,CACxC,CAAC;QAEF,OAAO;KACR;IAED,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC,CAAA,CAAC;AAtBW,QAAA,oBAAoB,wBAsB/B"}
1
+ {"version":3,"file":"dependantLibs.js","sourceRoot":"","sources":["../../../src/commands/update/dependantLibs.ts"],"names":[],"mappings":";;;;AAAA,4EAAqD;AACrD,wEAA0C;AAC1C,iEAAiE;AAE1D,MAAM,oBAAoB,GAAG,CAClC,IAAY,EACZ,cAAsB,EACtB,UAAmB,EACU,EAAE;IAC/B,MAAM,aAAa,GAAG,oCAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,aAAa,EAAE;QAClB,OAAO,IAAA,wBAAuB,EAAC,IAAI,EAAE,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;KACzF;IAED,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAA,sBAAc,EAAC,aAAa,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;IAE1F,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;QACvB,OAAO,CAAC,IAAI,CACV,6CAA6C,IAAI;6CACV,CACxC,CAAC;QAEF,OAAO;KACR;IAED,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC,CAAA,CAAC;AAvBW,QAAA,oBAAoB,wBAuB/B"}
@@ -12,7 +12,7 @@ exports.default = (context, { to: version = 'latest' }) => tslib_1.__awaiter(voi
12
12
  event: 'resolving-version',
13
13
  message: `Tramvai version resolved to ${versionNumber}`,
14
14
  });
15
- yield (0, updatePackageJson_1.updatePackageJson)(versionNumber);
15
+ yield (0, updatePackageJson_1.updatePackageJson)(versionNumber, version === 'prerelease');
16
16
  context.logger.event({
17
17
  type: 'info',
18
18
  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;AAMhF,kBAAe,CACb,OAAgB,EAChB,EAAE,EAAE,EAAE,OAAO,GAAG,QAAQ,EAAU,EACV,EAAE;IAC1B,MAAM,aAAa,GAAG,MAAM,IAAA,iDAAuB,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAE9E,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACnB,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,mBAAmB;QAC1B,OAAO,EAAE,+BAA+B,aAAa,EAAE;KACxD,CAAC,CAAC;IAEH,MAAM,IAAA,qCAAiB,EAAC,aAAa,CAAC,CAAC;IAEvC,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,CAAA,CAAC"}
1
+ {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/commands/update/update.ts"],"names":[],"mappings":";;;AAEA,uGAAoG;AACpG,uEAAoE;AACpE,2DAAwD;AACxD,mFAAgF;AAMhF,kBAAe,CACb,OAAgB,EAChB,EAAE,EAAE,EAAE,OAAO,GAAG,QAAQ,EAAU,EACV,EAAE;IAC1B,MAAM,aAAa,GAAG,MAAM,IAAA,iDAAuB,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAE9E,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACnB,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,mBAAmB;QAC1B,OAAO,EAAE,+BAA+B,aAAa,EAAE;KACxD,CAAC,CAAC;IAEH,MAAM,IAAA,qCAAiB,EAAC,aAAa,EAAE,OAAO,KAAK,YAAY,CAAC,CAAC;IAEjE,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,CAAA,CAAC"}
@@ -1,2 +1,2 @@
1
- export declare const updatePackageJson: (version: string) => Promise<void>;
1
+ export declare const updatePackageJson: (version: string, prerelease?: boolean) => 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":"AA8DA,eAAO,MAAM,iBAAiB,YAAmB,MAAM,kBA2BtD,CAAC"}
1
+ {"version":3,"file":"updatePackageJson.d.ts","sourceRoot":"","sources":["../../../src/commands/update/updatePackageJson.ts"],"names":[],"mappings":"AA+DA,eAAO,MAAM,iBAAiB,YAAmB,MAAM,eAAe,OAAO,kBAiC5E,CAAC"}
@@ -15,14 +15,14 @@ const getVersionFromDep = (dep) => {
15
15
  return ((_a = (0, semver_1.parse)(dep)) === null || _a === void 0 ? void 0 : _a.version) || ((_b = (0, semver_1.minVersion)(dep)) === null || _b === void 0 ? void 0 : _b.version);
16
16
  }
17
17
  };
18
- const updateDependencies = (dependencies = {}, targetVersion, currentVersion, spinner) => {
18
+ const updateDependencies = (dependencies = {}, targetVersion, prerelease, currentVersion, spinner) => {
19
19
  return (0, p_map_1.default)(Object.keys(dependencies), (dep) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
20
20
  let nextVersion;
21
21
  if ((0, tramvaiVersions_1.isUnifiedVersion)(dep) && getVersionFromDep(dependencies[dep]) === currentVersion) {
22
22
  nextVersion = targetVersion;
23
23
  }
24
24
  else if ((0, tramvaiVersions_1.isDependantLib)(dep)) {
25
- const libVersion = yield (0, dependantLibs_1.getLibPackageVersion)(dep, targetVersion);
25
+ const libVersion = yield (0, dependantLibs_1.getLibPackageVersion)(dep, targetVersion, prerelease);
26
26
  nextVersion = libVersion;
27
27
  }
28
28
  if (nextVersion) {
@@ -47,7 +47,7 @@ const updateDependencies = (dependencies = {}, targetVersion, currentVersion, sp
47
47
  concurrency: 10,
48
48
  });
49
49
  };
50
- const updatePackageJson = (version) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
50
+ const updatePackageJson = (version, prerelease) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
51
51
  const file = fs_1.default.readFileSync('package.json');
52
52
  const content = JSON.parse(file.toString());
53
53
  const currentVersion = getVersionFromDep(content.dependencies['@tramvai/core']);
@@ -60,9 +60,9 @@ const updatePackageJson = (version) => tslib_1.__awaiter(void 0, void 0, void 0,
60
60
  }
61
61
  const spinner = (0, ora_1.default)(`Updating package.json versions`).start();
62
62
  try {
63
- yield updateDependencies(content.dependencies, version, currentVersion, spinner);
64
- yield updateDependencies(content.devDependencies, version, currentVersion, spinner);
65
- yield updateDependencies(content.peerDependencies, version, currentVersion, spinner);
63
+ yield updateDependencies(content.dependencies, version, prerelease, currentVersion, spinner);
64
+ yield updateDependencies(content.devDependencies, version, prerelease, currentVersion, spinner);
65
+ yield updateDependencies(content.peerDependencies, version, prerelease, currentVersion, spinner);
66
66
  fs_1.default.writeFileSync('package.json', JSON.stringify(content, null, 2));
67
67
  }
68
68
  finally {
@@ -1 +1 @@
1
- {"version":3,"file":"updatePackageJson.js","sourceRoot":"","sources":["../../../src/commands/update/updatePackageJson.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"updatePackageJson.js","sourceRoot":"","sources":["../../../src/commands/update/updatePackageJson.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"prod.d.ts","sourceRoot":"","sources":["../../../../../src/library/webpack/application/client/prod.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,eAAe,CAAC;AAUnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AAU1F,eAAO,MAAM,mBAAmB;mBAGf,cAAc,sBAAsB,CAAC;YAwErD,CAAC"}
1
+ {"version":3,"file":"prod.d.ts","sourceRoot":"","sources":["../../../../../src/library/webpack/application/client/prod.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,eAAe,CAAC;AAUnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AAyB1F,eAAO,MAAM,mBAAmB;mBAGf,cAAc,sBAAsB,CAAC;YAwErD,CAAC"}
@@ -14,6 +14,15 @@ const sourcemaps_1 = tslib_1.__importDefault(require("../../blocks/sourcemaps"))
14
14
  const prod_1 = tslib_1.__importDefault(require("../../common/client/prod"));
15
15
  const extractCssPlugin_1 = require("../../blocks/extractCssPlugin");
16
16
  const splitChunks_1 = require("./prod/optimization/splitChunks");
17
+ const generateFilename = (extension, isChunk, configManager) => [
18
+ '[name]',
19
+ !configManager.disableProdOptimization && '[contenthash]',
20
+ configManager.disableProdOptimization && configManager.modern && 'modern',
21
+ isChunk && 'chunk',
22
+ extension,
23
+ ]
24
+ .filter(Boolean)
25
+ .join('.');
17
26
  // eslint-disable-next-line max-statements
18
27
  const webpackClientConfig = ({ configManager, }) => {
19
28
  const config = new webpack_chain_1.default();
@@ -23,16 +32,16 @@ const webpackClientConfig = ({ configManager, }) => {
23
32
  config.output
24
33
  .path(configManager.buildPath)
25
34
  .publicPath('')
26
- .filename('[name].[contenthash].js')
27
- .chunkFilename('[name].[contenthash].chunk.js')
35
+ .filename(generateFilename('js', false, configManager))
36
+ .chunkFilename(generateFilename('js', true, configManager))
28
37
  .crossOriginLoading('anonymous')
29
38
  .chunkLoadTimeout(240000);
30
39
  config.output.set('chunkLoadingGlobal', 'wsp');
31
40
  config.batch((0, splitChunks_1.splitChunksConfig)(configManager));
32
41
  config.stats('minimal');
33
42
  config.batch((0, extractCssPlugin_1.extractCssPluginFactory)(configManager, {
34
- filename: '[name].[contenthash].css',
35
- chunkFilename: '[name].[contenthash].chunk.css',
43
+ filename: generateFilename('css', false, configManager),
44
+ chunkFilename: generateFilename('css', true, configManager),
36
45
  }));
37
46
  config.plugin('runtime-path').use(RuntimePathPlugin_1.default, [
38
47
  {
@@ -1 +1 @@
1
- {"version":3,"file":"prod.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/client/prod.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"prod.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/client/prod.ts"],"names":[],"mappings":"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"}
@@ -18,7 +18,7 @@ const extractCssPlugin_1 = require("../../blocks/extractCssPlugin");
18
18
  const server_1 = require("../../blocks/pwa/server");
19
19
  // eslint-disable-next-line import/no-default-export
20
20
  exports.default = (configManager) => (config) => {
21
- const { output, fileSystemPages } = configManager;
21
+ const { output, fileSystemPages, disableProdOptimization } = configManager;
22
22
  config
23
23
  .name('server')
24
24
  .target('node')
@@ -35,7 +35,7 @@ exports.default = (configManager) => (config) => {
35
35
  .batch((0, serverInline_1.serverInline)(configManager))
36
36
  .batch((0, browserslistConfig_1.browserslistConfigResolve)(configManager))
37
37
  .batch((0, extractCssPlugin_1.extractCssPluginFactory)(configManager, {
38
- filename: 'server.[contenthash].css',
38
+ filename: disableProdOptimization ? 'server.css' : 'server.[contenthash].css',
39
39
  chunkFilename: null,
40
40
  }))
41
41
  .batch((0, css_1.default)(configManager))
@@ -1 +1 @@
1
- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/server/common.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/server/common.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/child-app/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAKxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAUnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;wCAGnD,cAAc,mBAAmB,CAAC,cAAc,MAAM;AAArF,wBAkFE"}
1
+ {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/child-app/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAKxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAUnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;wCAGnD,cAAc,mBAAmB,CAAC,cAAc,MAAM;AAArF,wBAqFE"}
@@ -70,9 +70,12 @@ exports.default = (configManager) => (config) => {
70
70
  // Way to reproduce: build and compare stats file for child-app with absolute and relative paths
71
71
  // -----
72
72
  // 2) path.relative should use the posix separator because
73
- // @module-federation/node library (https://github.com/module-federation/universe/blob/2dd44826954e5136bac08b0d9a0e7e01dbb8b79c/packages/typescript/src/lib/TypescriptCompiler.ts#L110)
74
- // is splitting path strings with regexp, which only works correctly for posix paths.
75
- entry: path_1.default.posix.relative(config.get('context'), entry),
73
+ // @module-federation/node is parsing relative path incorrectly
74
+ // Debug notes: there is problem in webpack/ModuleFederation or enhanced-resolve
75
+ entry: path_1.default
76
+ .relative(config.get('context'), entry)
77
+ .split(path_1.default.win32.sep)
78
+ .join(path_1.default.posix.sep),
76
79
  },
77
80
  shared: (0, moduleFederationShared_1.getSharedModules)(configManager),
78
81
  },
@@ -1 +1 @@
1
- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/library/webpack/child-app/common.ts"],"names":[],"mappings":";;;AACA,wDAAwB;AACxB,kDAAoE;AACpE,kEAAoC;AAIpC,8DAA8B;AAC9B,8DAA8B;AAC9B,gEAAgC;AAChC,8EAA8C;AAE9C,qEAA4D;AAC5D,uDAAoD;AACpD,8EAA8C;AAE9C,iEAAqE;AAErE,kBAAe,CAAC,aAAiD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IACvF,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC;IAE3D,MAAM,iBAAiB,GACrB,aAAa,CAAC,GAAG,KAAK,YAAY;QAChC,CAAC,CAAC,GAAG,IAAI,aAAa;QACtB,CAAC,CAAC,GAAG,IAAI,mCAAmC,CAAC;IACjD,MAAM,KAAK,GAAG,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAExD,qIAAqI;IACrI,2FAA2F;IAC3F,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAC,CAAC;IAE1E,MAAM,CAAC,KAAK,CAAC,IAAA,oBAAU,EAAC,aAAa,CAAC,CAAC,CAAC;IAExC,MAAM,CAAC,KAAK,CAAC,IAAA,cAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IAEpC,MAAM,CAAC,KAAK,CAAC,IAAA,yBAAW,EAAC,aAAa,CAAC,CAAC,CAAC;IAEzC,MAAM;SACH,KAAK,CAAC,IAAA,YAAE,EAAC,aAAa,CAAC,CAAC;SACxB,KAAK,CAAC,IAAA,YAAE,EAAC,aAAa,CAAC,CAAC;SACxB,KAAK,CACJ,IAAA,aAAG,EAAC,aAAa,EAAE;QACjB,cAAc,EAAE,iBAAiB;KAClC,CAAC,CACH,CAAC;IAEJ,IAAI,SAAS,EAAE;QACb,MAAM,CAAC,KAAK,CAAC,IAAA,oBAAU,EAAC,aAAa,CAAC,CAAC,CAAC;KACzC;IAED,MAAM,CAAC,KAAK,CACV,IAAA,0CAAuB,EAAC,aAAa,EAAE;QACrC,QAAQ,EAAE,UAAU,aAAa,CAAC,OAAO,MAAM;QAC/C,aAAa,EAAE,UAAU,aAAa,CAAC,OAAO,MAAM;KACrD,CAAC,CACH,CAAC;IAEF,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAE7C,mEAAmE;IACnE,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC;QAC9B,WAAW,EAAE;YACX,OAAO,EAAE,KAAK;YACd,cAAc,EAAE,KAAK;YACrB,MAAM,EAAE;gBACN,IAAI;gBACJ,IAAI,EAAE,kBAAkB;gBACxB,MAAM,EAAE,OAAO;gBACf,OAAO,EAAE,IAAI;aACd;SACF;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,gCAAyB,EAAE;QAChE;YACE,QAAQ,EAAE,SAAS,KAAK,QAAQ;YAChC,IAAI;YACJ,OAAO,EACL,aAAa,CAAC,SAAS,KAAK,QAAQ;gBAClC,CAAC,CAAC;oBACE,IAAI,EAAE,WAAW;iBAClB;gBACH,CAAC,CAAC;oBACE,IAAI,EAAE,oDAAoD;oBAC1D,IAAI,EAAE,QAAQ;iBACf;YACP,OAAO,EAAE;gBACP,gDAAgD;gBAChD,6CAA6C;gBAC7C,mBAAmB;gBACnB,gGAAgG;gBAChG,QAAQ;gBACR,0DAA0D;gBAC1D,uLAAuL;gBACvL,qFAAqF;gBACrF,KAAK,EAAE,cAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC;aACzD;YACD,MAAM,EAAE,IAAA,yCAAgB,EAAC,aAAa,CAAC;SACJ;KACtC,CAAC,CAAC;AACL,CAAC,CAAC"}
1
+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/library/webpack/child-app/common.ts"],"names":[],"mappings":";;;AACA,wDAAwB;AACxB,kDAAoE;AACpE,kEAAoC;AAIpC,8DAA8B;AAC9B,8DAA8B;AAC9B,gEAAgC;AAChC,8EAA8C;AAE9C,qEAA4D;AAC5D,uDAAoD;AACpD,8EAA8C;AAE9C,iEAAqE;AAErE,kBAAe,CAAC,aAAiD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IACvF,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC;IAE3D,MAAM,iBAAiB,GACrB,aAAa,CAAC,GAAG,KAAK,YAAY;QAChC,CAAC,CAAC,GAAG,IAAI,aAAa;QACtB,CAAC,CAAC,GAAG,IAAI,mCAAmC,CAAC;IACjD,MAAM,KAAK,GAAG,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAExD,qIAAqI;IACrI,2FAA2F;IAC3F,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAC,CAAC;IAE1E,MAAM,CAAC,KAAK,CAAC,IAAA,oBAAU,EAAC,aAAa,CAAC,CAAC,CAAC;IAExC,MAAM,CAAC,KAAK,CAAC,IAAA,cAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IAEpC,MAAM,CAAC,KAAK,CAAC,IAAA,yBAAW,EAAC,aAAa,CAAC,CAAC,CAAC;IAEzC,MAAM;SACH,KAAK,CAAC,IAAA,YAAE,EAAC,aAAa,CAAC,CAAC;SACxB,KAAK,CAAC,IAAA,YAAE,EAAC,aAAa,CAAC,CAAC;SACxB,KAAK,CACJ,IAAA,aAAG,EAAC,aAAa,EAAE;QACjB,cAAc,EAAE,iBAAiB;KAClC,CAAC,CACH,CAAC;IAEJ,IAAI,SAAS,EAAE;QACb,MAAM,CAAC,KAAK,CAAC,IAAA,oBAAU,EAAC,aAAa,CAAC,CAAC,CAAC;KACzC;IAED,MAAM,CAAC,KAAK,CACV,IAAA,0CAAuB,EAAC,aAAa,EAAE;QACrC,QAAQ,EAAE,UAAU,aAAa,CAAC,OAAO,MAAM;QAC/C,aAAa,EAAE,UAAU,aAAa,CAAC,OAAO,MAAM;KACrD,CAAC,CACH,CAAC;IAEF,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAE7C,mEAAmE;IACnE,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC;QAC9B,WAAW,EAAE;YACX,OAAO,EAAE,KAAK;YACd,cAAc,EAAE,KAAK;YACrB,MAAM,EAAE;gBACN,IAAI;gBACJ,IAAI,EAAE,kBAAkB;gBACxB,MAAM,EAAE,OAAO;gBACf,OAAO,EAAE,IAAI;aACd;SACF;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,gCAAyB,EAAE;QAChE;YACE,QAAQ,EAAE,SAAS,KAAK,QAAQ;YAChC,IAAI;YACJ,OAAO,EACL,aAAa,CAAC,SAAS,KAAK,QAAQ;gBAClC,CAAC,CAAC;oBACE,IAAI,EAAE,WAAW;iBAClB;gBACH,CAAC,CAAC;oBACE,IAAI,EAAE,oDAAoD;oBAC1D,IAAI,EAAE,QAAQ;iBACf;YACP,OAAO,EAAE;gBACP,gDAAgD;gBAChD,6CAA6C;gBAC7C,mBAAmB;gBACnB,gGAAgG;gBAChG,QAAQ;gBACR,0DAA0D;gBAC1D,+DAA+D;gBAC/D,gFAAgF;gBAChF,KAAK,EAAE,cAAI;qBACR,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC;qBACtC,KAAK,CAAC,cAAI,CAAC,KAAK,CAAC,GAAG,CAAC;qBACrB,IAAI,CAAC,cAAI,CAAC,KAAK,CAAC,GAAG,CAAC;aACxB;YACD,MAAM,EAAE,IAAA,yCAAgB,EAAC,aAAa,CAAC;SACJ;KACtC,CAAC,CAAC;AACL,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tramvai/cli",
3
- "version": "2.160.1",
3
+ "version": "2.160.4",
4
4
  "description": "Cli инструмент для сборки и запуска приложений",
5
5
  "files": [
6
6
  "src",
@@ -71,7 +71,7 @@
71
71
  "@tinkoff/utils": "^2.1.3",
72
72
  "@tinkoff/webpack-dedupe-plugin": "1.0.5",
73
73
  "@tramvai/build": "3.1.4",
74
- "@tramvai/react": "2.160.1",
74
+ "@tramvai/react": "2.160.4",
75
75
  "@tramvai/tools-check-versions": "0.4.18",
76
76
  "@tramvai/tools-migrate": "0.6.23",
77
77
  "ajv": "^8.12.0",
@@ -4,12 +4,13 @@ import { DEPENDANT_LIBS_MAP } from '../../utils/tramvaiVersions';
4
4
 
5
5
  export const getLibPackageVersion = async (
6
6
  name: string,
7
- unifiedVersion: string
7
+ unifiedVersion: string,
8
+ prerelease: boolean
8
9
  ): Promise<string | undefined> => {
9
10
  const unifiedModule = DEPENDANT_LIBS_MAP.get(name);
10
11
 
11
12
  if (!unifiedModule) {
12
- return getLatestPackageVersion(name);
13
+ return getLatestPackageVersion(name, { version: prerelease ? 'prerelease' : 'latest' });
13
14
  }
14
15
 
15
16
  const { dependencies } = await getPackageInfo(unifiedModule, { version: unifiedVersion });
@@ -21,7 +21,7 @@ export default async (
21
21
  message: `Tramvai version resolved to ${versionNumber}`,
22
22
  });
23
23
 
24
- await updatePackageJson(versionNumber);
24
+ await updatePackageJson(versionNumber, version === 'prerelease');
25
25
 
26
26
  context.logger.event({
27
27
  type: 'info',
@@ -2,6 +2,7 @@ import { updatePackageJson } from './updatePackageJson';
2
2
 
3
3
  const LATEST_TRAMVAI_VERSION = '1.115.6';
4
4
  const LATEST_LIB_VERSION = '0.8.23';
5
+ const PRERELEASE_LIB_VERSION = '2.0.1';
5
6
 
6
7
  let mockPackageJson: Record<string, any>;
7
8
  const mockFsWrite = jest.fn();
@@ -10,11 +11,13 @@ const mockPackageInfoDependencies = jest.fn<Record<string, string | undefined>,
10
11
  jest.mock('../../utils/commands/dependencies/packageHasVersion', () => ({
11
12
  packageHasVersion: () => true,
12
13
  }));
13
- jest.mock('latest-version', () => (dep: string) => {
14
+ jest.mock('latest-version', () => (dep: string, { version }) => {
14
15
  if (dep.startsWith('@tramvai')) {
15
16
  return LATEST_TRAMVAI_VERSION;
16
17
  }
17
-
18
+ if (version === 'prerelease') {
19
+ return PRERELEASE_LIB_VERSION;
20
+ }
18
21
  return LATEST_LIB_VERSION;
19
22
  });
20
23
 
@@ -91,3 +94,65 @@ it('should update tramvai deps to latest versions', async () => {
91
94
  ]
92
95
  `);
93
96
  });
97
+
98
+ it('prerelease should be used for dependant libs', async () => {
99
+ mockPackageJson = {
100
+ dependencies: {
101
+ '@tramvai/core': '1.93.2',
102
+ '@tramvai/module-common': '1.93.2',
103
+ '@tinkoff/router': '^0.2.3',
104
+ '@tinkoff/url': '0.3.2',
105
+ '@tinkoff/pack-polyfills': '1.0.0',
106
+ },
107
+ devDependencies: {
108
+ '@tramvai/cli': '1.93.2',
109
+ },
110
+ peerDependencies: {
111
+ '@tinkoff/dippy': '0.7.10',
112
+ },
113
+ };
114
+
115
+ mockPackageInfoDependencies.mockImplementation((dep: string) => {
116
+ switch (dep) {
117
+ case '@tramvai/core':
118
+ return { '@tinkoff/dippy': '0.7.44', '@tinkoff/utils': '^2.1.0' };
119
+ case '@tramvai/module-common':
120
+ return {
121
+ '@tinkoff/error': '0.6.1',
122
+ '@tinkoff/url': '0.4.1',
123
+ };
124
+ case '@tramvai/cli':
125
+ return {};
126
+ case '@tramvai/module-router':
127
+ return {
128
+ '@tinkoff/router': '0.4.3',
129
+ '@tinkoff/url': '0.4.1',
130
+ };
131
+ }
132
+
133
+ return {};
134
+ });
135
+
136
+ await updatePackageJson(LATEST_TRAMVAI_VERSION, true);
137
+
138
+ expect(mockFsWrite.mock.calls[0]).toMatchInlineSnapshot(`
139
+ [
140
+ "package.json",
141
+ "{
142
+ "dependencies": {
143
+ "@tramvai/core": "1.115.6",
144
+ "@tramvai/module-common": "1.115.6",
145
+ "@tinkoff/router": "0.4.3",
146
+ "@tinkoff/url": "0.4.1",
147
+ "@tinkoff/pack-polyfills": "2.0.1"
148
+ },
149
+ "devDependencies": {
150
+ "@tramvai/cli": "1.115.6"
151
+ },
152
+ "peerDependencies": {
153
+ "@tinkoff/dippy": "0.7.44"
154
+ }
155
+ }",
156
+ ]
157
+ `);
158
+ });
@@ -16,6 +16,7 @@ const getVersionFromDep = (dep?: string) => {
16
16
  const updateDependencies = (
17
17
  dependencies: Record<string, string> = {},
18
18
  targetVersion: string,
19
+ prerelease: boolean,
19
20
  currentVersion: string,
20
21
  spinner: Ora
21
22
  ) => {
@@ -27,7 +28,7 @@ const updateDependencies = (
27
28
  if (isUnifiedVersion(dep) && getVersionFromDep(dependencies[dep]) === currentVersion) {
28
29
  nextVersion = targetVersion;
29
30
  } else if (isDependantLib(dep)) {
30
- const libVersion = await getLibPackageVersion(dep, targetVersion);
31
+ const libVersion = await getLibPackageVersion(dep, targetVersion, prerelease);
31
32
  nextVersion = libVersion;
32
33
  }
33
34
 
@@ -60,7 +61,7 @@ const updateDependencies = (
60
61
  );
61
62
  };
62
63
 
63
- export const updatePackageJson = async (version: string) => {
64
+ export const updatePackageJson = async (version: string, prerelease?: boolean) => {
64
65
  const file = fs.readFileSync('package.json');
65
66
  const content = JSON.parse(file.toString());
66
67
  const currentVersion = getVersionFromDep(content.dependencies['@tramvai/core']);
@@ -79,9 +80,15 @@ export const updatePackageJson = async (version: string) => {
79
80
  const spinner = ora(`Updating package.json versions`).start();
80
81
 
81
82
  try {
82
- await updateDependencies(content.dependencies, version, currentVersion, spinner);
83
- await updateDependencies(content.devDependencies, version, currentVersion, spinner);
84
- await updateDependencies(content.peerDependencies, version, currentVersion, spinner);
83
+ await updateDependencies(content.dependencies, version, prerelease, currentVersion, spinner);
84
+ await updateDependencies(content.devDependencies, version, prerelease, currentVersion, spinner);
85
+ await updateDependencies(
86
+ content.peerDependencies,
87
+ version,
88
+ prerelease,
89
+ currentVersion,
90
+ spinner
91
+ );
85
92
 
86
93
  fs.writeFileSync('package.json', JSON.stringify(content, null, 2));
87
94
  } finally {
@@ -19,6 +19,21 @@ import commonProd from '../../common/client/prod';
19
19
  import { extractCssPluginFactory } from '../../blocks/extractCssPlugin';
20
20
  import { splitChunksConfig } from './prod/optimization/splitChunks';
21
21
 
22
+ const generateFilename = (
23
+ extension: string,
24
+ isChunk: boolean,
25
+ configManager: ConfigManager<ApplicationConfigEntry>
26
+ ) =>
27
+ [
28
+ '[name]',
29
+ !configManager.disableProdOptimization && '[contenthash]',
30
+ configManager.disableProdOptimization && configManager.modern && 'modern',
31
+ isChunk && 'chunk',
32
+ extension,
33
+ ]
34
+ .filter(Boolean)
35
+ .join('.');
36
+
22
37
  // eslint-disable-next-line max-statements
23
38
  export const webpackClientConfig = ({
24
39
  configManager,
@@ -35,8 +50,8 @@ export const webpackClientConfig = ({
35
50
  config.output
36
51
  .path(configManager.buildPath)
37
52
  .publicPath('')
38
- .filename('[name].[contenthash].js')
39
- .chunkFilename('[name].[contenthash].chunk.js')
53
+ .filename(generateFilename('js', false, configManager))
54
+ .chunkFilename(generateFilename('js', true, configManager))
40
55
  .crossOriginLoading('anonymous')
41
56
  .chunkLoadTimeout(240000);
42
57
 
@@ -48,8 +63,8 @@ export const webpackClientConfig = ({
48
63
 
49
64
  config.batch(
50
65
  extractCssPluginFactory(configManager, {
51
- filename: '[name].[contenthash].css',
52
- chunkFilename: '[name].[contenthash].chunk.css',
66
+ filename: generateFilename('css', false, configManager),
67
+ chunkFilename: generateFilename('css', true, configManager),
53
68
  })
54
69
  );
55
70
 
@@ -21,7 +21,7 @@ import { pwaBlock } from '../../blocks/pwa/server';
21
21
 
22
22
  // eslint-disable-next-line import/no-default-export
23
23
  export default (configManager: ConfigManager<ApplicationConfigEntry>) => (config: Config) => {
24
- const { output, fileSystemPages } = configManager;
24
+ const { output, fileSystemPages, disableProdOptimization } = configManager;
25
25
 
26
26
  config
27
27
  .name('server')
@@ -41,7 +41,7 @@ export default (configManager: ConfigManager<ApplicationConfigEntry>) => (config
41
41
  .batch(browserslistConfigResolve(configManager))
42
42
  .batch(
43
43
  extractCssPluginFactory(configManager, {
44
- filename: 'server.[contenthash].css',
44
+ filename: disableProdOptimization ? 'server.css' : 'server.[contenthash].css',
45
45
  chunkFilename: null,
46
46
  })
47
47
  )
@@ -91,9 +91,12 @@ export default (configManager: ConfigManager<ChildAppConfigEntry>) => (config: C
91
91
  // Way to reproduce: build and compare stats file for child-app with absolute and relative paths
92
92
  // -----
93
93
  // 2) path.relative should use the posix separator because
94
- // @module-federation/node library (https://github.com/module-federation/universe/blob/2dd44826954e5136bac08b0d9a0e7e01dbb8b79c/packages/typescript/src/lib/TypescriptCompiler.ts#L110)
95
- // is splitting path strings with regexp, which only works correctly for posix paths.
96
- entry: path.posix.relative(config.get('context'), entry),
94
+ // @module-federation/node is parsing relative path incorrectly
95
+ // Debug notes: there is problem in webpack/ModuleFederation or enhanced-resolve
96
+ entry: path
97
+ .relative(config.get('context'), entry)
98
+ .split(path.win32.sep)
99
+ .join(path.posix.sep),
97
100
  },
98
101
  shared: getSharedModules(configManager),
99
102
  } as UniversalFederationPluginOptions,