@tramvai/cli 3.0.2 → 3.3.2

package/src/library/webpack/common/main.ts

@@ -17,6 +17,16 @@ const filterNonExisted = (filePaths: string[]) => {
   });
 };
 
+const getConfigCacheNameAdditionalFlags = (configManager: ConfigManager<CliConfigEntry>) => {
+  return [
+    configManager.buildType === 'client' && configManager.modern ? 'modern' : '',
+    configManager.debug ? 'debug' : '',
+    process.env.TRAMVAI_REACT_PROFILE ? 'tramvai_react_profile' : '',
+  ]
+    .filter(Boolean)
+    .join('-');
+};
+
 // eslint-disable-next-line import/no-default-export
 export default (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => {
   const env = configManager.env === 'development' ? 'dev' : 'prod';
@@ -66,9 +76,9 @@ export default (configManager: ConfigManager<CliConfigEntry>) => (config: Config
   if (configManager.fileCache) {
     config.cache({
       type: 'filesystem',
-      name: `${env}-${configManager.type}-${configManager.buildType}-${configManager.name}${
-        configManager.buildType === 'client' && configManager.modern ? '-modern' : ''
-      }`,
+      name: `${env}-${configManager.type}-${configManager.buildType}-${
+        configManager.name
+      }-${getConfigCacheNameAdditionalFlags(configManager)}`,
       cacheDirectory: findCacheDir({ cwd: configManager.rootDir, name: 'webpack' }),
       buildDependencies: {
         cli: ['@tramvai/cli'],

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@6835": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@8745": {
+                        "__@replace@6837": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@8748": {
+                        "__@search@6840": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@8750": {
+                        "__@split@6842": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@8752": {
+                        "__@matchAll@6844": {
                           "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@6835": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@8745": {
+                        "__@replace@6837": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@8748": {
+                        "__@search@6840": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@8750": {
+                        "__@split@6842": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@8752": {
+                        "__@matchAll@6844": {
                           "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@6835": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@8745": {
+                        "__@replace@6837": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@8748": {
+                        "__@search@6840": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@8750": {
+                        "__@split@6842": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@8752": {
+                        "__@matchAll@6844": {
                           "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

package/src/typings/webpack-chain/index.d.ts

@@ -435,50 +435,30 @@ declare module 'webpack-chain' {
 
     type DevTool =
       | 'eval'
-      | 'inline-source-map'
-      | 'cheap-eval-source-map'
+      | 'eval-cheap-source-map'
+      | 'eval-cheap-module-source-map'
+      | 'eval-source-map'
       | 'cheap-source-map'
-      | 'cheap-module-eval-source-map'
       | 'cheap-module-source-map'
-      | 'eval-source-map'
       | 'source-map'
+      | 'inline-cheap-source-map'
+      | 'inline-cheap-module-source-map'
+      | 'inline-source-map'
+      | 'eval-nosources-cheap-source-map'
+      | 'eval-nosources-cheap-module-source-map'
+      | 'eval-nosources-source-map'
+      | 'inline-nosources-cheap-source-map'
+      | 'inline-nosources-cheap-module-source-map'
+      | 'inline-nosources-source-map'
+      | 'nosources-cheap-source-map'
+      | 'nosources-cheap-module-source-map'
       | 'nosources-source-map'
-      | 'hidden-source-map'
-      | 'nosources-source-map'
-      | '@eval'
-      | '@inline-source-map'
-      | '@cheap-eval-source-map'
-      | '@cheap-source-map'
-      | '@cheap-module-eval-source-map'
-      | '@cheap-module-source-map'
-      | '@eval-source-map'
-      | '@source-map'
-      | '@nosources-source-map'
-      | '@hidden-source-map'
-      | '@nosources-source-map'
-      | '#eval'
-      | '#inline-source-map'
-      | '#cheap-eval-source-map'
-      | '#cheap-source-map'
-      | '#cheap-module-eval-source-map'
-      | '#cheap-module-source-map'
-      | '#eval-source-map'
-      | '#source-map'
-      | '#nosources-source-map'
-      | '#hidden-source-map'
-      | '#nosources-source-map'
-      | '#@eval'
-      | '#@inline-source-map'
-      | '#@cheap-eval-source-map'
-      | '#@cheap-source-map'
-      | '#@cheap-module-eval-source-map'
-      | '#@cheap-module-source-map'
-      | '#@eval-source-map'
-      | '#@source-map'
-      | '#@nosources-source-map'
-      | '#@hidden-source-map'
-      | '#@nosources-source-map'
-      | boolean;
+      | 'hidden-nosources-cheap-source-map'
+      | 'hidden-nosources-cheap-module-source-map'
+      | 'hidden-nosources-source-map'
+      | 'hidden-cheap-source-map'
+      | 'hidden-cheap-module-source-map'
+      | 'hidden-source-map';
 
     interface PluginClass {
       new (...opts: any[]): webpack.Plugin;