@tramvai/cli 3.0.0 → 3.2.0

package/schema.json

@@ -1151,23 +1151,23 @@
                               "dotAll": {
                                 "type": "boolean"
                               },
-                              "__@match@8743": {
+                              "__@match@8744": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@replace@8745": {
+                              "__@replace@8746": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@search@8748": {
+                              "__@search@8749": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@split@8750": {
+                              "__@split@8751": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@matchAll@8752": {
+                              "__@matchAll@8753": {
                                 "type": "object",
                                 "additionalProperties": false
                               }
@@ -1192,6 +1192,17 @@
                       }
                     },
                     "additionalProperties": false
+                  },
+                  "devtool": {
+                    "title": "Use the specified type of source maps for building in development mode",
+                    "default": "eval",
+                    "enum": [
+                      "eval",
+                      "eval-cheap-module-source-map",
+                      "eval-cheap-source-map",
+                      "eval-source-map"
+                    ],
+                    "type": "string"
                   }
                 },
                 "additionalProperties": false
@@ -1819,23 +1830,23 @@
                                 "dotAll": {
                                   "type": "boolean"
                                 },
-                                "__@match@8743": {
+                                "__@match@8744": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@replace@8745": {
+                                "__@replace@8746": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@search@8748": {
+                                "__@search@8749": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@split@8750": {
+                                "__@split@8751": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@matchAll@8752": {
+                                "__@matchAll@8753": {
                                   "type": "object",
                                   "additionalProperties": false
                                 }
@@ -1860,6 +1871,17 @@
                         }
                       },
                       "additionalProperties": false
+                    },
+                    "devtool": {
+                      "title": "Use the specified type of source maps for building in development mode",
+                      "default": "eval",
+                      "enum": [
+                        "eval",
+                        "eval-cheap-module-source-map",
+                        "eval-cheap-source-map",
+                        "eval-source-map"
+                      ],
+                      "type": "string"
                     }
                   },
                   "additionalProperties": false
@@ -2487,23 +2509,23 @@
                                   "dotAll": {
                                     "type": "boolean"
                                   },
-                                  "__@match@8743": {
+                                  "__@match@8744": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@replace@8745": {
+                                  "__@replace@8746": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@search@8748": {
+                                  "__@search@8749": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@split@8750": {
+                                  "__@split@8751": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@matchAll@8752": {
+                                  "__@matchAll@8753": {
                                     "type": "object",
                                     "additionalProperties": false
                                   }
@@ -2528,6 +2550,17 @@
                           }
                         },
                         "additionalProperties": false
+                      },
+                      "devtool": {
+                        "title": "Use the specified type of source maps for building in development mode",
+                        "default": "eval",
+                        "enum": [
+                          "eval",
+                          "eval-cheap-module-source-map",
+                          "eval-cheap-source-map",
+                          "eval-source-map"
+                        ],
+                        "type": "string"
                       }
                     },
                     "additionalProperties": false

package/src/commands/update/dependantLibs.ts

@@ -4,12 +4,13 @@ import { DEPENDANT_LIBS_MAP } from '../../utils/tramvaiVersions';
 
 export const getLibPackageVersion = async (
   name: string,
-  unifiedVersion: string
+  unifiedVersion: string,
+  prerelease: boolean
 ): Promise<string | undefined> => {
   const unifiedModule = DEPENDANT_LIBS_MAP.get(name);
 
   if (!unifiedModule) {
-    return getLatestPackageVersion(name);
+    return getLatestPackageVersion(name, { version: prerelease ? 'prerelease' : 'latest' });
   }
 
   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);
+  await updatePackageJson(versionNumber, version === 'prerelease');
 
   context.logger.event({
     type: 'info',

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

@@ -2,6 +2,7 @@ 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();
@@ -10,11 +11,13 @@ const mockPackageInfoDependencies = jest.fn<Record<string, string | undefined>,
 jest.mock('../../utils/commands/dependencies/packageHasVersion', () => ({
   packageHasVersion: () => true,
 }));
-jest.mock('latest-version', () => (dep: string) => {
+jest.mock('latest-version', () => (dep: string, { version }) => {
   if (dep.startsWith('@tramvai')) {
     return LATEST_TRAMVAI_VERSION;
   }
-
+  if (version === 'prerelease') {
+    return PRERELEASE_LIB_VERSION;
+  }
   return LATEST_LIB_VERSION;
 });
 
@@ -91,3 +94,65 @@ 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,6 +16,7 @@ const getVersionFromDep = (dep?: string) => {
 const updateDependencies = (
   dependencies: Record<string, string> = {},
   targetVersion: string,
+  prerelease: boolean,
   currentVersion: string,
   spinner: Ora
 ) => {
@@ -27,7 +28,7 @@ const updateDependencies = (
       if (isUnifiedVersion(dep) && getVersionFromDep(dependencies[dep]) === currentVersion) {
         nextVersion = targetVersion;
       } else if (isDependantLib(dep)) {
-        const libVersion = await getLibPackageVersion(dep, targetVersion);
+        const libVersion = await getLibPackageVersion(dep, targetVersion, prerelease);
         nextVersion = libVersion;
       }
 
@@ -60,7 +61,7 @@ const updateDependencies = (
   );
 };
 
-export const updatePackageJson = async (version: string) => {
+export const updatePackageJson = async (version: string, prerelease?: boolean) => {
   const file = fs.readFileSync('package.json');
   const content = JSON.parse(file.toString());
   const currentVersion = getVersionFromDep(content.dependencies['@tramvai/core']);
@@ -79,9 +80,15 @@ export const updatePackageJson = async (version: string) => {
   const spinner = ora(`Updating package.json versions`).start();
 
   try {
-    await updateDependencies(content.dependencies, version, currentVersion, spinner);
-    await updateDependencies(content.devDependencies, version, currentVersion, spinner);
-    await updateDependencies(content.peerDependencies, version, currentVersion, spinner);
+    await updateDependencies(content.dependencies, version, prerelease, currentVersion, spinner);
+    await updateDependencies(content.devDependencies, version, prerelease, currentVersion, spinner);
+    await updateDependencies(
+      content.peerDependencies,
+      version,
+      prerelease,
+      currentVersion,
+      spinner
+    );
 
     fs.writeFileSync('package.json', JSON.stringify(content, null, 2));
   } finally {

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

@@ -44,7 +44,7 @@ export const webpackClientConfig = ({
 
   config.mode('development');
 
-  config.devtool('eval');
+  config.devtool(configManager.webpack.devtool);
 
   if (configManager.sourceMap) {
     config.batch(sourcemaps(configManager));

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

@@ -19,6 +19,21 @@ 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,
@@ -35,8 +50,8 @@ export const webpackClientConfig = ({
   config.output
     .path(configManager.buildPath)
     .publicPath('')
-    .filename('[name].[contenthash].js')
-    .chunkFilename('[name].[contenthash].chunk.js')
+    .filename(generateFilename('js', false, configManager))
+    .chunkFilename(generateFilename('js', true, configManager))
     .crossOriginLoading('anonymous')
     .chunkLoadTimeout(240000);
 
@@ -48,8 +63,8 @@ export const webpackClientConfig = ({
 
   config.batch(
     extractCssPluginFactory(configManager, {
-      filename: '[name].[contenthash].css',
-      chunkFilename: '[name].[contenthash].chunk.css',
+      filename: generateFilename('css', false, configManager),
+      chunkFilename: generateFilename('css', true, configManager),
     })
   );
 

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 } = configManager;
+  const { output, fileSystemPages, disableProdOptimization } = configManager;
 
   config
     .name('server')
@@ -41,7 +41,7 @@ export default (configManager: ConfigManager<ApplicationConfigEntry>) => (config
     .batch(browserslistConfigResolve(configManager))
     .batch(
       extractCssPluginFactory(configManager, {
-        filename: 'server.[contenthash].css',
+        filename: disableProdOptimization ? 'server.css' : 'server.[contenthash].css',
         chunkFilename: null,
       })
     )

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

@@ -35,6 +35,10 @@ export const webpackServerConfig = ({
 
   config.mode('development');
 
+  if (configManager.webpack.devtool !== 'eval') {
+    config.devtool(configManager.webpack.devtool);
+  }
+
   if (configManager.sourceMap) {
     config.batch(sourcemaps(configManager));
   }

package/src/library/webpack/child-app/common.ts

@@ -91,9 +91,12 @@ export default (configManager: ConfigManager<ChildAppConfigEntry>) => (config: C
         // Way to reproduce: build and compare stats file for child-app with absolute and relative paths
         // -----
         // 2) path.relative should use the posix separator because
-        // @module-federation/node library (https://github.com/module-federation/universe/blob/2dd44826954e5136bac08b0d9a0e7e01dbb8b79c/packages/typescript/src/lib/TypescriptCompiler.ts#L110)
-        // is splitting path strings with regexp, which only works correctly for posix paths.
-        entry: path.posix.relative(config.get('context'), entry),
+        // @module-federation/node is parsing relative path incorrectly
+        // Debug notes: there is problem in webpack/ModuleFederation or enhanced-resolve
+        entry: path
+          .relative(config.get('context'), entry)
+          .split(path.win32.sep)
+          .join(path.posix.sep),
       },
       shared: getSharedModules(configManager),
     } as UniversalFederationPluginOptions,

package/src/models/config.spec.ts

@@ -118,7 +118,9 @@ it('should populate defaults for config', () => {
           },
           "transpileOnlyModernLibs": true,
           "type": "application",
-          "webpack": {},
+          "webpack": {
+            "devtool": "eval",
+          },
         },
         "child-app": {
           "cssMinimize": "css-minimizer",
@@ -170,7 +172,9 @@ it('should populate defaults for config', () => {
           },
           "transpileOnlyModernLibs": true,
           "type": "child-app",
-          "webpack": {},
+          "webpack": {
+            "devtool": "eval",
+          },
         },
       },
     }
@@ -362,7 +366,9 @@ it('should populate defaults for overridable options', () => {
           },
           "transpileOnlyModernLibs": true,
           "type": "application",
-          "webpack": {},
+          "webpack": {
+            "devtool": "eval",
+          },
         },
         "child-app": {
           "cssMinimize": "css-minimizer",
@@ -425,6 +431,7 @@ it('should populate defaults for overridable options', () => {
           "transpileOnlyModernLibs": true,
           "type": "child-app",
           "webpack": {
+            "devtool": "eval",
             "provide": {
               "Buffer": [
                 "buffer",

package/src/schema/autogeneratedSchema.json

@@ -1129,23 +1129,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@8743": {
+                        "__@match@8744": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@8745": {
+                        "__@replace@8746": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@8748": {
+                        "__@search@8749": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@8750": {
+                        "__@split@8751": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@8752": {
+                        "__@matchAll@8753": {
                           "type": "object",
                           "additionalProperties": false
                         }
@@ -1170,6 +1170,17 @@
                 }
               },
               "additionalProperties": false
+            },
+            "devtool": {
+              "title": "Use the specified type of source maps for building in development mode",
+              "default": "eval",
+              "enum": [
+                "eval",
+                "eval-cheap-module-source-map",
+                "eval-cheap-source-map",
+                "eval-source-map"
+              ],
+              "type": "string"
             }
           },
           "additionalProperties": false
@@ -1788,23 +1799,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@8743": {
+                        "__@match@8744": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@8745": {
+                        "__@replace@8746": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@8748": {
+                        "__@search@8749": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@8750": {
+                        "__@split@8751": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@8752": {
+                        "__@matchAll@8753": {
                           "type": "object",
                           "additionalProperties": false
                         }
@@ -1829,6 +1840,17 @@
                 }
               },
               "additionalProperties": false
+            },
+            "devtool": {
+              "title": "Use the specified type of source maps for building in development mode",
+              "default": "eval",
+              "enum": [
+                "eval",
+                "eval-cheap-module-source-map",
+                "eval-cheap-source-map",
+                "eval-source-map"
+              ],
+              "type": "string"
             }
           },
           "additionalProperties": false
@@ -2447,23 +2469,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@8743": {
+                        "__@match@8744": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@8745": {
+                        "__@replace@8746": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@8748": {
+                        "__@search@8749": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@8750": {
+                        "__@split@8751": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@8752": {
+                        "__@matchAll@8753": {
                           "type": "object",
                           "additionalProperties": false
                         }
@@ -2488,6 +2510,17 @@
                 }
               },
               "additionalProperties": false
+            },
+            "devtool": {
+              "title": "Use the specified type of source maps for building in development mode",
+              "default": "eval",
+              "enum": [
+                "eval",
+                "eval-cheap-module-source-map",
+                "eval-cheap-source-map",
+                "eval-source-map"
+              ],
+              "type": "string"
             }
           },
           "additionalProperties": false

package/src/schema/tramvai.spec.ts

@@ -147,7 +147,9 @@ describe('JSON schema для tramvai.json', () => {
             },
             "transpileOnlyModernLibs": true,
             "type": "application",
-            "webpack": {},
+            "webpack": {
+              "devtool": "eval",
+            },
           },
           "module": {
             "cssMinimize": "css-minimizer",
@@ -199,7 +201,9 @@ describe('JSON schema для tramvai.json', () => {
             },
             "transpileOnlyModernLibs": true,
             "type": "module",
-            "webpack": {},
+            "webpack": {
+              "devtool": "eval",
+            },
           },
         },
       }

package/src/typings/configEntry/cli.ts

@@ -208,6 +208,11 @@ export interface CliConfigEntry extends ConfigEntry {
      * @description For OSX users and big projects it's recommended to enable watch polling, e.g. `{ poll: 1000 }`, more info - https://github.com/webpack/watchpack/issues/222
      */
     watchOptions?: Configuration['watchOptions'];
+    /**
+     * @title Use the specified type of source maps for building in development mode
+     * @default "eval"
+     */
+    devtool: 'eval' | 'eval-cheap-source-map' | 'eval-cheap-module-source-map' | 'eval-source-map';
   };
 
   // options that affect only production builds