@docusaurus/plugin-pwa 0.0.0-5044 → 0.0.0-5049

package/lib/index.js

@@ -74,7 +74,7 @@ function pluginPWA(context, options) {
         },
         injectHtmlTags() {
             const headTags = [];
-            if (isProd && pwaHead) {
+            if (isProd) {
                 pwaHead.forEach(({ tagName, ...attributes }) => {
                     ['href', 'content'].forEach((attribute) => {
                         const attributeValue = attributes[attribute];
@@ -124,7 +124,7 @@ function pluginPWA(context, options) {
                 plugins: [
                     new webpack_1.default.EnvironmentPlugin({
                         // Fallback value required with Webpack 5
-                        PWA_SW_CUSTOM: swCustom || '',
+                        PWA_SW_CUSTOM: swCustom ?? '',
                     }),
                     new LogPlugin_1.default({
                         name: 'Service Worker',

package/lib/options.js

@@ -21,7 +21,7 @@ const DEFAULT_OPTIONS = {
     swRegister: './registerSw.js',
     reloadPopup: '@theme/PwaReloadPopup',
 };
-const Schema = utils_validation_1.Joi.object({
+const optionsSchema = utils_validation_1.Joi.object({
     debug: utils_validation_1.Joi.bool().default(DEFAULT_OPTIONS.debug),
     offlineModeActivationStrategies: utils_validation_1.Joi.array()
         .items(utils_validation_1.Joi.string()
@@ -41,6 +41,6 @@ const Schema = utils_validation_1.Joi.object({
         .default(DEFAULT_OPTIONS.reloadPopup),
 });
 function validateOptions({ validate, options, }) {
-    return validate(Schema, options);
+    return validate(optionsSchema, options);
 }
 exports.validateOptions = validateOptions;

package/lib/registerSw.d.ts

@@ -9,7 +9,7 @@ declare global {
         getInstalledRelatedApps: () => Promise<{
             platform: string;
         }[]>;
-        connection: {
+        connection?: {
             effectiveType: string;
             saveData: boolean;
         };

package/lib/registerSw.js

@@ -22,7 +22,7 @@ async function clearRegistrations() {
         console.log(`[Docusaurus-PWA][registerSw]: will unregister all service worker registrations`, registrations);
     }
     await Promise.all(registrations.map(async (registration) => {
-        const result = await registration?.unregister();
+        const result = await registration.unregister();
         if (debug) {
             console.log(`[Docusaurus-PWA][registerSw]: unregister() service worker registration`, registrations, result);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-pwa",
-  "version": "0.0.0-5044",
+  "version": "0.0.0-5049",
   "description": "Docusaurus Plugin to add PWA support.",
   "main": "lib/index.js",
   "types": "src/plugin-pwa.d.ts",
@@ -22,11 +22,11 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/preset-env": "^7.18.0",
-    "@docusaurus/core": "0.0.0-5044",
-    "@docusaurus/theme-common": "0.0.0-5044",
-    "@docusaurus/theme-translations": "0.0.0-5044",
-    "@docusaurus/utils": "0.0.0-5044",
-    "@docusaurus/utils-validation": "0.0.0-5044",
+    "@docusaurus/core": "0.0.0-5049",
+    "@docusaurus/theme-common": "0.0.0-5049",
+    "@docusaurus/theme-translations": "0.0.0-5049",
+    "@docusaurus/utils": "0.0.0-5049",
+    "@docusaurus/utils-validation": "0.0.0-5049",
     "babel-loader": "^8.2.5",
     "clsx": "^1.1.1",
     "core-js": "^3.22.5",
@@ -39,12 +39,12 @@
     "workbox-window": "^6.5.3"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-5044",
+    "@docusaurus/module-type-aliases": "0.0.0-5049",
     "fs-extra": "^10.1.0"
   },
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
     "react-dom": "^16.8.4 || ^17.0.0"
   },
-  "gitHead": "9ffd6ca265dc2af7ed5b96daf5ebf32708e899cf"
+  "gitHead": "527b2a01c46b67483327a1a6873fccf81bc19e2c"
 }

package/src/index.ts

@@ -89,7 +89,7 @@ export default function pluginPWA(
           new webpack.EnvironmentPlugin({
             PWA_DEBUG: debug,
             PWA_SERVICE_WORKER_URL: path.posix.resolve(
-              `${config.output?.publicPath || '/'}`,
+              `${(config.output?.publicPath as string) || '/'}`,
               'sw.js',
             ),
             PWA_OFFLINE_MODE_ACTIVATION_STRATEGIES:
@@ -102,7 +102,7 @@ export default function pluginPWA(
 
     injectHtmlTags() {
       const headTags: HtmlTags = [];
-      if (isProd && pwaHead) {
+      if (isProd) {
         pwaHead.forEach(({tagName, ...attributes}) => {
           (['href', 'content'] as const).forEach((attribute) => {
             const attributeValue = attributes[attribute];
@@ -160,7 +160,7 @@ export default function pluginPWA(
         plugins: [
           new webpack.EnvironmentPlugin({
             // Fallback value required with Webpack 5
-            PWA_SW_CUSTOM: swCustom || '',
+            PWA_SW_CUSTOM: swCustom ?? '',
           }),
           new LogPlugin({
             name: 'Service Worker',
@@ -189,7 +189,7 @@ export default function pluginPWA(
           '**/*.{png,jpg,jpeg,gif,svg,ico}',
           '**/*.{woff,woff2,eot,ttf,otf}',
           // @ts-expect-error: internal API?
-          ...(injectManifest.globPatterns ?? []),
+          ...((injectManifest.globPatterns as string[] | undefined) ?? []),
         ],
         // Those attributes are not overrideable
         swDest,

package/src/options.ts

@@ -23,7 +23,7 @@ const DEFAULT_OPTIONS = {
   reloadPopup: '@theme/PwaReloadPopup',
 };
 
-const Schema = Joi.object({
+const optionsSchema = Joi.object<PluginOptions>({
   debug: Joi.bool().default(DEFAULT_OPTIONS.debug),
   offlineModeActivationStrategies: Joi.array()
     .items(
@@ -58,5 +58,5 @@ export function validateOptions({
   validate,
   options,
 }: OptionValidationContext<PluginOptions, PluginOptions>): PluginOptions {
-  return validate(Schema, options);
+  return validate(optionsSchema, options);
 }

package/src/registerSw.ts

@@ -9,7 +9,7 @@ import {createStorageSlot} from '@docusaurus/theme-common';
 
 // First: read the env variables (provided by Webpack)
 /* eslint-disable prefer-destructuring */
-const PWA_SERVICE_WORKER_URL = process.env.PWA_SERVICE_WORKER_URL;
+const PWA_SERVICE_WORKER_URL = process.env.PWA_SERVICE_WORKER_URL!;
 const PWA_RELOAD_POPUP = process.env.PWA_RELOAD_POPUP;
 const PWA_OFFLINE_MODE_ACTIVATION_STRATEGIES = process.env
   .PWA_OFFLINE_MODE_ACTIVATION_STRATEGIES as unknown as (keyof typeof OfflineModeActivationStrategiesImplementations)[];
@@ -34,7 +34,7 @@ async function clearRegistrations() {
   }
   await Promise.all(
     registrations.map(async (registration) => {
-      const result = await registration?.unregister();
+      const result = await registration.unregister();
       if (debug) {
         console.log(
           `[Docusaurus-PWA][registerSw]: unregister() service worker registration`,
@@ -69,7 +69,7 @@ async function isAppInstalledEventFired() {
 declare global {
   interface Navigator {
     getInstalledRelatedApps: () => Promise<{platform: string}[]>;
-    connection: {effectiveType: string; saveData: boolean};
+    connection?: {effectiveType: string; saveData: boolean};
   }
 }