Fixed mkdirp error on Webpack 5

zenghj · Feb 18, 2021 · dbd9558 · dbd9558
1 parent 0af6806
commit dbd9558
Show file tree

Hide file tree

Showing 4 changed files with 10,333 additions and 41 deletions.
diff --git a/es5-autogenerated/index.js b/es5-autogenerated/index.js
@@ -3,6 +3,7 @@
 var path = require('path');
 var Prerenderer = require('@prerenderer/prerenderer');
 var PuppeteerRenderer = require('@prerenderer/renderer-puppeteer');
+var mkdirp = require("mkdirp");
 
 var _require = require('html-minifier'),
     minify = _require.minify;
@@ -67,9 +68,9 @@ PrerenderSPAPlugin.prototype.apply = function (compiler) {
   var compilerFS = compiler.outputFileSystem;
 
   // From https://github.com/ahmadnassri/mkdirp-promise/blob/master/lib/index.js
-  var mkdirp = function mkdirp(dir, opts) {
+  var mkdirpPromise = function mkdirpPromise(dir, opts) {
     return new Promise(function (resolve, reject) {
-      compilerFS.mkdirp(dir, opts, function (err, made) {
+      mkdirp(dir, opts, function (err, made) {
         return err === null ? resolve(made) : reject(err);
       });
     });
@@ -130,7 +131,7 @@ PrerenderSPAPlugin.prototype.apply = function (compiler) {
     // Create dirs and write prerendered files.
     .then(function (processedRoutes) {
       var promises = Promise.all(processedRoutes.map(function (processedRoute) {
-        return mkdirp(path.dirname(processedRoute.outputPath)).then(function () {
+        return mkdirpPromise(path.dirname(processedRoute.outputPath)).then(function () {
           return new Promise(function (resolve, reject) {
             compilerFS.writeFile(processedRoute.outputPath, processedRoute.html.trim(), function (err) {
               if (err) reject(`[prerender-spa-plugin] Unable to write rendered route to file "${processedRoute.outputPath}" \n ${err}.`);else resolve();

diff --git a/es6/index.js b/es6/index.js
@@ -1,6 +1,7 @@
 const path = require('path')
 const Prerenderer = require('@prerenderer/prerenderer')
 const PuppeteerRenderer = require('@prerenderer/renderer-puppeteer')
+const mkdirp = require("mkdirp")
 const { minify } = require('html-minifier')
 
 function PrerenderSPAPlugin (...args) {
@@ -55,9 +56,9 @@ PrerenderSPAPlugin.prototype.apply = function (compiler) {
   const compilerFS = compiler.outputFileSystem
 
   // From https://github.com/ahmadnassri/mkdirp-promise/blob/master/lib/index.js
-  const mkdirp = function (dir, opts) {
+  const mkdirpPromise = function (dir, opts) {
     return new Promise((resolve, reject) => {
-      compilerFS.mkdirp(dir, opts, (err, made) => err === null ? resolve(made) : reject(err))
+      mkdirp(dir, opts, (err, made) => err === null ? resolve(made) : reject(err))
     })
   }
 
@@ -116,7 +117,7 @@ PrerenderSPAPlugin.prototype.apply = function (compiler) {
       // Create dirs and write prerendered files.
       .then(processedRoutes => {
         const promises = Promise.all(processedRoutes.map(processedRoute => {
-          return mkdirp(path.dirname(processedRoute.outputPath))
+          return mkdirpPromise(path.dirname(processedRoute.outputPath))
             .then(() => {
               return new Promise((resolve, reject) => {
                 compilerFS.writeFile(processedRoute.outputPath, processedRoute.html.trim(), err => {