@tramvai/module-progressive-web-app 4.1.0 → 4.2.0

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_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_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/shared/providers.d.ts

@@ -6,12 +6,36 @@ export declare const validateRelativeUrlProvider: import("@tramvai/core").Provid
     __type?: "multi token" | undefined;
 }>;
 export declare const registerWebManifestProvider: import("@tramvai/core").Provider<{
-    resourcesRegistry: import("@tramvai/tokens-render").ResourcesRegistry & {
+    manifestUrl: string & {
         __type?: "base token" | undefined;
     };
-    manifestUrl: string & {
+    di: import("@tinkoff/dippy").Container & {
         __type?: "base token" | undefined;
     };
+    manifestCommandLine: {
+        token: ("init" & {
+            __type?: "base token" | undefined;
+        }) | ("listen" & {
+            __type?: "base token" | undefined;
+        }) | ("customerStart" & {
+            __type?: "base token" | undefined;
+        }) | ("resolveUserDeps" & {
+            __type?: "base token" | undefined;
+        }) | ("resolvePageDeps" & {
+            __type?: "base token" | undefined;
+        }) | ("generatePage" & {
+            __type?: "base token" | undefined;
+        }) | ("clear" & {
+            __type?: "base token" | undefined;
+        }) | ("spaTransition" & {
+            __type?: "base token" | undefined;
+        }) | ("afterSpaTransition" & {
+            __type?: "base token" | undefined;
+        }) | ("close" & {
+            __type?: "base token" | undefined;
+        });
+        optional: boolean;
+    };
 }, import("@tramvai/core").Command & {
     __type?: "multi token" | undefined;
 }>;

package/lib/manifest/shared/providers.es.js

@@ -1,6 +1,6 @@
-import { provide, commandLineListTokens } from '@tramvai/core';
+import { provide, commandLineListTokens, DI_TOKEN } from '@tramvai/core';
 import { ResourceType, ResourceSlot, RESOURCES_REGISTRY } from '@tramvai/tokens-render';
-import { PWA_MANIFEST_URL_TOKEN } from '../../tokens.es.js';
+import { PWA_MANIFEST_URL_TOKEN, PWA_MANIFEST_INIT_COMMAND_LINE } from '../../tokens.es.js';
 
 const validateRelativeUrl = (url) => {
     if (!url.startsWith('/')) {
@@ -20,18 +20,29 @@ const validateRelativeUrlProvider = provide({
     },
 });
 const registerWebManifestProvider = provide({
-    provide: commandLineListTokens.customerStart,
-    useFactory: ({ resourcesRegistry, manifestUrl }) => async function registerWebManifest() {
-        resourcesRegistry.register({
-            type: ResourceType.asIs,
-            slot: ResourceSlot.HEAD_META,
-            // @todo what about crossorigin, maybe optional?
-            payload: `<link rel="manifest" href="${manifestUrl}">`,
+    provide: commandLineListTokens.init,
+    useFactory: ({ manifestCommandLine, manifestUrl, di }) => function registerWebManifestCommandLine() {
+        di.register({
+            provide: manifestCommandLine
+                ? commandLineListTokens[manifestCommandLine]
+                : commandLineListTokens.customerStart,
+            useFactory: ({ resourcesRegistry }) => function registerWebManifestAsResource() {
+                resourcesRegistry.register({
+                    type: ResourceType.asIs,
+                    slot: ResourceSlot.HEAD_META,
+                    // @todo what about crossorigin, maybe optional?
+                    payload: `<link rel="manifest" href="${manifestUrl}">`,
+                });
+            },
+            deps: {
+                resourcesRegistry: RESOURCES_REGISTRY,
+            },
         });
     },
     deps: {
-        resourcesRegistry: RESOURCES_REGISTRY,
         manifestUrl: PWA_MANIFEST_URL_TOKEN,
+        di: DI_TOKEN,
+        manifestCommandLine: { token: PWA_MANIFEST_INIT_COMMAND_LINE, optional: true },
     },
 });
 

package/lib/manifest/shared/providers.js

@@ -24,18 +24,29 @@ const validateRelativeUrlProvider = core.provide({
     },
 });
 const registerWebManifestProvider = core.provide({
-    provide: core.commandLineListTokens.customerStart,
-    useFactory: ({ resourcesRegistry, manifestUrl }) => async function registerWebManifest() {
-        resourcesRegistry.register({
-            type: tokensRender.ResourceType.asIs,
-            slot: tokensRender.ResourceSlot.HEAD_META,
-            // @todo what about crossorigin, maybe optional?
-            payload: `<link rel="manifest" href="${manifestUrl}">`,
+    provide: core.commandLineListTokens.init,
+    useFactory: ({ manifestCommandLine, manifestUrl, di }) => function registerWebManifestCommandLine() {
+        di.register({
+            provide: manifestCommandLine
+                ? core.commandLineListTokens[manifestCommandLine]
+                : core.commandLineListTokens.customerStart,
+            useFactory: ({ resourcesRegistry }) => function registerWebManifestAsResource() {
+                resourcesRegistry.register({
+                    type: tokensRender.ResourceType.asIs,
+                    slot: tokensRender.ResourceSlot.HEAD_META,
+                    // @todo what about crossorigin, maybe optional?
+                    payload: `<link rel="manifest" href="${manifestUrl}">`,
+                });
+            },
+            deps: {
+                resourcesRegistry: tokensRender.RESOURCES_REGISTRY,
+            },
         });
     },
     deps: {
-        resourcesRegistry: tokensRender.RESOURCES_REGISTRY,
         manifestUrl: tokens.PWA_MANIFEST_URL_TOKEN,
+        di: core.DI_TOKEN,
+        manifestCommandLine: { token: tokens.PWA_MANIFEST_INIT_COMMAND_LINE, optional: true },
     },
 });
 

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_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_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

@@ -21,6 +21,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_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

@@ -26,5 +26,9 @@ const PWA_MANIFEST_URL_TOKEN = createToken('pwa manifest url');
  * @description Token to owerwrite default - `pwa.meta` (meta tags will be added to all pages)
  */
 const PWA_META_TOKEN = createToken('pwa meta');
+/**
+ * @description Token to overwrite default manifest init behaviour on customerStart
+ */
+const PWA_MANIFEST_INIT_COMMAND_LINE = createToken('pwa manifest init command line');
 
-export { 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_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

@@ -25,6 +25,9 @@ export declare const PWA_SW_SCOPE_TOKEN: string & {
  * @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;
 };
 /**
@@ -39,4 +42,28 @@ export declare const PWA_MANIFEST_URL_TOKEN: string & {
 export declare const PWA_META_TOKEN: PwaMetaOptions & {
     __type?: "base token" | undefined;
 };
+/**
+ * @description Token to overwrite default manifest init behaviour on customerStart
+ */
+export declare const PWA_MANIFEST_INIT_COMMAND_LINE: ("init" & {
+    __type?: "base token" | undefined;
+}) | ("listen" & {
+    __type?: "base token" | undefined;
+}) | ("customerStart" & {
+    __type?: "base token" | undefined;
+}) | ("resolveUserDeps" & {
+    __type?: "base token" | undefined;
+}) | ("resolvePageDeps" & {
+    __type?: "base token" | undefined;
+}) | ("generatePage" & {
+    __type?: "base token" | undefined;
+}) | ("clear" & {
+    __type?: "base token" | undefined;
+}) | ("spaTransition" & {
+    __type?: "base token" | undefined;
+}) | ("afterSpaTransition" & {
+    __type?: "base token" | undefined;
+}) | ("close" & {
+    __type?: "base token" | undefined;
+});
 //# sourceMappingURL=tokens.d.ts.map

package/lib/tokens.es.js

@@ -26,5 +26,9 @@ const PWA_MANIFEST_URL_TOKEN = createToken('pwa manifest url');
  * @description Token to owerwrite default - `pwa.meta` (meta tags will be added to all pages)
  */
 const PWA_META_TOKEN = createToken('pwa meta');
+/**
+ * @description Token to overwrite default manifest init behaviour on customerStart
+ */
+const PWA_MANIFEST_INIT_COMMAND_LINE = createToken('pwa manifest init command line');
 
-export { 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_URL_TOKEN, PWA_META_TOKEN, PWA_SW_PARAMS_TOKEN, PWA_SW_SCOPE_TOKEN, PWA_SW_URL_TOKEN, PWA_WORKBOX_TOKEN };

package/lib/tokens.js

@@ -30,7 +30,12 @@ const PWA_MANIFEST_URL_TOKEN = dippy.createToken('pwa manifest url');
  * @description Token to owerwrite default - `pwa.meta` (meta tags will be added to all pages)
  */
 const PWA_META_TOKEN = dippy.createToken('pwa meta');
+/**
+ * @description Token to overwrite default manifest init behaviour on customerStart
+ */
+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_URL_TOKEN = PWA_MANIFEST_URL_TOKEN;
 exports.PWA_META_TOKEN = PWA_META_TOKEN;
 exports.PWA_SW_PARAMS_TOKEN = PWA_SW_PARAMS_TOKEN;

package/package.json

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