@tramvai/cli 2.7.1 → 2.20.0

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

@@ -42,24 +42,25 @@ export default (configManager: ConfigManager) => (config: Config) => {
   // https://webpack.js.org/configuration/output/#outputhashfunction . When release webpack 6 would need to remove
   config.output.set('hashFunction', 'xxhash64');
 
-  // TODO: отключать в CI
-  config.cache({
-    type: 'filesystem',
-    name: `${env}-${configManager.type}-${configManager.buildType}-${configManager.name}${
-      configManager.buildType === 'client' && configManager.modern ? '-modern' : ''
-    }`,
-    cacheDirectory: findCacheDir({ cwd: configManager.rootDir, name: 'webpack' }),
-    buildDependencies: {
-      cli: ['@tramvai/cli'],
-      webpack: ['webpack/lib'],
-      // first check that config exists. If it is passed to webpack, but file is not exist the cache will not be created at all.
-      // It may be missing in cases when cli is running programmaticaly
-      config: filterNonExisted([path.resolve(configManager.rootDir, 'tramvai.json')]),
-      css: filterNonExisted([
-        postcssConfig && safeRequireResolve(path.resolve(configManager.rootDir, postcssConfig)),
-      ]),
-    },
-  });
+  if (configManager.fileCache) {
+    config.cache({
+      type: 'filesystem',
+      name: `${env}-${configManager.type}-${configManager.buildType}-${configManager.name}${
+        configManager.buildType === 'client' && configManager.modern ? '-modern' : ''
+      }`,
+      cacheDirectory: findCacheDir({ cwd: configManager.rootDir, name: 'webpack' }),
+      buildDependencies: {
+        cli: ['@tramvai/cli'],
+        webpack: ['webpack/lib'],
+        // first check that config exists. If it is passed to webpack, but file is not exist the cache will not be created at all.
+        // It may be missing in cases when cli is running programmaticaly
+        config: filterNonExisted([path.resolve(configManager.rootDir, 'tramvai.json')]),
+        css: filterNonExisted([
+          postcssConfig && safeRequireResolve(path.resolve(configManager.rootDir, postcssConfig)),
+        ]),
+      },
+    });
+  }
 
   config.set('snapshot', {
     // отключаем дефолты для managedPaths т.к. из-за них нельзя дебажить node_modules,

package/src/library/webpack/loaders/image-loader/index.ts

@@ -0,0 +1,26 @@
+import sizeOf from 'image-size';
+
+/**
+ * Reuse file-loader logic, but return a object with src and size of image
+ */
+export default function (content) {
+  const result = require('file-loader').call(this, content);
+
+  const dimensions = sizeOf(this.resourcePath);
+
+  // @todo: image blur placeholder in Base64, sharp or imagemin or jimp?
+  return result.replace(
+    /^export default (__webpack_public_path__ \+ .+);$/,
+    `const path = $1;
+
+export default path;
+
+export const image = {
+  src: $1,
+  width: ${JSON.stringify(dimensions.width)},
+  height: ${JSON.stringify(dimensions.height)},
+};`
+  );
+}
+
+export const raw = true;

package/src/schema/autogeneratedSchema.json

@@ -67,12 +67,12 @@
                   "properties": {
                     "modern": {
                       "title": "Enable production build for modern browsers",
-                      "default": false,
+                      "default": true,
                       "type": "boolean"
                     },
                     "dedupe": {
                       "title": "Enable DedupePlugin",
-                      "default": false,
+                      "default": "equality",
                       "enum": [
                         "equality",
                         false,
@@ -212,6 +212,59 @@
                       "default": true,
                       "type": "boolean"
                     },
+                    "webpackResolveAlias": {
+                      "title": "Browser package resolve aliases. E.g. { \"stream\": \"stream-browserify\" }",
+                      "additionalProperties": true,
+                      "type": "object"
+                    },
+                    "webpackProvide": {
+                      "title": "Browser packages to provide with ProvidePlugin. E.g. { \"Buffer\": [\"buffer\", \"Buffer\"] }",
+                      "additionalProperties": true,
+                      "type": "object"
+                    },
+                    "fileSystemPages": {
+                      "title": "experimental settings for File-System Routing feature",
+                      "default": {},
+                      "type": "object",
+                      "properties": {
+                        "enable": {
+                          "title": "Read pages from file system",
+                          "default": false,
+                          "type": "boolean"
+                        },
+                        "routesDir": {
+                          "title": "Folder with pages from which static routers are generated",
+                          "default": "routes",
+                          "anyOf": [
+                            {
+                              "enum": [
+                                false
+                              ],
+                              "type": "boolean"
+                            },
+                            {
+                              "type": "string"
+                            }
+                          ]
+                        },
+                        "pagesDir": {
+                          "title": "Folder with components which can be manually added to static routers",
+                          "default": "pages",
+                          "anyOf": [
+                            {
+                              "enum": [
+                                false
+                              ],
+                              "type": "boolean"
+                            },
+                            {
+                              "type": "string"
+                            }
+                          ]
+                        }
+                      },
+                      "additionalProperties": false
+                    },
                     "experiments": {
                       "title": "Experimental settings",
                       "default": {},
@@ -291,49 +344,6 @@
                           },
                           "additionalProperties": false
                         },
-                        "fileSystemPages": {
-                          "title": "experimental settings for File-System Routing feature",
-                          "default": {},
-                          "type": "object",
-                          "properties": {
-                            "enable": {
-                              "title": "Read pages from file system",
-                              "default": false,
-                              "type": "boolean"
-                            },
-                            "routesDir": {
-                              "title": "Folder with pages from which static routers are generated",
-                              "default": "routes",
-                              "anyOf": [
-                                {
-                                  "enum": [
-                                    false
-                                  ],
-                                  "type": "boolean"
-                                },
-                                {
-                                  "type": "string"
-                                }
-                              ]
-                            },
-                            "pagesDir": {
-                              "title": "Folder with components which can be manually added to static routers",
-                              "default": "pages",
-                              "anyOf": [
-                                {
-                                  "enum": [
-                                    false
-                                  ],
-                                  "type": "boolean"
-                                },
-                                {
-                                  "type": "string"
-                                }
-                              ]
-                            }
-                          },
-                          "additionalProperties": false
-                        },
                         "transpilation": {
                           "title": "experimental settings for code transpilation",
                           "default": {},
@@ -354,16 +364,6 @@
                       },
                       "additionalProperties": false
                     },
-                    "webpackResolveAlias": {
-                      "title": "Browser package resolve aliases. E.g. { \"stream\": \"stream-browserify\" }",
-                      "additionalProperties": true,
-                      "type": "object"
-                    },
-                    "webpackProvide": {
-                      "title": "Browser packages to provide with ProvidePlugin. E.g. { \"Buffer\": [\"buffer\", \"Buffer\"] }",
-                      "additionalProperties": true,
-                      "type": "object"
-                    },
                     "granularChunks": {
                       "title": "Separate one common chunk to many small dynamic chunks",
                       "default": false,
@@ -1081,49 +1081,6 @@
                           },
                           "additionalProperties": false
                         },
-                        "fileSystemPages": {
-                          "title": "experimental settings for File-System Routing feature",
-                          "default": {},
-                          "type": "object",
-                          "properties": {
-                            "enable": {
-                              "title": "Read pages from file system",
-                              "default": false,
-                              "type": "boolean"
-                            },
-                            "routesDir": {
-                              "title": "Folder with pages from which static routers are generated",
-                              "default": "routes",
-                              "anyOf": [
-                                {
-                                  "enum": [
-                                    false
-                                  ],
-                                  "type": "boolean"
-                                },
-                                {
-                                  "type": "string"
-                                }
-                              ]
-                            },
-                            "pagesDir": {
-                              "title": "Folder with components which can be manually added to static routers",
-                              "default": "pages",
-                              "anyOf": [
-                                {
-                                  "enum": [
-                                    false
-                                  ],
-                                  "type": "boolean"
-                                },
-                                {
-                                  "type": "string"
-                                }
-                              ]
-                            }
-                          },
-                          "additionalProperties": false
-                        },
                         "transpilation": {
                           "title": "experimental settings for code transpilation",
                           "default": {},
@@ -1226,12 +1183,12 @@
                   "properties": {
                     "modern": {
                       "title": "Enable production build for modern browsers",
-                      "default": false,
+                      "default": true,
                       "type": "boolean"
                     },
                     "dedupe": {
                       "title": "Enable DedupePlugin",
-                      "default": false,
+                      "default": "equality",
                       "enum": [
                         "equality",
                         false,
@@ -1372,6 +1329,59 @@
                       "default": true,
                       "type": "boolean"
                     },
+                    "webpackResolveAlias": {
+                      "title": "Browser package resolve aliases. E.g. { \"stream\": \"stream-browserify\" }",
+                      "additionalProperties": true,
+                      "type": "object"
+                    },
+                    "webpackProvide": {
+                      "title": "Browser packages to provide with ProvidePlugin. E.g. { \"Buffer\": [\"buffer\", \"Buffer\"] }",
+                      "additionalProperties": true,
+                      "type": "object"
+                    },
+                    "fileSystemPages": {
+                      "title": "experimental settings for File-System Routing feature",
+                      "default": {},
+                      "type": "object",
+                      "properties": {
+                        "enable": {
+                          "title": "Read pages from file system",
+                          "default": false,
+                          "type": "boolean"
+                        },
+                        "routesDir": {
+                          "title": "Folder with pages from which static routers are generated",
+                          "default": "routes",
+                          "anyOf": [
+                            {
+                              "enum": [
+                                false
+                              ],
+                              "type": "boolean"
+                            },
+                            {
+                              "type": "string"
+                            }
+                          ]
+                        },
+                        "pagesDir": {
+                          "title": "Folder with components which can be manually added to static routers",
+                          "default": "pages",
+                          "anyOf": [
+                            {
+                              "enum": [
+                                false
+                              ],
+                              "type": "boolean"
+                            },
+                            {
+                              "type": "string"
+                            }
+                          ]
+                        }
+                      },
+                      "additionalProperties": false
+                    },
                     "experiments": {
                       "title": "Experimental settings",
                       "default": {},
@@ -1451,49 +1461,6 @@
                           },
                           "additionalProperties": false
                         },
-                        "fileSystemPages": {
-                          "title": "experimental settings for File-System Routing feature",
-                          "default": {},
-                          "type": "object",
-                          "properties": {
-                            "enable": {
-                              "title": "Read pages from file system",
-                              "default": false,
-                              "type": "boolean"
-                            },
-                            "routesDir": {
-                              "title": "Folder with pages from which static routers are generated",
-                              "default": "routes",
-                              "anyOf": [
-                                {
-                                  "enum": [
-                                    false
-                                  ],
-                                  "type": "boolean"
-                                },
-                                {
-                                  "type": "string"
-                                }
-                              ]
-                            },
-                            "pagesDir": {
-                              "title": "Folder with components which can be manually added to static routers",
-                              "default": "pages",
-                              "anyOf": [
-                                {
-                                  "enum": [
-                                    false
-                                  ],
-                                  "type": "boolean"
-                                },
-                                {
-                                  "type": "string"
-                                }
-                              ]
-                            }
-                          },
-                          "additionalProperties": false
-                        },
                         "transpilation": {
                           "title": "experimental settings for code transpilation",
                           "default": {},
@@ -1513,16 +1480,6 @@
                         }
                       },
                       "additionalProperties": false
-                    },
-                    "webpackResolveAlias": {
-                      "title": "Browser package resolve aliases. E.g. { \"stream\": \"stream-browserify\" }",
-                      "additionalProperties": true,
-                      "type": "object"
-                    },
-                    "webpackProvide": {
-                      "title": "Browser packages to provide with ProvidePlugin. E.g. { \"Buffer\": [\"buffer\", \"Buffer\"] }",
-                      "additionalProperties": true,
-                      "type": "object"
                     }
                   }
                 }
@@ -1719,49 +1676,6 @@
                           },
                           "additionalProperties": false
                         },
-                        "fileSystemPages": {
-                          "title": "experimental settings for File-System Routing feature",
-                          "default": {},
-                          "type": "object",
-                          "properties": {
-                            "enable": {
-                              "title": "Read pages from file system",
-                              "default": false,
-                              "type": "boolean"
-                            },
-                            "routesDir": {
-                              "title": "Folder with pages from which static routers are generated",
-                              "default": "routes",
-                              "anyOf": [
-                                {
-                                  "enum": [
-                                    false
-                                  ],
-                                  "type": "boolean"
-                                },
-                                {
-                                  "type": "string"
-                                }
-                              ]
-                            },
-                            "pagesDir": {
-                              "title": "Folder with components which can be manually added to static routers",
-                              "default": "pages",
-                              "anyOf": [
-                                {
-                                  "enum": [
-                                    false
-                                  ],
-                                  "type": "boolean"
-                                },
-                                {
-                                  "type": "string"
-                                }
-                              ]
-                            }
-                          },
-                          "additionalProperties": false
-                        },
                         "transpilation": {
                           "title": "experimental settings for code transpilation",
                           "default": {},
@@ -1844,12 +1758,12 @@
                   "properties": {
                     "modern": {
                       "title": "Enable production build for modern browsers",
-                      "default": false,
+                      "default": true,
                       "type": "boolean"
                     },
                     "dedupe": {
                       "title": "Enable DedupePlugin",
-                      "default": false,
+                      "default": "equality",
                       "enum": [
                         "equality",
                         false,
@@ -1990,6 +1904,59 @@
                       "default": true,
                       "type": "boolean"
                     },
+                    "webpackResolveAlias": {
+                      "title": "Browser package resolve aliases. E.g. { \"stream\": \"stream-browserify\" }",
+                      "additionalProperties": true,
+                      "type": "object"
+                    },
+                    "webpackProvide": {
+                      "title": "Browser packages to provide with ProvidePlugin. E.g. { \"Buffer\": [\"buffer\", \"Buffer\"] }",
+                      "additionalProperties": true,
+                      "type": "object"
+                    },
+                    "fileSystemPages": {
+                      "title": "experimental settings for File-System Routing feature",
+                      "default": {},
+                      "type": "object",
+                      "properties": {
+                        "enable": {
+                          "title": "Read pages from file system",
+                          "default": false,
+                          "type": "boolean"
+                        },
+                        "routesDir": {
+                          "title": "Folder with pages from which static routers are generated",
+                          "default": "routes",
+                          "anyOf": [
+                            {
+                              "enum": [
+                                false
+                              ],
+                              "type": "boolean"
+                            },
+                            {
+                              "type": "string"
+                            }
+                          ]
+                        },
+                        "pagesDir": {
+                          "title": "Folder with components which can be manually added to static routers",
+                          "default": "pages",
+                          "anyOf": [
+                            {
+                              "enum": [
+                                false
+                              ],
+                              "type": "boolean"
+                            },
+                            {
+                              "type": "string"
+                            }
+                          ]
+                        }
+                      },
+                      "additionalProperties": false
+                    },
                     "experiments": {
                       "title": "Experimental settings",
                       "default": {},
@@ -2069,49 +2036,6 @@
                           },
                           "additionalProperties": false
                         },
-                        "fileSystemPages": {
-                          "title": "experimental settings for File-System Routing feature",
-                          "default": {},
-                          "type": "object",
-                          "properties": {
-                            "enable": {
-                              "title": "Read pages from file system",
-                              "default": false,
-                              "type": "boolean"
-                            },
-                            "routesDir": {
-                              "title": "Folder with pages from which static routers are generated",
-                              "default": "routes",
-                              "anyOf": [
-                                {
-                                  "enum": [
-                                    false
-                                  ],
-                                  "type": "boolean"
-                                },
-                                {
-                                  "type": "string"
-                                }
-                              ]
-                            },
-                            "pagesDir": {
-                              "title": "Folder with components which can be manually added to static routers",
-                              "default": "pages",
-                              "anyOf": [
-                                {
-                                  "enum": [
-                                    false
-                                  ],
-                                  "type": "boolean"
-                                },
-                                {
-                                  "type": "string"
-                                }
-                              ]
-                            }
-                          },
-                          "additionalProperties": false
-                        },
                         "transpilation": {
                           "title": "experimental settings for code transpilation",
                           "default": {},
@@ -2131,16 +2055,6 @@
                         }
                       },
                       "additionalProperties": false
-                    },
-                    "webpackResolveAlias": {
-                      "title": "Browser package resolve aliases. E.g. { \"stream\": \"stream-browserify\" }",
-                      "additionalProperties": true,
-                      "type": "object"
-                    },
-                    "webpackProvide": {
-                      "title": "Browser packages to provide with ProvidePlugin. E.g. { \"Buffer\": [\"buffer\", \"Buffer\"] }",
-                      "additionalProperties": true,
-                      "type": "object"
                     }
                   }
                 }
@@ -2337,49 +2251,6 @@
                           },
                           "additionalProperties": false
                         },
-                        "fileSystemPages": {
-                          "title": "experimental settings for File-System Routing feature",
-                          "default": {},
-                          "type": "object",
-                          "properties": {
-                            "enable": {
-                              "title": "Read pages from file system",
-                              "default": false,
-                              "type": "boolean"
-                            },
-                            "routesDir": {
-                              "title": "Folder with pages from which static routers are generated",
-                              "default": "routes",
-                              "anyOf": [
-                                {
-                                  "enum": [
-                                    false
-                                  ],
-                                  "type": "boolean"
-                                },
-                                {
-                                  "type": "string"
-                                }
-                              ]
-                            },
-                            "pagesDir": {
-                              "title": "Folder with components which can be manually added to static routers",
-                              "default": "pages",
-                              "anyOf": [
-                                {
-                                  "enum": [
-                                    false
-                                  ],
-                                  "type": "boolean"
-                                },
-                                {
-                                  "type": "string"
-                                }
-                              ]
-                            }
-                          },
-                          "additionalProperties": false
-                        },
                         "transpilation": {
                           "title": "experimental settings for code transpilation",
                           "default": {},