@tramvai/module-progressive-web-app 2.101.1 → 2.103.1

package/lib/manifest/server.es.js

@@ -2,7 +2,7 @@ import { declareModule, provide, Scope, commandLineListTokens } from '@tramvai/c
 import { ResourceType, ResourceSlot, RESOURCES_REGISTRY } from '@tramvai/tokens-render';
 import { PROXY_CONFIG_TOKEN } from '@tramvai/tokens-server';
 import { appConfig } from '@tramvai/cli/lib/external/config';
-import { PWA_MANIFEST_URL_TOKEN } from '../tokens.es.js';
+import { PWA_MANIFEST_URL_TOKEN, PWA_SW_SCOPE_TOKEN } from '../tokens.es.js';
 
 const TramvaiPwaManifestModule = declareModule({
     name: 'TramvaiPwaManifestModule',
@@ -10,15 +10,19 @@ const TramvaiPwaManifestModule = declareModule({
         provide({
             provide: PROXY_CONFIG_TOKEN,
             scope: Scope.SINGLETON,
-            useFactory: ({ manifestUrl }) => {
+            useFactory: ({ manifestUrl, swScope }) => {
                 var _a, _b;
-                return ({
+                return {
                     context: [manifestUrl],
                     target: (_b = (_a = appConfig.assetsPrefix) !== null && _a !== void 0 ? _a : process.env.ASSETS_PREFIX) !== null && _b !== void 0 ? _b : '',
-                });
+                    pathRewrite: (path) => {
+                        return path.replace(swScope, '/');
+                    },
+                };
             },
             deps: {
                 manifestUrl: PWA_MANIFEST_URL_TOKEN,
+                swScope: PWA_SW_SCOPE_TOKEN,
             },
         }),
         provide({
@@ -42,12 +46,17 @@ const TramvaiPwaManifestModule = declareModule({
         }),
         provide({
             provide: PWA_MANIFEST_URL_TOKEN,
-            useFactory: () => {
+            useFactory: ({ swScope }) => {
                 const manifestDest = process.env.TRAMVAI_PWA_MANIFEST_DEST;
-                const finalUrl = manifestDest.startsWith('/') ? manifestDest : `/${manifestDest}`;
-                // @todo check that finalUrl is relative and ends with .json or .webmanifest
+                const normalizedUrl = manifestDest.startsWith('/') ? manifestDest : `/${manifestDest}`;
+                const normalizedScope = swScope.replace(/\/$/, '');
+                const finalUrl = `${normalizedScope}${normalizedUrl}`;
+                // @todo check that finalUrl is relative and ends with .json or .webmanifest and no slash duplicates
                 return finalUrl;
             },
+            deps: {
+                swScope: PWA_SW_SCOPE_TOKEN,
+            },
         }),
     ],
 });

package/lib/manifest/server.js

@@ -14,15 +14,19 @@ const TramvaiPwaManifestModule = core.declareModule({
         core.provide({
             provide: tokensServer.PROXY_CONFIG_TOKEN,
             scope: core.Scope.SINGLETON,
-            useFactory: ({ manifestUrl }) => {
+            useFactory: ({ manifestUrl, swScope }) => {
                 var _a, _b;
-                return ({
+                return {
                     context: [manifestUrl],
                     target: (_b = (_a = config.appConfig.assetsPrefix) !== null && _a !== void 0 ? _a : process.env.ASSETS_PREFIX) !== null && _b !== void 0 ? _b : '',
-                });
+                    pathRewrite: (path) => {
+                        return path.replace(swScope, '/');
+                    },
+                };
             },
             deps: {
                 manifestUrl: tokens.PWA_MANIFEST_URL_TOKEN,
+                swScope: tokens.PWA_SW_SCOPE_TOKEN,
             },
         }),
         core.provide({
@@ -46,12 +50,17 @@ const TramvaiPwaManifestModule = core.declareModule({
         }),
         core.provide({
             provide: tokens.PWA_MANIFEST_URL_TOKEN,
-            useFactory: () => {
+            useFactory: ({ swScope }) => {
                 const manifestDest = process.env.TRAMVAI_PWA_MANIFEST_DEST;
-                const finalUrl = manifestDest.startsWith('/') ? manifestDest : `/${manifestDest}`;
-                // @todo check that finalUrl is relative and ends with .json or .webmanifest
+                const normalizedUrl = manifestDest.startsWith('/') ? manifestDest : `/${manifestDest}`;
+                const normalizedScope = swScope.replace(/\/$/, '');
+                const finalUrl = `${normalizedScope}${normalizedUrl}`;
+                // @todo check that finalUrl is relative and ends with .json or .webmanifest and no slash duplicates
                 return finalUrl;
             },
+            deps: {
+                swScope: tokens.PWA_SW_SCOPE_TOKEN,
+            },
         }),
     ],
 });

package/lib/workbox/browser.browser.js

@@ -1,5 +1,6 @@
 import { declareModule, provide, Scope, optional, commandLineListTokens } from '@tramvai/core';
 import { MODERN_SATISFIES_TOKEN } from '@tramvai/tokens-render';
+import { ENV_MANAGER_TOKEN } from '@tramvai/tokens-common';
 import { PWA_WORKBOX_TOKEN, PWA_SW_URL_TOKEN, PWA_SW_SCOPE_TOKEN, PWA_SW_PARAMS_TOKEN } from '../tokens.browser.js';
 import { providers } from './shared.browser.js';
 
@@ -10,7 +11,7 @@ const TramvaiPwaWorkboxModule = declareModule({
         provide({
             provide: PWA_WORKBOX_TOKEN,
             scope: Scope.SINGLETON,
-            useFactory: ({ swUrl, swScope, modern, swParams }) => {
+            useFactory: ({ swUrl, swScope, modern, swParams, envManager }) => {
                 let workbox = null;
                 return async () => {
                     if (!('serviceWorker' in navigator)) {
@@ -18,7 +19,10 @@ const TramvaiPwaWorkboxModule = declareModule({
                         return workbox;
                     }
                     const { Workbox } = await import('workbox-window/Workbox');
-                    let finalSwUrl = modern ? swUrl.replace(/\.js$/, '.modern.js') : swUrl;
+                    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
+                    let finalSwUrl = modern && hasModernBuild && !isCsrMode ? swUrl.replace(/\.js$/, '.modern.js') : swUrl;
                     if (swParams && swParams.length) {
                         const params = swParams
                             .filter(Boolean)
@@ -44,6 +48,7 @@ const TramvaiPwaWorkboxModule = declareModule({
                 swScope: PWA_SW_SCOPE_TOKEN,
                 modern: MODERN_SATISFIES_TOKEN,
                 swParams: optional(PWA_SW_PARAMS_TOKEN),
+                envManager: ENV_MANAGER_TOKEN,
             },
         }),
         provide({
@@ -53,12 +58,12 @@ const TramvaiPwaWorkboxModule = declareModule({
                 if (!process.env.TRAMVAI_PWA_WORKBOX_ENABLED) {
                     return;
                 }
-                const wb = await workbox();
-                if (!wb) {
-                    // @todo: logs
-                    return;
-                }
                 try {
+                    const wb = await workbox();
+                    if (!wb) {
+                        // @todo: logs
+                        return;
+                    }
                     // @todo unregister when Workbox is disabled in config !!!
                     // https://github.com/nuxt-community/pwa-module/blob/main/templates/workbox/workbox.unregister.js
                     await wb.register();

package/lib/workbox/server.es.js

@@ -1,7 +1,7 @@
 import { declareModule, provide, Scope } from '@tramvai/core';
 import { PROXY_CONFIG_TOKEN } from '@tramvai/tokens-server';
 import { appConfig } from '@tramvai/cli/lib/external/config';
-import { PWA_SW_URL_TOKEN } from '../tokens.es.js';
+import { PWA_SW_URL_TOKEN, PWA_SW_SCOPE_TOKEN } from '../tokens.es.js';
 import { providers } from './shared.es.js';
 
 const TramvaiPwaWorkboxModule = declareModule({
@@ -11,15 +11,19 @@ const TramvaiPwaWorkboxModule = declareModule({
         provide({
             provide: PROXY_CONFIG_TOKEN,
             scope: Scope.SINGLETON,
-            useFactory: ({ swUrl }) => {
+            useFactory: ({ swUrl, swScope }) => {
                 var _a, _b;
-                return ({
+                return {
                     context: [swUrl, swUrl.replace(/\.js$/, '.modern.js')],
                     target: (_b = (_a = appConfig.assetsPrefix) !== null && _a !== void 0 ? _a : process.env.ASSETS_PREFIX) !== null && _b !== void 0 ? _b : '',
-                });
+                    pathRewrite: (path) => {
+                        return path.replace(swScope, '/');
+                    },
+                };
             },
             deps: {
                 swUrl: PWA_SW_URL_TOKEN,
+                swScope: PWA_SW_SCOPE_TOKEN,
             },
         }),
     ],

package/lib/workbox/server.js

@@ -15,15 +15,19 @@ const TramvaiPwaWorkboxModule = core.declareModule({
         core.provide({
             provide: tokensServer.PROXY_CONFIG_TOKEN,
             scope: core.Scope.SINGLETON,
-            useFactory: ({ swUrl }) => {
+            useFactory: ({ swUrl, swScope }) => {
                 var _a, _b;
-                return ({
+                return {
                     context: [swUrl, swUrl.replace(/\.js$/, '.modern.js')],
                     target: (_b = (_a = config.appConfig.assetsPrefix) !== null && _a !== void 0 ? _a : process.env.ASSETS_PREFIX) !== null && _b !== void 0 ? _b : '',
-                });
+                    pathRewrite: (path) => {
+                        return path.replace(swScope, '/');
+                    },
+                };
             },
             deps: {
                 swUrl: tokens.PWA_SW_URL_TOKEN,
+                swScope: tokens.PWA_SW_SCOPE_TOKEN,
             },
         }),
     ],

package/lib/workbox/shared.browser.js

@@ -1,16 +1,7 @@
 import { provide } from '@tramvai/core';
-import { PWA_SW_URL_TOKEN, PWA_SW_SCOPE_TOKEN } from '../tokens.browser.js';
+import { PWA_SW_SCOPE_TOKEN, PWA_SW_URL_TOKEN } from '../tokens.browser.js';
 
 const providers = [
-    provide({
-        provide: PWA_SW_URL_TOKEN,
-        useFactory: () => {
-            const swDest = process.env.TRAMVAI_PWA_SW_DEST;
-            const finalUrl = swDest.startsWith('/') ? swDest : `/${swDest}`;
-            // @todo check that finalUrl is relative and ends with .js
-            return finalUrl;
-        },
-    }),
     provide({
         provide: PWA_SW_SCOPE_TOKEN,
         useFactory: () => {
@@ -19,6 +10,20 @@ const providers = [
             return swScope;
         },
     }),
+    provide({
+        provide: PWA_SW_URL_TOKEN,
+        useFactory: ({ swScope }) => {
+            const swDest = process.env.TRAMVAI_PWA_SW_DEST;
+            const normalizedUrl = swDest.startsWith('/') ? swDest : `/${swDest}`;
+            const normalizedScope = swScope.replace(/\/$/, '');
+            const finalUrl = `${normalizedScope}${normalizedUrl}`;
+            // @todo check that finalUrl is relative and ends with .js and no slash duplicates
+            return finalUrl;
+        },
+        deps: {
+            swScope: PWA_SW_SCOPE_TOKEN,
+        },
+    }),
 ];
 
 export { providers };

package/lib/workbox/shared.d.ts

@@ -1,3 +1,23 @@
-export declare const providers: import("@tramvai/core").Provider<unknown, string & {
+export declare const providers: (import("@tinkoff/dippy/lib/Provider").ValueProvider<string & {
     __type?: "base token" | undefined;
-}>[];
+}> | import("@tinkoff/dippy/lib/Provider").ClassProviderWithDeps<unknown, string & {
+    __type?: "base token" | undefined;
+}> | import("@tinkoff/dippy/lib/Provider").ClassProviderWithoutDeps<string & {
+    __type?: "base token" | undefined;
+}> | import("@tinkoff/dippy/lib/Provider").FactoryProviderWithDeps<unknown, string & {
+    __type?: "base token" | undefined;
+}> | import("@tinkoff/dippy/lib/Provider").FactoryProviderWithoutDeps<string & {
+    __type?: "base token" | undefined;
+}> | import("@tinkoff/dippy/lib/Provider").ClassProviderWithDeps<{
+    swScope: string & {
+        __type?: "base token" | undefined;
+    };
+}, string & {
+    __type?: "base token" | undefined;
+}> | import("@tinkoff/dippy/lib/Provider").FactoryProviderWithDeps<{
+    swScope: string & {
+        __type?: "base token" | undefined;
+    };
+}, string & {
+    __type?: "base token" | undefined;
+}>)[];

package/lib/workbox/shared.es.js

@@ -1,16 +1,7 @@
 import { provide } from '@tramvai/core';
-import { PWA_SW_URL_TOKEN, PWA_SW_SCOPE_TOKEN } from '../tokens.es.js';
+import { PWA_SW_SCOPE_TOKEN, PWA_SW_URL_TOKEN } from '../tokens.es.js';
 
 const providers = [
-    provide({
-        provide: PWA_SW_URL_TOKEN,
-        useFactory: () => {
-            const swDest = process.env.TRAMVAI_PWA_SW_DEST;
-            const finalUrl = swDest.startsWith('/') ? swDest : `/${swDest}`;
-            // @todo check that finalUrl is relative and ends with .js
-            return finalUrl;
-        },
-    }),
     provide({
         provide: PWA_SW_SCOPE_TOKEN,
         useFactory: () => {
@@ -19,6 +10,20 @@ const providers = [
             return swScope;
         },
     }),
+    provide({
+        provide: PWA_SW_URL_TOKEN,
+        useFactory: ({ swScope }) => {
+            const swDest = process.env.TRAMVAI_PWA_SW_DEST;
+            const normalizedUrl = swDest.startsWith('/') ? swDest : `/${swDest}`;
+            const normalizedScope = swScope.replace(/\/$/, '');
+            const finalUrl = `${normalizedScope}${normalizedUrl}`;
+            // @todo check that finalUrl is relative and ends with .js and no slash duplicates
+            return finalUrl;
+        },
+        deps: {
+            swScope: PWA_SW_SCOPE_TOKEN,
+        },
+    }),
 ];
 
 export { providers };

package/lib/workbox/shared.js

@@ -6,15 +6,6 @@ var core = require('@tramvai/core');
 var tokens = require('../tokens.js');
 
 const providers = [
-    core.provide({
-        provide: tokens.PWA_SW_URL_TOKEN,
-        useFactory: () => {
-            const swDest = process.env.TRAMVAI_PWA_SW_DEST;
-            const finalUrl = swDest.startsWith('/') ? swDest : `/${swDest}`;
-            // @todo check that finalUrl is relative and ends with .js
-            return finalUrl;
-        },
-    }),
     core.provide({
         provide: tokens.PWA_SW_SCOPE_TOKEN,
         useFactory: () => {
@@ -23,6 +14,20 @@ const providers = [
             return swScope;
         },
     }),
+    core.provide({
+        provide: tokens.PWA_SW_URL_TOKEN,
+        useFactory: ({ swScope }) => {
+            const swDest = process.env.TRAMVAI_PWA_SW_DEST;
+            const normalizedUrl = swDest.startsWith('/') ? swDest : `/${swDest}`;
+            const normalizedScope = swScope.replace(/\/$/, '');
+            const finalUrl = `${normalizedScope}${normalizedUrl}`;
+            // @todo check that finalUrl is relative and ends with .js and no slash duplicates
+            return finalUrl;
+        },
+        deps: {
+            swScope: tokens.PWA_SW_SCOPE_TOKEN,
+        },
+    }),
 ];
 
 exports.providers = providers;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-progressive-web-app",
-  "version": "2.101.1",
+  "version": "2.103.1",
   "description": "Pwa integration - SW, manifest, icons and meta",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -23,14 +23,15 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@tramvai/tokens-render": "2.101.1",
-    "@tramvai/tokens-server": "2.101.1",
+    "@tramvai/tokens-common": "2.103.1",
+    "@tramvai/tokens-render": "2.103.1",
+    "@tramvai/tokens-server": "2.103.1",
     "workbox-window": "^6.4.1"
   },
   "devDependencies": {},
   "peerDependencies": {
-    "@tramvai/cli": "2.101.1",
-    "@tramvai/core": "2.101.1",
+    "@tramvai/cli": "2.103.1",
+    "@tramvai/core": "2.103.1",
     "@tinkoff/dippy": "0.8.15",
     "tslib": "^2.4.0"
   }