@tramvai/cli 2.160.2 → 3.0.2

package/lib/commands/update/dependantLibs.d.ts

@@ -1,2 +1,2 @@
-export declare const getLibPackageVersion: (name: string, unifiedVersion: string, prerelease: boolean) => Promise<string | undefined>;
+export declare const getLibPackageVersion: (name: string, unifiedVersion: string) => Promise<string | undefined>;
 //# sourceMappingURL=dependantLibs.d.ts.map

package/lib/commands/update/dependantLibs.d.ts.map

@@ -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,cACV,OAAO,KAClB,QAAQ,MAAM,GAAG,SAAS,CAmB5B,CAAC"}
+{"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"}

package/lib/commands/update/dependantLibs.js

@@ -5,10 +5,10 @@ const tslib_1 = require("tslib");
 const latest_version_1 = tslib_1.__importDefault(require("latest-version"));
 const package_json_1 = tslib_1.__importDefault(require("package-json"));
 const tramvaiVersions_1 = require("../../utils/tramvaiVersions");
-const getLibPackageVersion = (name, unifiedVersion, prerelease) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const getLibPackageVersion = (name, unifiedVersion) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     const unifiedModule = tramvaiVersions_1.DEPENDANT_LIBS_MAP.get(name);
     if (!unifiedModule) {
-        return (0, latest_version_1.default)(name, { version: prerelease ? 'prerelease' : 'latest' });
+        return (0, latest_version_1.default)(name);
     }
     const { dependencies } = yield (0, package_json_1.default)(unifiedModule, { version: unifiedVersion });
     if (!dependencies[name]) {

package/lib/commands/update/dependantLibs.js.map

@@ -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,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"}
+{"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"}

package/lib/commands/update/update.js

@@ -12,7 +12,7 @@ exports.default = (context, { to: version = 'latest' }) => tslib_1.__awaiter(voi
         event: 'resolving-version',
         message: `Tramvai version resolved to ${versionNumber}`,
     });
-    yield (0, updatePackageJson_1.updatePackageJson)(versionNumber, version === 'prerelease');
+    yield (0, updatePackageJson_1.updatePackageJson)(versionNumber);
     context.logger.event({
         type: 'info',
         event: 'install',

package/lib/commands/update/update.js.map

@@ -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,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"}
+{"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"}

package/lib/commands/update/updatePackageJson.d.ts

@@ -1,2 +1,2 @@
-export declare const updatePackageJson: (version: string, prerelease?: boolean) => Promise<void>;
+export declare const updatePackageJson: (version: string) => Promise<void>;
 //# sourceMappingURL=updatePackageJson.d.ts.map

package/lib/commands/update/updatePackageJson.d.ts.map

@@ -1 +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"}
+{"version":3,"file":"updatePackageJson.d.ts","sourceRoot":"","sources":["../../../src/commands/update/updatePackageJson.ts"],"names":[],"mappings":"AA8DA,eAAO,MAAM,iBAAiB,YAAmB,MAAM,kBA2BtD,CAAC"}

package/lib/commands/update/updatePackageJson.js

@@ -15,14 +15,14 @@ const getVersionFromDep = (dep) => {
         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);
     }
 };
-const updateDependencies = (dependencies = {}, targetVersion, prerelease, currentVersion, spinner) => {
+const updateDependencies = (dependencies = {}, targetVersion, currentVersion, spinner) => {
     return (0, p_map_1.default)(Object.keys(dependencies), (dep) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         let nextVersion;
         if ((0, tramvaiVersions_1.isUnifiedVersion)(dep) && getVersionFromDep(dependencies[dep]) === currentVersion) {
             nextVersion = targetVersion;
         }
         else if ((0, tramvaiVersions_1.isDependantLib)(dep)) {
-            const libVersion = yield (0, dependantLibs_1.getLibPackageVersion)(dep, targetVersion, prerelease);
+            const libVersion = yield (0, dependantLibs_1.getLibPackageVersion)(dep, targetVersion);
             nextVersion = libVersion;
         }
         if (nextVersion) {
@@ -47,7 +47,7 @@ const updateDependencies = (dependencies = {}, targetVersion, prerelease, curren
         concurrency: 10,
     });
 };
-const updatePackageJson = (version, prerelease) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const updatePackageJson = (version) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     const file = fs_1.default.readFileSync('package.json');
     const content = JSON.parse(file.toString());
     const currentVersion = getVersionFromDep(content.dependencies['@tramvai/core']);
@@ -60,9 +60,9 @@ const updatePackageJson = (version, prerelease) => tslib_1.__awaiter(void 0, voi
     }
     const spinner = (0, ora_1.default)(`Updating package.json versions`).start();
     try {
-        yield updateDependencies(content.dependencies, version, prerelease, currentVersion, spinner);
-        yield updateDependencies(content.devDependencies, version, prerelease, currentVersion, spinner);
-        yield updateDependencies(content.peerDependencies, version, prerelease, currentVersion, spinner);
+        yield updateDependencies(content.dependencies, version, currentVersion, spinner);
+        yield updateDependencies(content.devDependencies, version, currentVersion, spinner);
+        yield updateDependencies(content.peerDependencies, version, currentVersion, spinner);
         fs_1.default.writeFileSync('package.json', JSON.stringify(content, null, 2));
     }
     finally {

package/lib/commands/update/updatePackageJson.js.map

@@ -1 +1 @@
-{"version":3,"file":"updatePackageJson.js","sourceRoot":"","sources":["../../../src/commands/update/updatePackageJson.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"updatePackageJson.js","sourceRoot":"","sources":["../../../src/commands/update/updatePackageJson.ts"],"names":[],"mappings":"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"}

package/lib/library/webpack/application/client/prod.d.ts.map

@@ -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;AAyB1F,eAAO,MAAM,mBAAmB;mBAGf,cAAc,sBAAsB,CAAC;YAwErD,CAAC"}
+{"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"}

package/lib/library/webpack/application/client/prod.js

@@ -14,15 +14,6 @@ const sourcemaps_1 = tslib_1.__importDefault(require("../../blocks/sourcemaps"))
 const prod_1 = tslib_1.__importDefault(require("../../common/client/prod"));
 const extractCssPlugin_1 = require("../../blocks/extractCssPlugin");
 const splitChunks_1 = require("./prod/optimization/splitChunks");
-const generateFilename = (extension, isChunk, configManager) => [
-    '[name]',
-    !configManager.disableProdOptimization && '[contenthash]',
-    configManager.disableProdOptimization && configManager.modern && 'modern',
-    isChunk && 'chunk',
-    extension,
-]
-    .filter(Boolean)
-    .join('.');
 // eslint-disable-next-line max-statements
 const webpackClientConfig = ({ configManager, }) => {
     const config = new webpack_chain_1.default();
@@ -32,16 +23,16 @@ const webpackClientConfig = ({ configManager, }) => {
     config.output
         .path(configManager.buildPath)
         .publicPath('')
-        .filename(generateFilename('js', false, configManager))
-        .chunkFilename(generateFilename('js', true, configManager))
+        .filename('[name].[contenthash].js')
+        .chunkFilename('[name].[contenthash].chunk.js')
         .crossOriginLoading('anonymous')
         .chunkLoadTimeout(240000);
     config.output.set('chunkLoadingGlobal', 'wsp');
     config.batch((0, splitChunks_1.splitChunksConfig)(configManager));
     config.stats('minimal');
     config.batch((0, extractCssPlugin_1.extractCssPluginFactory)(configManager, {
-        filename: generateFilename('css', false, configManager),
-        chunkFilename: generateFilename('css', true, configManager),
+        filename: '[name].[contenthash].css',
+        chunkFilename: '[name].[contenthash].chunk.css',
     }));
     config.plugin('runtime-path').use(RuntimePathPlugin_1.default, [
         {

package/lib/library/webpack/application/client/prod.js.map

@@ -1 +1 @@
-{"version":3,"file":"prod.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/client/prod.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prod.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/client/prod.ts"],"names":[],"mappings":";;;;AAAA,8DAA8B;AAC9B,0EAAmC;AACnC,wDAAwB;AAExB,8EAAgD;AAChD,oFAAsD;AAItD,gGAAgE;AAKhE,8DAA8B;AAC9B,6EAA6C;AAC7C,iFAAiD;AACjD,4EAAkD;AAClD,oEAAwE;AACxE,iEAAoE;AAEpE,0CAA0C;AACnC,MAAM,mBAAmB,GAAG,CAAC,EAClC,aAAa,GAGd,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,IAAI,uBAAM,EAAE,CAAC;IAE5B,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IACpC,MAAM,CAAC,KAAK,CAAC,IAAA,cAAU,EAAC,aAAa,CAAC,CAAC,CAAC;IAExC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAElB,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;SAC7B,UAAU,CAAC,EAAE,CAAC;SACd,QAAQ,CAAC,yBAAyB,CAAC;SACnC,aAAa,CAAC,+BAA+B,CAAC;SAC9C,kBAAkB,CAAC,WAAW,CAAC;SAC/B,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAE5B,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;IAE/C,MAAM,CAAC,KAAK,CAAC,IAAA,+BAAiB,EAAC,aAAa,CAAC,CAAC,CAAC;IAE/C,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAExB,MAAM,CAAC,KAAK,CACV,IAAA,0CAAuB,EAAC,aAAa,EAAE;QACrC,QAAQ,EAAE,0BAA0B;QACpC,aAAa,EAAE,gCAAgC;KAChD,CAAC,CACH,CAAC;IAEF,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,2BAAiB,EAAE;QACnD;YACE,UAAU,EAAE,WAAW;SACxB;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,iBAAO,CAAC,mBAAmB,EAAE;QAC/D;YACE,QAAQ,EAAE,KAAK;SAChB;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,IAAA,kBAAQ,EAAC,aAAa,CAAC,CAAC,CAAC;IAEtC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC;IAEzD,IAAI,IAAA,gBAAQ,EAAC,YAAY,CAAC,IAAI,YAAY,CAAC,WAAW,EAAE;QACtD,MAAM,iBAAiB,GAAG,IAAA,gBAAQ,EAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzF,MAAM,OAAO,iCACX,SAAS,EAAE,WAAW,IACnB,iBAAiB,KACpB,KAAK,EAAE,KAAK,GACb,CAAC;QACF,MAAM,UAAU,GAAG,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QAE1E,IAAI,IAAA,mBAAW,EAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE;YAC7C,OAAO,CAAC,UAAU,GAAG,EAAE,UAAU,EAAE,CAAC;SACrC;aAAM,IAAI,IAAA,gBAAQ,EAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE;YACjD,OAAO,CAAC,UAAU,mBAChB,UAAU,IACP,iBAAiB,CAAC,UAAU,CAChC,CAAC;SACH;QAED,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,gCAAgC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;KAC5F;IAED,IAAI,SAAS,EAAE;QACb,MAAM,CAAC,KAAK,CAAC,IAAA,oBAAU,EAAC,aAAa,CAAC,CAAC,CAAC;KACzC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA3EW,QAAA,mBAAmB,uBA2E9B"}

package/lib/library/webpack/application/server/common.js

@@ -18,7 +18,7 @@ const extractCssPlugin_1 = require("../../blocks/extractCssPlugin");
 const server_1 = require("../../blocks/pwa/server");
 // eslint-disable-next-line import/no-default-export
 exports.default = (configManager) => (config) => {
-    const { output, fileSystemPages, disableProdOptimization } = configManager;
+    const { output, fileSystemPages } = configManager;
     config
         .name('server')
         .target('node')
@@ -35,7 +35,7 @@ exports.default = (configManager) => (config) => {
         .batch((0, serverInline_1.serverInline)(configManager))
         .batch((0, browserslistConfig_1.browserslistConfigResolve)(configManager))
         .batch((0, extractCssPlugin_1.extractCssPluginFactory)(configManager, {
-        filename: disableProdOptimization ? 'server.css' : 'server.[contenthash].css',
+        filename: 'server.[contenthash].css',
         chunkFilename: null,
     }))
         .batch((0, css_1.default)(configManager))

package/lib/library/webpack/application/server/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/server/common.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/server/common.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/cli",
-  "version": "2.160.2",
+  "version": "3.0.2",
   "description": "Cli инструмент для сборки и запуска приложений",
   "files": [
     "src",
@@ -60,20 +60,20 @@
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
     "@sentry/node": "^6.2.5",
     "@svgr/webpack": "^8.1.0",
-    "@tinkoff/browserslist-config": "0.2.7",
-    "@tinkoff/dippy": "0.8.16",
-    "@tinkoff/is-modern-lib": "2.0.16",
-    "@tinkoff/logger": "0.10.67",
-    "@tinkoff/minicss-class-generator": "0.2.5",
-    "@tinkoff/package-manager-wrapper": "0.1.9",
+    "@tinkoff/browserslist-config": "0.3.1",
+    "@tinkoff/dippy": "0.9.1",
+    "@tinkoff/is-modern-lib": "3.0.1",
+    "@tinkoff/logger": "0.10.168",
+    "@tinkoff/minicss-class-generator": "0.3.1",
+    "@tinkoff/package-manager-wrapper": "0.2.1",
     "@tinkoff/request-core": "^0.9.2",
     "@tinkoff/request-plugin-protocol-http": "^0.11.8",
     "@tinkoff/utils": "^2.1.3",
-    "@tinkoff/webpack-dedupe-plugin": "1.0.5",
-    "@tramvai/build": "3.1.4",
-    "@tramvai/react": "2.160.2",
-    "@tramvai/tools-check-versions": "0.4.18",
-    "@tramvai/tools-migrate": "0.6.23",
+    "@tinkoff/webpack-dedupe-plugin": "2.0.1",
+    "@tramvai/build": "4.0.1",
+    "@tramvai/react": "3.0.2",
+    "@tramvai/tools-check-versions": "0.5.1",
+    "@tramvai/tools-migrate": "0.7.1",
     "ajv": "^8.12.0",
     "ansi-escapes": "^4.3.2",
     "autoprefixer": "^10.4.8",
@@ -172,7 +172,7 @@
   },
   "devDependencies": {
     "@swc/core": "1.3.62",
-    "@tramvai/tools-generate-schema": "0.1.5",
+    "@tramvai/tools-generate-schema": "0.2.1",
     "@types/compression": "^1.7.2",
     "@types/express": "^4.17.13",
     "@types/find-cache-dir": "^3.2.1",

package/src/commands/update/dependantLibs.ts

@@ -4,13 +4,12 @@ import { DEPENDANT_LIBS_MAP } from '../../utils/tramvaiVersions';
 
 export const getLibPackageVersion = async (
   name: string,
-  unifiedVersion: string,
-  prerelease: boolean
+  unifiedVersion: string
 ): Promise<string | undefined> => {
   const unifiedModule = DEPENDANT_LIBS_MAP.get(name);
 
   if (!unifiedModule) {
-    return getLatestPackageVersion(name, { version: prerelease ? 'prerelease' : 'latest' });
+    return getLatestPackageVersion(name);
   }
 
   const { dependencies } = await getPackageInfo(unifiedModule, { version: unifiedVersion });

package/src/commands/update/update.ts

@@ -21,7 +21,7 @@ export default async (
     message: `Tramvai version resolved to ${versionNumber}`,
   });
 
-  await updatePackageJson(versionNumber, version === 'prerelease');
+  await updatePackageJson(versionNumber);
 
   context.logger.event({
     type: 'info',

package/src/commands/update/updatePackageJson.spec.ts

@@ -2,7 +2,6 @@ import { updatePackageJson } from './updatePackageJson';
 
 const LATEST_TRAMVAI_VERSION = '1.115.6';
 const LATEST_LIB_VERSION = '0.8.23';
-const PRERELEASE_LIB_VERSION = '2.0.1';
 
 let mockPackageJson: Record<string, any>;
 const mockFsWrite = jest.fn();
@@ -11,13 +10,11 @@ const mockPackageInfoDependencies = jest.fn<Record<string, string | undefined>,
 jest.mock('../../utils/commands/dependencies/packageHasVersion', () => ({
   packageHasVersion: () => true,
 }));
-jest.mock('latest-version', () => (dep: string, { version }) => {
+jest.mock('latest-version', () => (dep: string) => {
   if (dep.startsWith('@tramvai')) {
     return LATEST_TRAMVAI_VERSION;
   }
-  if (version === 'prerelease') {
-    return PRERELEASE_LIB_VERSION;
-  }
+
   return LATEST_LIB_VERSION;
 });
 
@@ -94,65 +91,3 @@ it('should update tramvai deps to latest versions', async () => {
     ]
   `);
 });
-
-it('prerelease should be used for dependant libs', async () => {
-  mockPackageJson = {
-    dependencies: {
-      '@tramvai/core': '1.93.2',
-      '@tramvai/module-common': '1.93.2',
-      '@tinkoff/router': '^0.2.3',
-      '@tinkoff/url': '0.3.2',
-      '@tinkoff/pack-polyfills': '1.0.0',
-    },
-    devDependencies: {
-      '@tramvai/cli': '1.93.2',
-    },
-    peerDependencies: {
-      '@tinkoff/dippy': '0.7.10',
-    },
-  };
-
-  mockPackageInfoDependencies.mockImplementation((dep: string) => {
-    switch (dep) {
-      case '@tramvai/core':
-        return { '@tinkoff/dippy': '0.7.44', '@tinkoff/utils': '^2.1.0' };
-      case '@tramvai/module-common':
-        return {
-          '@tinkoff/error': '0.6.1',
-          '@tinkoff/url': '0.4.1',
-        };
-      case '@tramvai/cli':
-        return {};
-      case '@tramvai/module-router':
-        return {
-          '@tinkoff/router': '0.4.3',
-          '@tinkoff/url': '0.4.1',
-        };
-    }
-
-    return {};
-  });
-
-  await updatePackageJson(LATEST_TRAMVAI_VERSION, true);
-
-  expect(mockFsWrite.mock.calls[0]).toMatchInlineSnapshot(`
-    [
-      "package.json",
-      "{
-      "dependencies": {
-        "@tramvai/core": "1.115.6",
-        "@tramvai/module-common": "1.115.6",
-        "@tinkoff/router": "0.4.3",
-        "@tinkoff/url": "0.4.1",
-        "@tinkoff/pack-polyfills": "2.0.1"
-      },
-      "devDependencies": {
-        "@tramvai/cli": "1.115.6"
-      },
-      "peerDependencies": {
-        "@tinkoff/dippy": "0.7.44"
-      }
-    }",
-    ]
-  `);
-});

package/src/commands/update/updatePackageJson.ts

@@ -16,7 +16,6 @@ const getVersionFromDep = (dep?: string) => {
 const updateDependencies = (
   dependencies: Record<string, string> = {},
   targetVersion: string,
-  prerelease: boolean,
   currentVersion: string,
   spinner: Ora
 ) => {
@@ -28,7 +27,7 @@ const updateDependencies = (
       if (isUnifiedVersion(dep) && getVersionFromDep(dependencies[dep]) === currentVersion) {
         nextVersion = targetVersion;
       } else if (isDependantLib(dep)) {
-        const libVersion = await getLibPackageVersion(dep, targetVersion, prerelease);
+        const libVersion = await getLibPackageVersion(dep, targetVersion);
         nextVersion = libVersion;
       }
 
@@ -61,7 +60,7 @@ const updateDependencies = (
   );
 };
 
-export const updatePackageJson = async (version: string, prerelease?: boolean) => {
+export const updatePackageJson = async (version: string) => {
   const file = fs.readFileSync('package.json');
   const content = JSON.parse(file.toString());
   const currentVersion = getVersionFromDep(content.dependencies['@tramvai/core']);
@@ -80,15 +79,9 @@ export const updatePackageJson = async (version: string, prerelease?: boolean) =
   const spinner = ora(`Updating package.json versions`).start();
 
   try {
-    await updateDependencies(content.dependencies, version, prerelease, currentVersion, spinner);
-    await updateDependencies(content.devDependencies, version, prerelease, currentVersion, spinner);
-    await updateDependencies(
-      content.peerDependencies,
-      version,
-      prerelease,
-      currentVersion,
-      spinner
-    );
+    await updateDependencies(content.dependencies, version, currentVersion, spinner);
+    await updateDependencies(content.devDependencies, version, currentVersion, spinner);
+    await updateDependencies(content.peerDependencies, version, currentVersion, spinner);
 
     fs.writeFileSync('package.json', JSON.stringify(content, null, 2));
   } finally {

package/src/library/webpack/application/client/prod.ts

@@ -19,21 +19,6 @@ import commonProd from '../../common/client/prod';
 import { extractCssPluginFactory } from '../../blocks/extractCssPlugin';
 import { splitChunksConfig } from './prod/optimization/splitChunks';
 
-const generateFilename = (
-  extension: string,
-  isChunk: boolean,
-  configManager: ConfigManager<ApplicationConfigEntry>
-) =>
-  [
-    '[name]',
-    !configManager.disableProdOptimization && '[contenthash]',
-    configManager.disableProdOptimization && configManager.modern && 'modern',
-    isChunk && 'chunk',
-    extension,
-  ]
-    .filter(Boolean)
-    .join('.');
-
 // eslint-disable-next-line max-statements
 export const webpackClientConfig = ({
   configManager,
@@ -50,8 +35,8 @@ export const webpackClientConfig = ({
   config.output
     .path(configManager.buildPath)
     .publicPath('')
-    .filename(generateFilename('js', false, configManager))
-    .chunkFilename(generateFilename('js', true, configManager))
+    .filename('[name].[contenthash].js')
+    .chunkFilename('[name].[contenthash].chunk.js')
     .crossOriginLoading('anonymous')
     .chunkLoadTimeout(240000);
 
@@ -63,8 +48,8 @@ export const webpackClientConfig = ({
 
   config.batch(
     extractCssPluginFactory(configManager, {
-      filename: generateFilename('css', false, configManager),
-      chunkFilename: generateFilename('css', true, configManager),
+      filename: '[name].[contenthash].css',
+      chunkFilename: '[name].[contenthash].chunk.css',
     })
   );
 

package/src/library/webpack/application/server/common.ts

@@ -21,7 +21,7 @@ import { pwaBlock } from '../../blocks/pwa/server';
 
 // eslint-disable-next-line import/no-default-export
 export default (configManager: ConfigManager<ApplicationConfigEntry>) => (config: Config) => {
-  const { output, fileSystemPages, disableProdOptimization } = configManager;
+  const { output, fileSystemPages } = configManager;
 
   config
     .name('server')
@@ -41,7 +41,7 @@ export default (configManager: ConfigManager<ApplicationConfigEntry>) => (config
     .batch(browserslistConfigResolve(configManager))
     .batch(
       extractCssPluginFactory(configManager, {
-        filename: disableProdOptimization ? 'server.css' : 'server.[contenthash].css',
+        filename: 'server.[contenthash].css',
         chunkFilename: null,
       })
     )