@docusaurus/plugin-pwa 0.0.0-6080 → 0.0.0-6082

package/lib/index.js

@@ -10,13 +10,10 @@ exports.validateOptions = void 0;
 exports.default = pluginPWA;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
-const webpack_1 = tslib_1.__importDefault(require("webpack"));
-const webpackbar_1 = tslib_1.__importDefault(require("webpackbar"));
-const terser_webpack_plugin_1 = tslib_1.__importDefault(require("terser-webpack-plugin"));
+const bundler_1 = require("@docusaurus/bundler");
 const workbox_build_1 = require("workbox-build");
 const utils_1 = require("@docusaurus/utils");
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
-const utils_2 = require("@docusaurus/core/lib/webpack/utils");
 const theme_translations_1 = require("@docusaurus/theme-translations");
 const PluginName = 'docusaurus-plugin-pwa';
 function getSWBabelLoader() {
@@ -66,10 +63,10 @@ function pluginPWA(context, options) {
                 name: 'plugin-pwa',
             });
         },
-        configureWebpack(config) {
+        configureWebpack(config, isServer, { currentBundler }) {
             return {
                 plugins: [
-                    new webpack_1.default.EnvironmentPlugin(
+                    new currentBundler.instance.EnvironmentPlugin(
                     // See https://github.com/facebook/docusaurus/pull/10455#issuecomment-2317593528
                     // See https://github.com/webpack/webpack/commit/adf2a6b7c6077fd806ea0e378c1450cccecc9ed0#r145989788
                     // @ts-expect-error: bad Webpack type?
@@ -103,6 +100,9 @@ function pluginPWA(context, options) {
         },
         async postBuild(props) {
             const swSourceFileTest = /\.m?js$/;
+            const ProgressBarPlugin = await (0, bundler_1.getProgressBarPlugin)({
+                currentBundler: props.currentBundler,
+            });
             const swWebpackConfig = {
                 entry: require.resolve('./sw.js'),
                 output: {
@@ -119,18 +119,17 @@ function pluginPWA(context, options) {
                     // See https://developers.google.com/web/tools/workbox/guides/using-bundlers#webpack
                     minimizer: debug
                         ? []
-                        : [
-                            new terser_webpack_plugin_1.default({
-                                test: swSourceFileTest,
-                            }),
-                        ],
+                        : await (0, bundler_1.getMinimizers)({
+                            faster: props.siteConfig.future.experimental_faster,
+                            currentBundler: props.currentBundler,
+                        }),
                 },
                 plugins: [
-                    new webpack_1.default.EnvironmentPlugin({
+                    new props.currentBundler.instance.EnvironmentPlugin({
                         // Fallback value required with Webpack 5
                         PWA_SW_CUSTOM: swCustom ?? '',
                     }),
-                    new webpackbar_1.default({
+                    new ProgressBarPlugin({
                         name: 'Service Worker',
                         color: 'red',
                     }),
@@ -145,7 +144,10 @@ function pluginPWA(context, options) {
                     ],
                 },
             };
-            await (0, utils_2.compile)([swWebpackConfig]);
+            await (0, bundler_1.compile)({
+                configs: [swWebpackConfig],
+                currentBundler: props.currentBundler,
+            });
             const swDest = path_1.default.resolve(props.outDir, 'sw.js');
             await (0, workbox_build_1.injectManifest)({
                 ...injectManifestConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-pwa",
-  "version": "0.0.0-6080",
+  "version": "0.0.0-6082",
   "description": "Docusaurus Plugin to add PWA support.",
   "main": "lib/index.js",
   "types": "src/plugin-pwa.d.ts",
@@ -22,27 +22,26 @@
   "dependencies": {
     "@babel/core": "^7.23.3",
     "@babel/preset-env": "^7.23.3",
-    "@docusaurus/core": "0.0.0-6080",
-    "@docusaurus/logger": "0.0.0-6080",
-    "@docusaurus/theme-common": "0.0.0-6080",
-    "@docusaurus/theme-translations": "0.0.0-6080",
-    "@docusaurus/types": "0.0.0-6080",
-    "@docusaurus/utils": "0.0.0-6080",
-    "@docusaurus/utils-validation": "0.0.0-6080",
+    "@docusaurus/bundler": "0.0.0-6082",
+    "@docusaurus/core": "0.0.0-6082",
+    "@docusaurus/logger": "0.0.0-6082",
+    "@docusaurus/theme-common": "0.0.0-6082",
+    "@docusaurus/theme-translations": "0.0.0-6082",
+    "@docusaurus/types": "0.0.0-6082",
+    "@docusaurus/utils": "0.0.0-6082",
+    "@docusaurus/utils-validation": "0.0.0-6082",
     "babel-loader": "^9.1.3",
     "clsx": "^2.0.0",
     "core-js": "^3.31.1",
-    "terser-webpack-plugin": "^5.3.9",
     "tslib": "^2.6.0",
     "webpack": "^5.88.1",
     "webpack-merge": "^5.9.0",
-    "webpackbar": "^5.0.2",
     "workbox-build": "^7.0.0",
     "workbox-precaching": "^7.0.0",
     "workbox-window": "^7.0.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-6080",
+    "@docusaurus/module-type-aliases": "0.0.0-6082",
     "fs-extra": "^11.1.0"
   },
   "peerDependencies": {
@@ -52,5 +51,5 @@
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "dba90078262ca1eabcc4a46f10f7eed62b83b69b"
+  "gitHead": "bbf50dffd0ec70f522b74e73406e4d18037d77f2"
 }

package/src/index.ts

@@ -6,13 +6,15 @@
  */
 
 import path from 'path';
-import webpack, {type Configuration} from 'webpack';
-import WebpackBar from 'webpackbar';
-import Terser from 'terser-webpack-plugin';
+import {type Configuration} from 'webpack';
+import {
+  compile,
+  getProgressBarPlugin,
+  getMinimizers,
+} from '@docusaurus/bundler';
 import {injectManifest} from 'workbox-build';
 import {normalizeUrl} from '@docusaurus/utils';
 import logger from '@docusaurus/logger';
-import {compile} from '@docusaurus/core/lib/webpack/utils';
 import {readDefaultCodeTranslationMessages} from '@docusaurus/theme-translations';
 import type {HtmlTags, LoadContext, Plugin} from '@docusaurus/types';
 import type {PluginOptions} from '@docusaurus/plugin-pwa';
@@ -89,10 +91,10 @@ export default function pluginPWA(
       });
     },
 
-    configureWebpack(config) {
+    configureWebpack(config, isServer, {currentBundler}) {
       return {
         plugins: [
-          new webpack.EnvironmentPlugin(
+          new currentBundler.instance.EnvironmentPlugin(
             // See https://github.com/facebook/docusaurus/pull/10455#issuecomment-2317593528
             // See https://github.com/webpack/webpack/commit/adf2a6b7c6077fd806ea0e378c1450cccecc9ed0#r145989788
             // @ts-expect-error: bad Webpack type?
@@ -139,6 +141,10 @@ export default function pluginPWA(
     async postBuild(props) {
       const swSourceFileTest = /\.m?js$/;
 
+      const ProgressBarPlugin = await getProgressBarPlugin({
+        currentBundler: props.currentBundler,
+      });
+
       const swWebpackConfig: Configuration = {
         entry: require.resolve('./sw.js'),
         output: {
@@ -155,18 +161,17 @@ export default function pluginPWA(
           // See https://developers.google.com/web/tools/workbox/guides/using-bundlers#webpack
           minimizer: debug
             ? []
-            : [
-                new Terser({
-                  test: swSourceFileTest,
-                }),
-              ],
+            : await getMinimizers({
+                faster: props.siteConfig.future.experimental_faster,
+                currentBundler: props.currentBundler,
+              }),
         },
         plugins: [
-          new webpack.EnvironmentPlugin({
+          new props.currentBundler.instance.EnvironmentPlugin({
             // Fallback value required with Webpack 5
             PWA_SW_CUSTOM: swCustom ?? '',
           }),
-          new WebpackBar({
+          new ProgressBarPlugin({
             name: 'Service Worker',
             color: 'red',
           }),
@@ -182,7 +187,10 @@ export default function pluginPWA(
         },
       };
 
-      await compile([swWebpackConfig]);
+      await compile({
+        configs: [swWebpackConfig],
+        currentBundler: props.currentBundler,
+      });
 
       const swDest = path.resolve(props.outDir, 'sw.js');
 

package/src/deps.d.ts

@@ -1,15 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-// TODO incompatible declaration file: https://github.com/unjs/webpackbar/pull/108
-declare module 'webpackbar' {
-  import webpack from 'webpack';
-
-  export default class WebpackBarPlugin extends webpack.ProgressPlugin {
-    constructor(options: {name: string; color?: string});
-  }
-}