@tramvai/cli 2.98.0 → 2.100.0

package/lib/library/webpack/plugins/WebManifestPlugin.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebManifestPlugin = void 0;
+const tslib_1 = require("tslib");
+const pluginName = 'WebManifestPlugin';
+class WebManifestPlugin {
+    constructor(options) {
+        this.options = options;
+        this.options = options;
+    }
+    apply(compiler) {
+        const { webpack } = compiler;
+        const { Compilation } = webpack;
+        const { RawSource } = webpack.sources;
+        const _a = this.options, { dest, enabled } = _a, content = tslib_1.__rest(_a, ["dest", "enabled"]);
+        compiler.hooks.thisCompilation.tap(pluginName, (compilation) => {
+            compilation.hooks.processAssets.tap({
+                name: pluginName,
+                stage: Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
+            }, () => {
+                const manifestFilename = dest;
+                compilation.emitAsset(manifestFilename, new RawSource(JSON.stringify(content)));
+            });
+        });
+    }
+}
+exports.WebManifestPlugin = WebManifestPlugin;
+//# sourceMappingURL=WebManifestPlugin.js.map

package/lib/library/webpack/plugins/WebManifestPlugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WebManifestPlugin.js","sourceRoot":"","sources":["../../../../src/library/webpack/plugins/WebManifestPlugin.ts"],"names":[],"mappings":";;;;AAIA,MAAM,UAAU,GAAG,mBAAmB,CAAC;AAEvC,MAAa,iBAAiB;IAC5B,YAAoB,OAA2B;QAA3B,YAAO,GAAP,OAAO,CAAoB;QAC7C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,QAAkB;QACtB,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QAC7B,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;QAChC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QACtC,MAAM,KAAgC,IAAI,CAAC,OAAO,EAA5C,EAAE,IAAI,EAAE,OAAO,OAA6B,EAAxB,OAAO,sBAA3B,mBAA6B,CAAe,CAAC;QAEnD,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,WAAW,EAAE,EAAE;YAC7D,WAAW,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CACjC;gBACE,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE,WAAW,CAAC,8BAA8B;aAClD,EACD,GAAG,EAAE;gBACH,MAAM,gBAAgB,GAAG,IAAI,CAAC;gBAE9B,WAAW,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAClF,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAzBD,8CAyBC"}

package/lib/schema/autogeneratedSchema.json

@@ -525,6 +525,189 @@
                             ],
                             "type": "string"
                         },
+                        "pwa": {
+                            "title": "PWA configuration (works with `TramvaiPwaModule` from `@tramvai/module-progressive-web-app` library)",
+                            "default": {},
+                            "type": "object",
+                            "properties": {
+                                "sw": {
+                                    "title": "Service-Worker configuration",
+                                    "default": {},
+                                    "type": "object",
+                                    "properties": {
+                                        "src": {
+                                            "title": "Path to sw.ts file (relative to \"root\" directory)",
+                                            "default": "sw.ts",
+                                            "type": "string"
+                                        },
+                                        "dest": {
+                                            "title": "Name of generated SW file (will be placed in \"output.client\" directory)",
+                                            "default": "sw.js",
+                                            "type": "string"
+                                        },
+                                        "scope": {
+                                            "title": "Scope of SW (see https://developers.google.com/web/ilt/pwa/introduction-to-service-worker#registration_and_scope)",
+                                            "default": "/",
+                                            "type": "string"
+                                        }
+                                    },
+                                    "additionalProperties": false
+                                },
+                                "workbox": {
+                                    "title": "Workbox configuration",
+                                    "default": {},
+                                    "type": "object",
+                                    "properties": {
+                                        "enabled": {
+                                            "cli_overridable": "",
+                                            "title": "Connect `InjectManifest` from `workbox-webpack-plugin` library",
+                                            "default": false,
+                                            "anyOf": [
+                                                {
+                                                    "type": "object",
+                                                    "properties": {
+                                                        "development": {
+                                                            "type": "boolean"
+                                                        },
+                                                        "production": {
+                                                            "type": "boolean"
+                                                        }
+                                                    },
+                                                    "additionalProperties": false
+                                                },
+                                                {
+                                                    "type": "boolean"
+                                                }
+                                            ]
+                                        }
+                                    },
+                                    "additionalProperties": false
+                                },
+                                "webmanifest": {
+                                    "title": "WebManifest content (manifest.json or webmanifest will be generated based on this options)",
+                                    "default": {},
+                                    "type": "object",
+                                    "properties": {
+                                        "enabled": {
+                                            "title": "Create webmanifest file",
+                                            "default": false,
+                                            "type": "boolean"
+                                        },
+                                        "dest": {
+                                            "title": "Name of generated manifest file (will be placed in \"output.client\" directory). You can use `[hash]` placeholder for manifest cache busting",
+                                            "default": "/manifest.[hash].json",
+                                            "type": "string"
+                                        },
+                                        "scope": {
+                                            "title": "prefer to use \"pwa.sw.scope\" instead, this field will be generated automatically",
+                                            "type": "string"
+                                        },
+                                        "name": {
+                                            "type": "string"
+                                        },
+                                        "short_name": {
+                                            "type": "string"
+                                        },
+                                        "description": {
+                                            "type": "string"
+                                        },
+                                        "start_url": {
+                                            "type": "string"
+                                        },
+                                        "display": {
+                                            "type": "string"
+                                        },
+                                        "theme_color": {
+                                            "title": "prefer to use \"pwa.meta.themeColor\" instead, this field will be generated automatically",
+                                            "type": "string"
+                                        },
+                                        "background_color": {
+                                            "type": "string"
+                                        },
+                                        "icons": {
+                                            "title": "prefer to use \"pwa.icon\" instead, this field will be generated automatically",
+                                            "type": "array",
+                                            "items": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "src": {
+                                                        "type": "string"
+                                                    },
+                                                    "sizes": {
+                                                        "type": "string"
+                                                    },
+                                                    "type": {
+                                                        "type": "string"
+                                                    }
+                                                },
+                                                "additionalProperties": false
+                                            }
+                                        }
+                                    },
+                                    "additionalProperties": false
+                                },
+                                "icon": {
+                                    "title": "PWA icons options",
+                                    "default": {},
+                                    "type": "object",
+                                    "properties": {
+                                        "src": {
+                                            "title": "Path to icon file (relative to \"root\" directory)",
+                                            "type": "string"
+                                        },
+                                        "dest": {
+                                            "title": "Folder for generated icons (will be placed in \"output.client\" directory)",
+                                            "default": "pwa-icons",
+                                            "type": "string"
+                                        },
+                                        "sizes": {
+                                            "title": "Icon sizes",
+                                            "default": [
+                                                36,
+                                                48,
+                                                72,
+                                                96,
+                                                144,
+                                                192,
+                                                512
+                                            ],
+                                            "type": "array",
+                                            "items": {
+                                                "type": "number"
+                                            }
+                                        }
+                                    },
+                                    "additionalProperties": false
+                                },
+                                "meta": {
+                                    "title": "PWA meta options",
+                                    "default": {},
+                                    "type": "object",
+                                    "properties": {
+                                        "viewport": {
+                                            "type": "string"
+                                        },
+                                        "themeColor": {
+                                            "type": "string"
+                                        },
+                                        "mobileApp": {
+                                            "type": "string"
+                                        },
+                                        "mobileAppIOS": {
+                                            "type": "string"
+                                        },
+                                        "appleTitle": {
+                                            "type": "string"
+                                        },
+                                        "appleStatusBarStyle": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "additionalProperties": false
+                                }
+                            },
+                            "additionalProperties": false
+                        },
                         "webpack": {
                             "title": "experiments configuration for [webpack](https://webpack.js.org/configuration/experiments/)",
                             "default": {},

package/lib/typings/configEntry/application.d.ts

@@ -1,4 +1,5 @@
 import type { ForkTsCheckerWebpackPluginOptions } from 'fork-ts-checker-webpack-plugin/lib/plugin-options';
+import type { PwaIconOptions, PwaMetaOptions, WebManifestOptions } from '../pwa';
 import type { CliConfigEntry, Experiments } from './cli';
 import type { OverridableOption } from './common';
 export interface CheckAsyncTsConfig {
@@ -19,6 +20,59 @@ export interface ApplicationExperiments extends Experiments {
      * @default "process"
      */
     serverRunner?: 'process' | 'thread';
+    /**
+     * @title PWA configuration (works with `TramvaiPwaModule` from `@tramvai/module-progressive-web-app` library)
+     * @default {}
+     */
+    pwa: {
+        /**
+         * @title Service-Worker configuration
+         * @default {}
+         */
+        sw?: {
+            /**
+             * @title Path to sw.ts file (relative to "root" directory)
+             * @default "sw.ts"
+             */
+            src?: string;
+            /**
+             * @title Name of generated SW file (will be placed in "output.client" directory)
+             * @default "sw.js"
+             */
+            dest?: string;
+            /**
+             * @title Scope of SW (see https://developers.google.com/web/ilt/pwa/introduction-to-service-worker#registration_and_scope)
+             * @default "/"
+             */
+            scope?: string;
+        };
+        /**
+         * @title Workbox configuration
+         * @default {}
+         */
+        workbox?: {
+            /**
+             * @title Connect `InjectManifest` from `workbox-webpack-plugin` library
+             * @default false
+             */
+            enabled?: OverridableOption<boolean>;
+        };
+        /**
+         * @title WebManifest content (manifest.json or webmanifest will be generated based on this options)
+         * @default {}
+         */
+        webmanifest?: WebManifestOptions;
+        /**
+         * @title PWA icons options
+         * @default {}
+         */
+        icon?: PwaIconOptions;
+        /**
+         * @title PWA meta options
+         * @default {}
+         */
+        meta?: PwaMetaOptions;
+    };
 }
 export interface ApplicationConfigEntry extends CliConfigEntry {
     type: 'application';

package/lib/typings/public.d.ts

@@ -5,3 +5,4 @@ export interface ImageObject {
     height: number;
 }
 export type SvgComponent = ComponentType<SVGProps<SVGElement>>;
+export * from './pwa/index';

package/lib/typings/public.js

@@ -1,3 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./pwa/index"), exports);
 //# sourceMappingURL=public.js.map

package/lib/typings/public.js.map

@@ -1 +1 @@
-{"version":3,"file":"public.js","sourceRoot":"","sources":["../../src/typings/public.ts"],"names":[],"mappings":""}
+{"version":3,"file":"public.js","sourceRoot":"","sources":["../../src/typings/public.ts"],"names":[],"mappings":";;;AAUA,sDAA4B"}

package/lib/typings/pwa/index.d.ts

@@ -0,0 +1,59 @@
+export type WebManifestOptions = {
+    /**
+     * @title Create webmanifest file
+     * @default false
+     */
+    enabled?: boolean;
+    /**
+     * @title Name of generated manifest file (will be placed in "output.client" directory). You can use `[hash]` placeholder for manifest cache busting
+     * @default "/manifest.[hash].json"
+     */
+    dest?: string;
+    /**
+     * @title prefer to use "pwa.sw.scope" instead, this field will be generated automatically
+     */
+    scope?: string;
+    name?: string;
+    short_name?: string;
+    description?: string;
+    start_url?: string;
+    display?: string;
+    /**
+     * @title prefer to use "pwa.meta.themeColor" instead, this field will be generated automatically
+     */
+    theme_color?: string;
+    background_color?: string;
+    /**
+     * @title prefer to use "pwa.icon" instead, this field will be generated automatically
+     */
+    icons?: Array<PwaIconItem>;
+};
+export type PwaIconItem = {
+    src: string;
+    sizes: string;
+    type?: string;
+};
+export type PwaIconOptions = {
+    /**
+     * @title Path to icon file (relative to "root" directory)
+     */
+    src: string;
+    /**
+     * @title Folder for generated icons (will be placed in "output.client" directory)
+     * @default "pwa-icons"
+     */
+    dest?: string;
+    /**
+     * @title Icon sizes
+     * @default [36, 48, 72, 96, 144, 192, 512]
+     */
+    sizes?: number[];
+};
+export type PwaMetaOptions = {
+    viewport?: string;
+    themeColor?: string;
+    mobileApp?: string;
+    mobileAppIOS?: string;
+    appleTitle?: string;
+    appleStatusBarStyle?: string;
+};

package/lib/typings/pwa/index.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=index.js.map

package/lib/typings/pwa/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/typings/pwa/index.ts"],"names":[],"mappings":""}

package/lib/validators/commands/checkPwaDependencies.d.ts

@@ -0,0 +1,2 @@
+import type { Validator } from './validator.h';
+export declare const checkPwaDependencies: Validator;

package/lib/validators/commands/checkPwaDependencies.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkPwaDependencies = void 0;
+const tslib_1 = require("tslib");
+const checkPwaDependencies = ({ packageManager, config }, parameters) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
+    const { target } = parameters;
+    const cfg = config.getProject(target);
+    if (((_b = (_a = cfg.experiments) === null || _a === void 0 ? void 0 : _a.pwa) === null || _b === void 0 ? void 0 : _b.icon) && packageManager.name !== 'unknown') {
+        const sharpInstalled = yield packageManager.exists({ name: 'sharp' });
+        if (!sharpInstalled) {
+            throw Error('You need to install `sharp` library for PWA icon generation in devDependencies');
+        }
+    }
+    return { name: 'checkPwaDependencies', status: 'ok' };
+});
+exports.checkPwaDependencies = checkPwaDependencies;
+//# sourceMappingURL=checkPwaDependencies.js.map

package/lib/validators/commands/checkPwaDependencies.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkPwaDependencies.js","sourceRoot":"","sources":["../../../src/validators/commands/checkPwaDependencies.ts"],"names":[],"mappings":";;;;AAGO,MAAM,oBAAoB,GAAc,CAAO,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,EAAE;;IAC9F,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;IAC9B,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAA2B,CAAC;IAEhE,IAAI,CAAA,MAAA,MAAA,GAAG,CAAC,WAAW,0CAAE,GAAG,0CAAE,IAAI,KAAI,cAAc,CAAC,IAAI,KAAK,SAAS,EAAE;QACnE,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QAEtE,IAAI,CAAC,cAAc,EAAE;YACnB,MAAM,KAAK,CAAC,gFAAgF,CAAC,CAAC;SAC/F;KACF;IAED,OAAO,EAAE,IAAI,EAAE,sBAAsB,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AACxD,CAAC,CAAA,CAAC;AAbW,QAAA,oBAAoB,wBAa/B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/cli",
-  "version": "2.98.0",
+  "version": "2.100.0",
   "description": "Cli инструмент для сборки и запуска приложений",
   "files": [
     "src",
@@ -65,15 +65,15 @@
     "@tinkoff/is-modern-lib": "2.0.8",
     "@tinkoff/logger": "0.10.63",
     "@tinkoff/minicss-class-generator": "0.2.5",
-    "@tinkoff/package-manager-wrapper": "0.1.8",
+    "@tinkoff/package-manager-wrapper": "0.1.9",
     "@tinkoff/request-core": "^0.9.2",
     "@tinkoff/request-plugin-protocol-http": "^0.11.6",
     "@tinkoff/utils": "^2.1.3",
     "@tinkoff/webpack-dedupe-plugin": "1.0.5",
     "@tramvai/build": "3.1.3",
-    "@tramvai/react": "2.98.0",
+    "@tramvai/react": "2.100.0",
     "@tramvai/tools-check-versions": "0.4.14",
-    "@tramvai/tools-migrate": "0.6.17",
+    "@tramvai/tools-migrate": "0.6.18",
     "ajv": "^6.12.6",
     "ansi-escapes": "^4.3.2",
     "autoprefixer": "^10.4.8",
@@ -87,24 +87,25 @@
     "browserslist": "^4.21.3",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
     "chalk": "^4.1.2",
-    "core-js": "^3.0.0",
     "commander": "^6.2.1",
     "compression": "^1.7.4",
+    "core-js": "^3.0.0",
     "css-class-generator": "^2.0.0",
     "css-loader": "^6.7.1",
     "css-minimizer-webpack-plugin": "^4.2.2",
     "csso-webpack-plugin": "2.0.0-beta.3",
     "death": "^1.1.0",
     "detect-port": "^1.5.1",
+    "env-ci": "^5.0.2",
     "execa": "^5.1.1",
     "exit": "^0.1.2",
     "express": "^4.18.1",
     "fastify": "^4.14.1",
     "figures": "^3.2.0",
+    "file-loader": "^6.2.0",
     "find-cache-dir": "^3.3.2",
     "fork-ts-checker-webpack-plugin": "^8.0.0",
     "fs-extra": "^9.1.0",
-    "file-loader": "^6.2.0",
     "fs-readdir-recursive": "^1.1.0",
     "fuzzy": "^0.1.3",
     "glob": "^7.2.3",
@@ -114,7 +115,6 @@
     "ini": "^3.0.1",
     "inquirer": "^7.3.3",
     "inquirer-autocomplete-prompt": "^1.4.0",
-    "env-ci": "^5.0.2",
     "inspectpack": "^4.7.1",
     "latest-version": "^5.0.0",
     "less": "^3.13.1",
@@ -165,6 +165,7 @@
     "webpack-hot-middleware": "^2.25.3",
     "webpack-stats-plugin": "^1.1.1",
     "webpackbar": "^5.0.2",
+    "workbox-webpack-plugin": "^6.5.4",
     "wrap-ansi": "^7.0.0"
   },
   "devDependencies": {
@@ -174,13 +175,14 @@
     "@types/express": "^4.17.13",
     "@types/find-cache-dir": "^3.2.1",
     "@types/fs-extra": "^9.0.13",
+    "@types/fs-readdir-recursive": "^1.1.0",
     "@types/glob": "^7.2.0",
     "@types/http-proxy": "^1.17.9",
     "@types/inquirer": "^7.3.3",
-    "@types/fs-readdir-recursive": "^1.1.0",
     "@types/resolve": "^1.20.2",
     "@types/rimraf": "^3.0.2",
     "@types/semver": "^7.3.12",
+    "@types/sharp": "^0.32.0",
     "@types/stoppable": "^1.1.1",
     "@types/svgo": "^1.3.6",
     "@types/universal-analytics": "^0.4.5",
@@ -188,10 +190,12 @@
     "@types/webpack-dev-middleware": "^5.0.2",
     "@types/webpack-stats-plugin": "^0.3.2",
     "babel-plugin-tester": "^10.1.0",
-    "react": "18.2.0"
+    "react": "18.2.0",
+    "sharp": "^0.32.1"
   },
   "hiddenDependencies": {
-    "image-webpack-loader": "^6.0.0"
+    "image-webpack-loader": "^6.0.0",
+    "sharp": "^0.32.1"
   },
   "license": "Apache-2.0",
   "engines": {