@tramvai/module-progressive-web-app 5.49.1 → 6.59.0

package/README.md

@@ -2,7 +2,7 @@
 
 Progressiwe Web App module.
 
-Complete documentation is available in [PWA page](03-features/017-pwa.md).
+Complete documentation is available in [PWA page](03-features/018-pwa.md).
 
 ## Installation
 
@@ -22,4 +22,4 @@ createApp({
   name: 'tincoin',
   modules: [TramvaiPwaModule],
 });
-```
+```

package/lib/browser.js

@@ -4,7 +4,7 @@ export { TramvaiPwaWorkboxModule } from './workbox/browser.browser.js';
 import { TramvaiPwaManifestModule, TramvaiPwaLightManifestModule } from './manifest/browser.browser.js';
 export { TramvaiPwaManifestModule } from './manifest/browser.browser.js';
 import { TramvaiPwaMetaModule } from './meta/browser.browser.js';
-export { PWA_MANIFEST_INIT_COMMAND_LINE, PWA_MANIFEST_URL_TOKEN, PWA_META_TOKEN, PWA_SW_PARAMS_TOKEN, PWA_SW_SCOPE_TOKEN, PWA_SW_URL_TOKEN, PWA_WORKBOX_TOKEN } from './tokens.browser.js';
+export { PWA_MANIFEST_INIT_COMMAND_LINE, PWA_MANIFEST_SCOPE_TOKEN, PWA_MANIFEST_URL_TOKEN, PWA_META_TOKEN, PWA_SW_PARAMS_TOKEN, PWA_SW_SCOPE_TOKEN, PWA_SW_URL_TOKEN, PWA_WORKBOX_TOKEN } from './tokens.browser.js';
 
 const TramvaiPwaModule = declareModule({
     name: 'TramvaiPwaModule',

package/lib/manifest/server.es.js

@@ -2,7 +2,7 @@ import { declareModule, provide, Scope } from '@tramvai/core';
 import { PROXY_CONFIG_TOKEN } from '@tramvai/tokens-server';
 import { ASSETS_PREFIX_TOKEN } from '@tramvai/tokens-render';
 import { appConfig } from '@tramvai/cli/lib/external/config';
-import { PWA_MANIFEST_URL_TOKEN, PWA_SW_SCOPE_TOKEN } from '../tokens.es.js';
+import { PWA_MANIFEST_URL_TOKEN, PWA_SW_SCOPE_TOKEN, PWA_MANIFEST_SCOPE_TOKEN } from '../tokens.es.js';
 import { registerWebManifestProvider, validateRelativeUrlProvider } from './shared/providers.es.js';
 
 const TramvaiPwaManifestModule = declareModule({
@@ -11,13 +11,13 @@ const TramvaiPwaManifestModule = declareModule({
         provide({
             provide: PROXY_CONFIG_TOKEN,
             scope: Scope.SINGLETON,
-            useFactory: ({ manifestUrl, swScope, assetsPrefixFactory }) => {
+            useFactory: ({ manifestUrl, swScope, manifestScope, assetsPrefixFactory }) => {
                 return {
                     context: [manifestUrl],
                     // appConfig.assetsPrefix available in 'development' mode
                     target: appConfig.assetsPrefix ?? assetsPrefixFactory() ?? '',
                     pathRewrite: (path) => {
-                        return path.replace(swScope, '/');
+                        return path.replace(manifestScope ?? swScope, '/');
                     },
                     // support local proxy for `tramvai start --https`
                     secure: process.env.NODE_ENV !== 'development',
@@ -26,21 +26,28 @@ const TramvaiPwaManifestModule = declareModule({
             deps: {
                 manifestUrl: PWA_MANIFEST_URL_TOKEN,
                 swScope: PWA_SW_SCOPE_TOKEN,
+                manifestScope: PWA_MANIFEST_SCOPE_TOKEN,
                 assetsPrefixFactory: ASSETS_PREFIX_TOKEN,
             },
         }),
+        provide({
+            provide: PWA_MANIFEST_SCOPE_TOKEN,
+            scope: Scope.SINGLETON,
+            useValue: process.env.TRAMVAI_PWA_MANIFEST_SCOPE,
+        }),
         provide({
             provide: PWA_MANIFEST_URL_TOKEN,
             scope: Scope.SINGLETON,
-            useFactory: ({ swScope }) => {
+            useFactory: ({ swScope, manifestScope }) => {
                 const manifestDest = process.env.TRAMVAI_PWA_MANIFEST_DEST;
                 const normalizedUrl = manifestDest.startsWith('/') ? manifestDest : `/${manifestDest}`;
-                const normalizedScope = swScope.replace(/\/$/, '');
+                const normalizedScope = (manifestScope ?? swScope).replace(/\/$/, '');
                 const finalUrl = `${normalizedScope}${normalizedUrl}`;
                 return finalUrl;
             },
             deps: {
                 swScope: PWA_SW_SCOPE_TOKEN,
+                manifestScope: PWA_MANIFEST_SCOPE_TOKEN,
             },
         }),
         ...(process.env.TRAMVAI_PWA_MANIFEST_ENABLED

package/lib/manifest/server.js

@@ -15,13 +15,13 @@ const TramvaiPwaManifestModule = core.declareModule({
         core.provide({
             provide: tokensServer.PROXY_CONFIG_TOKEN,
             scope: core.Scope.SINGLETON,
-            useFactory: ({ manifestUrl, swScope, assetsPrefixFactory }) => {
+            useFactory: ({ manifestUrl, swScope, manifestScope, assetsPrefixFactory }) => {
                 return {
                     context: [manifestUrl],
                     // appConfig.assetsPrefix available in 'development' mode
                     target: config.appConfig.assetsPrefix ?? assetsPrefixFactory() ?? '',
                     pathRewrite: (path) => {
-                        return path.replace(swScope, '/');
+                        return path.replace(manifestScope ?? swScope, '/');
                     },
                     // support local proxy for `tramvai start --https`
                     secure: process.env.NODE_ENV !== 'development',
@@ -30,21 +30,28 @@ const TramvaiPwaManifestModule = core.declareModule({
             deps: {
                 manifestUrl: tokens.PWA_MANIFEST_URL_TOKEN,
                 swScope: tokens.PWA_SW_SCOPE_TOKEN,
+                manifestScope: tokens.PWA_MANIFEST_SCOPE_TOKEN,
                 assetsPrefixFactory: tokensRender.ASSETS_PREFIX_TOKEN,
             },
         }),
+        core.provide({
+            provide: tokens.PWA_MANIFEST_SCOPE_TOKEN,
+            scope: core.Scope.SINGLETON,
+            useValue: process.env.TRAMVAI_PWA_MANIFEST_SCOPE,
+        }),
         core.provide({
             provide: tokens.PWA_MANIFEST_URL_TOKEN,
             scope: core.Scope.SINGLETON,
-            useFactory: ({ swScope }) => {
+            useFactory: ({ swScope, manifestScope }) => {
                 const manifestDest = process.env.TRAMVAI_PWA_MANIFEST_DEST;
                 const normalizedUrl = manifestDest.startsWith('/') ? manifestDest : `/${manifestDest}`;
-                const normalizedScope = swScope.replace(/\/$/, '');
+                const normalizedScope = (manifestScope ?? swScope).replace(/\/$/, '');
                 const finalUrl = `${normalizedScope}${normalizedUrl}`;
                 return finalUrl;
             },
             deps: {
                 swScope: tokens.PWA_SW_SCOPE_TOKEN,
+                manifestScope: tokens.PWA_MANIFEST_SCOPE_TOKEN,
             },
         }),
         ...(process.env.TRAMVAI_PWA_MANIFEST_ENABLED

package/lib/server.es.js

@@ -4,7 +4,7 @@ export { TramvaiPwaWorkboxModule } from './workbox/server.es.js';
 import { TramvaiPwaManifestModule, TramvaiPwaLightManifestModule } from './manifest/server.es.js';
 export { TramvaiPwaManifestModule } from './manifest/server.es.js';
 import { TramvaiPwaMetaModule } from './meta/server.es.js';
-export { PWA_MANIFEST_INIT_COMMAND_LINE, PWA_MANIFEST_URL_TOKEN, PWA_META_TOKEN, PWA_SW_PARAMS_TOKEN, PWA_SW_SCOPE_TOKEN, PWA_SW_URL_TOKEN, PWA_WORKBOX_TOKEN } from './tokens.es.js';
+export { PWA_MANIFEST_INIT_COMMAND_LINE, PWA_MANIFEST_SCOPE_TOKEN, PWA_MANIFEST_URL_TOKEN, PWA_META_TOKEN, PWA_SW_PARAMS_TOKEN, PWA_SW_SCOPE_TOKEN, PWA_SW_URL_TOKEN, PWA_WORKBOX_TOKEN } from './tokens.es.js';
 
 const TramvaiPwaModule = declareModule({
     name: 'TramvaiPwaModule',

package/lib/server.js

@@ -22,6 +22,7 @@ const TramvaiPwaLightModule = /* @__PURE__ */ core.declareModule({
 exports.TramvaiPwaWorkboxModule = server.TramvaiPwaWorkboxModule;
 exports.TramvaiPwaManifestModule = server$1.TramvaiPwaManifestModule;
 exports.PWA_MANIFEST_INIT_COMMAND_LINE = tokens.PWA_MANIFEST_INIT_COMMAND_LINE;
+exports.PWA_MANIFEST_SCOPE_TOKEN = tokens.PWA_MANIFEST_SCOPE_TOKEN;
 exports.PWA_MANIFEST_URL_TOKEN = tokens.PWA_MANIFEST_URL_TOKEN;
 exports.PWA_META_TOKEN = tokens.PWA_META_TOKEN;
 exports.PWA_SW_PARAMS_TOKEN = tokens.PWA_SW_PARAMS_TOKEN;

package/lib/tokens.browser.js

@@ -12,6 +12,10 @@ const PWA_SW_URL_TOKEN = createToken('pwa sw url');
  * @description Token to owerwrite default - `pwa.sw.scope`
  */
 const PWA_SW_SCOPE_TOKEN = createToken('pwa sw scope');
+/**
+ * @description Token to owerwrite default - `pwa.manifest.scope`
+ */
+const PWA_MANIFEST_SCOPE_TOKEN = createToken('pwa manifest scope');
 /**
  * @description Token to add query params to sw url
  */
@@ -31,4 +35,4 @@ const PWA_META_TOKEN = createToken('pwa meta');
  */
 const PWA_MANIFEST_INIT_COMMAND_LINE = createToken('pwa manifest init command line');
 
-export { PWA_MANIFEST_INIT_COMMAND_LINE, PWA_MANIFEST_URL_TOKEN, PWA_META_TOKEN, PWA_SW_PARAMS_TOKEN, PWA_SW_SCOPE_TOKEN, PWA_SW_URL_TOKEN, PWA_WORKBOX_TOKEN };
+export { PWA_MANIFEST_INIT_COMMAND_LINE, PWA_MANIFEST_SCOPE_TOKEN, PWA_MANIFEST_URL_TOKEN, PWA_META_TOKEN, PWA_SW_PARAMS_TOKEN, PWA_SW_SCOPE_TOKEN, PWA_SW_URL_TOKEN, PWA_WORKBOX_TOKEN };

package/lib/tokens.d.ts

@@ -1,5 +1,5 @@
 import type { Workbox } from 'workbox-window';
-import type { PwaMetaOptions } from '@tramvai/cli/lib/typings/public';
+import type { PwaMetaOptions } from '@tramvai/plugin-webpack-pwa';
 export type WebManifest = {
     [key: string]: any;
 };
@@ -21,13 +21,16 @@ export declare const PWA_SW_URL_TOKEN: string & {
 export declare const PWA_SW_SCOPE_TOKEN: string & {
     __type?: "base token" | undefined;
 };
+/**
+ * @description Token to owerwrite default - `pwa.manifest.scope`
+ */
+export declare const PWA_MANIFEST_SCOPE_TOKEN: (string & {
+    __type?: "base token" | undefined;
+}) | undefined;
 /**
  * @description Token to add query params to sw url
  */
 export declare const PWA_SW_PARAMS_TOKEN: Record<string, string> & {
-    /**
-     * @description Token to owerwrite default - `${pwa.webmanifest.path}manifest.${pwa.webmanifest.ext}`
-     */
     __type?: "multi token" | undefined;
 };
 /**

package/lib/tokens.es.js

@@ -12,6 +12,10 @@ const PWA_SW_URL_TOKEN = createToken('pwa sw url');
  * @description Token to owerwrite default - `pwa.sw.scope`
  */
 const PWA_SW_SCOPE_TOKEN = createToken('pwa sw scope');
+/**
+ * @description Token to owerwrite default - `pwa.manifest.scope`
+ */
+const PWA_MANIFEST_SCOPE_TOKEN = createToken('pwa manifest scope');
 /**
  * @description Token to add query params to sw url
  */
@@ -31,4 +35,4 @@ const PWA_META_TOKEN = createToken('pwa meta');
  */
 const PWA_MANIFEST_INIT_COMMAND_LINE = createToken('pwa manifest init command line');
 
-export { PWA_MANIFEST_INIT_COMMAND_LINE, PWA_MANIFEST_URL_TOKEN, PWA_META_TOKEN, PWA_SW_PARAMS_TOKEN, PWA_SW_SCOPE_TOKEN, PWA_SW_URL_TOKEN, PWA_WORKBOX_TOKEN };
+export { PWA_MANIFEST_INIT_COMMAND_LINE, PWA_MANIFEST_SCOPE_TOKEN, PWA_MANIFEST_URL_TOKEN, PWA_META_TOKEN, PWA_SW_PARAMS_TOKEN, PWA_SW_SCOPE_TOKEN, PWA_SW_URL_TOKEN, PWA_WORKBOX_TOKEN };

package/lib/tokens.js

@@ -16,6 +16,10 @@ const PWA_SW_URL_TOKEN = dippy.createToken('pwa sw url');
  * @description Token to owerwrite default - `pwa.sw.scope`
  */
 const PWA_SW_SCOPE_TOKEN = dippy.createToken('pwa sw scope');
+/**
+ * @description Token to owerwrite default - `pwa.manifest.scope`
+ */
+const PWA_MANIFEST_SCOPE_TOKEN = dippy.createToken('pwa manifest scope');
 /**
  * @description Token to add query params to sw url
  */
@@ -36,6 +40,7 @@ const PWA_META_TOKEN = dippy.createToken('pwa meta');
 const PWA_MANIFEST_INIT_COMMAND_LINE = dippy.createToken('pwa manifest init command line');
 
 exports.PWA_MANIFEST_INIT_COMMAND_LINE = PWA_MANIFEST_INIT_COMMAND_LINE;
+exports.PWA_MANIFEST_SCOPE_TOKEN = PWA_MANIFEST_SCOPE_TOKEN;
 exports.PWA_MANIFEST_URL_TOKEN = PWA_MANIFEST_URL_TOKEN;
 exports.PWA_META_TOKEN = PWA_META_TOKEN;
 exports.PWA_SW_PARAMS_TOKEN = PWA_SW_PARAMS_TOKEN;

package/lib/workbox/browser.browser.js

@@ -1,6 +1,4 @@
 import { declareModule, provide, optional } from '@tramvai/core';
-import { MODERN_SATISFIES_TOKEN } from '@tramvai/tokens-render';
-import { ENV_MANAGER_TOKEN } from '@tramvai/tokens-common';
 import { PWA_SW_URL_TOKEN, PWA_SW_SCOPE_TOKEN, PWA_SW_PARAMS_TOKEN } from '../tokens.browser.js';
 import { providers, sharedPwaLightModuleProviders } from './shared/providers/swProviders.browser.js';
 import { pwaWorkboxTokenProvider, workboxRegisterProvider } from './shared/providers/workboxProviders.browser.js';
@@ -12,17 +10,10 @@ const TramvaiPwaWorkboxModule = declareModule({
         ...providers,
         provide({
             provide: PWA_SW_URL_TOKEN,
-            useFactory: ({ swScope, modern, envManager, swParams }) => {
+            useFactory: ({ swScope, swParams }) => {
                 const swDest = process.env.TRAMVAI_PWA_SW_DEST;
                 const swUrl = normalizeSwUrl(swDest, swScope);
-                const hasModernBuild = !!process.env.TRAMVAI_MODERN_BUILD;
-                const isCsrMode = envManager.get('TRAMVAI_FORCE_CLIENT_SIDE_RENDERING') === 'true';
-                // tramvai modern build is not supported for CSR and not compatible with PWA module in CSR mode
-                const addModernPrefix = modern && hasModernBuild && !isCsrMode;
                 let finalSwUrl = swUrl;
-                if (addModernPrefix) {
-                    finalSwUrl = finalSwUrl.replace(/\.js$/, '.modern.js');
-                }
                 if (swParams && swParams.length) {
                     const params = swParams
                         .filter(Boolean)
@@ -38,8 +29,6 @@ const TramvaiPwaWorkboxModule = declareModule({
             },
             deps: {
                 swScope: PWA_SW_SCOPE_TOKEN,
-                modern: MODERN_SATISFIES_TOKEN,
-                envManager: ENV_MANAGER_TOKEN,
                 swParams: optional(PWA_SW_PARAMS_TOKEN),
             },
         }),

package/lib/workbox/server.es.js

@@ -41,7 +41,7 @@ const TramvaiPwaWorkboxModule = declareModule({
             scope: Scope.SINGLETON,
             useFactory: ({ swUrl, swScope, assetsPrefixFactory }) => {
                 return {
-                    context: [swUrl, swUrl.replace(/\.js$/, '.modern.js')],
+                    context: [swUrl],
                     // appConfig.assetsPrefix available in 'development' mode
                     target: appConfig.assetsPrefix ?? assetsPrefixFactory() ?? '',
                     pathRewrite: (path) => {

package/lib/workbox/server.js

@@ -45,7 +45,7 @@ const TramvaiPwaWorkboxModule = core.declareModule({
             scope: core.Scope.SINGLETON,
             useFactory: ({ swUrl, swScope, assetsPrefixFactory }) => {
                 return {
-                    context: [swUrl, swUrl.replace(/\.js$/, '.modern.js')],
+                    context: [swUrl],
                     // appConfig.assetsPrefix available in 'development' mode
                     target: config.appConfig.assetsPrefix ?? assetsPrefixFactory() ?? '',
                     pathRewrite: (path) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-progressive-web-app",
-  "version": "5.49.1",
+  "version": "6.59.0",
   "description": "Pwa integration - SW, manifest, icons and meta",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -23,16 +23,19 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@tramvai/tokens-common": "5.49.1",
-    "@tramvai/tokens-render": "5.49.1",
-    "@tramvai/tokens-server": "5.49.1",
+    "@tramvai/tokens-common": "6.59.0",
+    "@tramvai/tokens-render": "6.59.0",
+    "@tramvai/tokens-server": "6.59.0",
     "workbox-window": "^6.6.1"
   },
-  "devDependencies": {},
+  "devDependencies": {
+    "@tramvai/plugin-webpack-pwa": "6.59.0"
+  },
   "peerDependencies": {
-    "@tramvai/cli": "5.49.1",
-    "@tramvai/core": "5.49.1",
-    "@tinkoff/dippy": "0.11.4",
+    "@tinkoff/dippy": "0.12.3",
+    "@tramvai/cli": "6.59.0",
+    "@tramvai/core": "6.59.0",
+    "@tramvai/plugin-webpack-pwa": "6.59.0",
     "tslib": "^2.4.0"
   }
 }