weboptimizer 2.0.1271 → 2.0.1272

package/declarations.d.ts

@@ -14,6 +14,10 @@ interface PostcssTransformer {
 
 /** @module declarations */
 declare module 'babel-preset-minify'
+declare module 'glob-all' {
+    export default function(globs:Array<string>):Promise<Array<string>>
+    export function sync(globs:Array<string>):Array<string>
+}
 declare module 'html-loader'
 declare module 'postcss-fontpath' {
     export default function(options:Partial<{

package/index.js

@@ -32,6 +32,7 @@ var _child_process = require("child_process");
 var _clientnode = _interopRequireWildcard(require("clientnode"));
 var _fs = require("fs");
 var _promises = require("fs/promises");
+var _globAll = require("glob-all");
 var _path = _interopRequireWildcard(require("path"));
 var _rimraf = _interopRequireWildcard(require("rimraf"));
 var _configurator = require("./configurator");
@@ -64,7 +65,7 @@ var main = function main(context) {
     var webOptimizerPath = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : __dirname;
     var environment = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : eval('process.env');
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-      var configuration, clear, processOptions, childProcessOptions, childProcesses, processPromises, possibleArguments, closeEventHandlers, dynamicConfiguration, count, filePath, additionalArguments, _iterator, _step, file, _iterator2, _step2, _filePath, _iterator3, _step3, filePathPattern, buildConfigurations, tidiedUp, tidyUp, testModuleFilePaths, _iterator9, _step9, buildConfiguration, expression, _iterator10, _step10, _loop, handleTask, finished, closeHandler, _iterator13, _step13, closeEventName;
+      var configuration, clear, processOptions, childProcessOptions, childProcesses, processPromises, possibleArguments, closeEventHandlers, dynamicConfiguration, count, filePath, additionalArguments, _iterator, _step, file, _iterator2, _step2, _filePath, buildConfigurations, tidiedUp, tidyUp, testModuleFilePaths, _iterator7, _step7, buildConfiguration, expression, _iterator8, _step8, _loop, handleTask, finished, closeHandler, _iterator11, _step11, closeEventName;
       return _regenerator["default"].wrap(function _callee2$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -85,7 +86,7 @@ var main = function main(context) {
             possibleArguments = ['build', 'build:types', 'clear', 'document', 'lint', 'preinstall', 'serve', 'test', 'test:browser', 'test:coverage', 'test:coverage:report', 'check:types'];
             closeEventHandlers = [];
             if (!(configuration.givenCommandLineArguments.length > 2)) {
-              _context3.next = 118;
+              _context3.next = 117;
               break;
             }
             // region temporary save dynamically given configurations
@@ -136,7 +137,7 @@ var main = function main(context) {
                 during pre-install phase.
             */
             if (!(!['build', 'build:types', 'preinstall', 'serve', 'test', 'test:browser', 'test:coverage', 'test:coverage:report'].includes(configuration.givenCommandLineArguments[2]) && possibleArguments.includes(configuration.givenCommandLineArguments[2]))) {
-              _context3.next = 67;
+              _context3.next = 66;
               break;
             }
             if (!((0, _path.resolve)(configuration.path.target.base) === (0, _path.resolve)(configuration.path.context))) {
@@ -176,13 +177,7 @@ var main = function main(context) {
                         break;
                       }
                       _context.next = 9;
-                      return new Promise(function (resolve, reject) {
-                        return (0, _rimraf["default"])(file.path, {
-                          glob: false
-                        }, function (error) {
-                          return error ? reject(error) : resolve();
-                        });
-                      });
+                      return (0, _rimraf["default"])(file.path);
                     case 9:
                       return _context.abrupt("return", false);
                     case 10:
@@ -245,13 +240,7 @@ var main = function main(context) {
             break;
           case 56:
             _context3.next = 58;
-            return new Promise(function (resolve, reject) {
-              return (0, _rimraf["default"])(configuration.path.target.base, {
-                glob: false
-              }, function (error) {
-                return error ? reject(error) : resolve();
-              });
-            });
+            return (0, _rimraf["default"])(configuration.path.target.base);
           case 58:
             _context3.next = 60;
             return _clientnode["default"].isDirectory(configuration.path.apiDocumentation);
@@ -261,13 +250,7 @@ var main = function main(context) {
               break;
             }
             _context3.next = 63;
-            return new Promise(function (resolve, reject) {
-              return (0, _rimraf["default"])(configuration.path.apiDocumentation, {
-                glob: false
-              }, function (error) {
-                return error ? reject(error) : resolve();
-              });
-            });
+            return (0, _rimraf["default"])(configuration.path.apiDocumentation);
           case 63:
             _iterator2 = _createForOfIteratorHelper(configuration.path.tidyUpOnClear);
             try {
@@ -275,27 +258,15 @@ var main = function main(context) {
                 _filePath = _step2.value;
                 if (_filePath) if (_clientnode["default"].isFileSync(_filePath))
                   // NOTE: Close handler have to be synchronous.
-                  (0, _fs.unlinkSync)(_filePath);else if (_clientnode["default"].isDirectorySync(_filePath)) (0, _rimraf.sync)(_filePath, {
-                  glob: false
-                });
+                  (0, _fs.unlinkSync)(_filePath);else if (_clientnode["default"].isDirectorySync(_filePath)) (0, _rimraf.sync)(_filePath);
               }
             } catch (err) {
               _iterator2.e(err);
             } finally {
               _iterator2.f();
             }
-            _iterator3 = _createForOfIteratorHelper(configuration.path.tidyUpOnClearGlobs.pattern);
-            try {
-              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-                filePathPattern = _step3.value;
-                if (filePathPattern) (0, _rimraf.sync)(filePathPattern, configuration.path.tidyUpOnClearGlobs.options);
-              }
-            } catch (err) {
-              _iterator3.e(err);
-            } finally {
-              _iterator3.f();
-            }
-          case 67:
+            (0, _rimraf.sync)((0, _globAll.sync)(configuration.path.tidyUpOnClearGlobs));
+          case 66:
             // endregion
             // region handle build
             buildConfigurations = _helper["default"].resolveBuildConfigurationFilePaths(configuration.buildContext.types, configuration.path.source.asset.base, configuration.path.ignore.concat(configuration.module.directoryNames, configuration.loader.directoryNames).map(function (filePath) {
@@ -304,7 +275,7 @@ var main = function main(context) {
               return !configuration.path.context.startsWith(filePath);
             }), configuration["package"].main.fileNames);
             if (!['build', 'document', 'test', 'test:coverage', 'test:coverage:report'].includes(commandLineArguments[2])) {
-              _context3.next = 75;
+              _context3.next = 74;
               break;
             }
             tidiedUp = false;
@@ -319,11 +290,11 @@ var main = function main(context) {
                 var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
                   chunkName = _Object$entries$_i[0],
                   chunk = _Object$entries$_i[1];
-                var _iterator4 = _createForOfIteratorHelper(chunk),
-                  _step4;
+                var _iterator3 = _createForOfIteratorHelper(chunk),
+                  _step3;
                 try {
-                  for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-                    var moduleID = _step4.value;
+                  for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                    var moduleID = _step3.value;
                     var _filePath2 = _helper["default"].determineModuleFilePath(moduleID, configuration.module.aliases, configuration.module.replacements.normal, {
                       file: configuration.extensions.file.internal
                     }, configuration.path.context, configuration.path.source.asset.base, configuration.path.ignore, configuration.module.directoryNames, configuration["package"].main.fileNames, configuration["package"].main.propertyNames, configuration["package"].aliasPropertyNames, configuration.encoding);
@@ -341,39 +312,26 @@ var main = function main(context) {
                     }
                   }
                 } catch (err) {
-                  _iterator4.e(err);
+                  _iterator3.e(err);
                 } finally {
-                  _iterator4.f();
+                  _iterator3.f();
                 }
               }
-              var _iterator5 = _createForOfIteratorHelper(configuration.path.tidyUp),
-                _step5;
+              var _iterator4 = _createForOfIteratorHelper(configuration.path.tidyUp),
+                _step4;
               try {
-                for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-                  var _filePath4 = _step5.value;
+                for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                  var _filePath4 = _step4.value;
                   if (_filePath4) if (_clientnode["default"].isFileSync(_filePath4))
                     // NOTE: Close handler have to be synchronous.
-                    (0, _fs.unlinkSync)(_filePath4);else if (_clientnode["default"].isDirectorySync(_filePath4)) (0, _rimraf.sync)(_filePath4, {
-                    glob: false
-                  });
-                }
-              } catch (err) {
-                _iterator5.e(err);
-              } finally {
-                _iterator5.f();
-              }
-              var _iterator6 = _createForOfIteratorHelper(configuration.path.tidyUpGlobs.pattern),
-                _step6;
-              try {
-                for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-                  var _filePathPattern = _step6.value;
-                  if (_filePathPattern) (0, _rimraf.sync)(_filePathPattern, configuration.path.tidyUpOnClearGlobs.options);
+                    (0, _fs.unlinkSync)(_filePath4);else if (_clientnode["default"].isDirectorySync(_filePath4)) (0, _rimraf.sync)(_filePath4);
                 }
               } catch (err) {
-                _iterator6.e(err);
+                _iterator4.e(err);
               } finally {
-                _iterator6.f();
+                _iterator4.f();
               }
+              (0, _rimraf.sync)((0, _globAll.sync)(configuration.path.tidyUpGlobs));
             };
             closeEventHandlers.push(tidyUp);
 
@@ -392,52 +350,50 @@ var main = function main(context) {
               childProcessOptions.env.PATH += ":".concat(webOptimizerPath, "/node_modules/.bin");
               var childProcess = (0, _child_process.spawn)(configuration.commandLine.build.command, commandLineArguments, childProcessOptions);
               var copyAdditionalFilesAndTidyUp = function copyAdditionalFilesAndTidyUp() {
-                var _iterator7 = _createForOfIteratorHelper(configuration.files.additionalPaths),
-                  _step7;
+                var _iterator5 = _createForOfIteratorHelper(configuration.files.additionalPaths),
+                  _step5;
                 try {
-                  for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-                    var _filePath5 = _step7.value;
+                  for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                    var _filePath5 = _step5.value;
                     var sourcePath = (0, _path.join)(configuration.path.source.base, _filePath5);
                     var targetPath = (0, _path.join)(configuration.path.target.base, _filePath5);
 
                     // NOTE: Close handler have to be synchronous.
                     if (_clientnode["default"].isDirectorySync(sourcePath)) {
-                      if (_clientnode["default"].isDirectorySync(targetPath)) (0, _rimraf.sync)(targetPath, {
-                        glob: false
-                      });
+                      if (_clientnode["default"].isDirectorySync(targetPath)) (0, _rimraf.sync)(targetPath);
                       _clientnode["default"].copyDirectoryRecursiveSync(sourcePath, targetPath);
                     } else if (_clientnode["default"].isFileSync(sourcePath)) _clientnode["default"].copyFileSync(sourcePath, targetPath);
                   }
                 } catch (err) {
-                  _iterator7.e(err);
+                  _iterator5.e(err);
                 } finally {
-                  _iterator7.f();
+                  _iterator5.f();
                 }
                 tidyUp();
               };
               var closeHandler = _clientnode["default"].getProcessCloseHandler(resolve, reject, null, commandLineArguments[2] === 'build' ? copyAdditionalFilesAndTidyUp : tidyUp);
-              var _iterator8 = _createForOfIteratorHelper(_clientnode.CloseEventNames),
-                _step8;
+              var _iterator6 = _createForOfIteratorHelper(_clientnode.CloseEventNames),
+                _step6;
               try {
-                for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-                  var closeEventName = _step8.value;
+                for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+                  var closeEventName = _step6.value;
                   childProcess.on(closeEventName, closeHandler);
                 }
               } catch (err) {
-                _iterator8.e(err);
+                _iterator6.e(err);
               } finally {
-                _iterator8.f();
+                _iterator6.f();
               }
               childProcesses.push(childProcess);
               return childProcesses;
             }));
             // endregion
             // region handle pre-install
-            _context3.next = 110;
+            _context3.next = 109;
             break;
-          case 75:
+          case 74:
             if (!(configuration.library && configuration.givenCommandLineArguments[2] === 'preinstall')) {
-              _context3.next = 110;
+              _context3.next = 109;
               break;
             }
             // Perform all file specific preprocessing stuff.
@@ -445,24 +401,24 @@ var main = function main(context) {
             if (_clientnode["default"].isPlainObject(configuration['test:browser'].injection) && configuration['test:browser'].injection.entry) testModuleFilePaths = _helper["default"].determineModuleLocations(configuration['test:browser'].injection.entry, configuration.module.aliases, configuration.module.replacements.normal, {
               file: configuration.extensions.file.internal
             }, configuration.path.context, configuration.path.source.asset.base, configuration.path.ignore).filePaths;
-            _iterator9 = _createForOfIteratorHelper(buildConfigurations);
-            _context3.prev = 79;
-            _iterator9.s();
-          case 81:
-            if ((_step9 = _iterator9.n()).done) {
-              _context3.next = 102;
+            _iterator7 = _createForOfIteratorHelper(buildConfigurations);
+            _context3.prev = 78;
+            _iterator7.s();
+          case 80:
+            if ((_step7 = _iterator7.n()).done) {
+              _context3.next = 101;
               break;
             }
-            buildConfiguration = _step9.value;
+            buildConfiguration = _step7.value;
             expression = buildConfiguration[configuration.givenCommandLineArguments[2]].trim();
-            _iterator10 = _createForOfIteratorHelper(buildConfiguration.filePaths);
-            _context3.prev = 85;
+            _iterator8 = _createForOfIteratorHelper(buildConfiguration.filePaths);
+            _context3.prev = 84;
             _loop = /*#__PURE__*/_regenerator["default"].mark(function _loop() {
               var filePath, evaluated;
               return _regenerator["default"].wrap(function _loop$(_context2) {
                 while (1) switch (_context2.prev = _context2.next) {
                   case 0:
-                    filePath = _step10.value;
+                    filePath = _step8.value;
                     if (testModuleFilePaths.includes(filePath)) {
                       _context2.next = 7;
                       break;
@@ -498,51 +454,51 @@ var main = function main(context) {
                 }
               }, _loop);
             });
-            _iterator10.s();
-          case 88:
-            if ((_step10 = _iterator10.n()).done) {
-              _context3.next = 92;
+            _iterator8.s();
+          case 87:
+            if ((_step8 = _iterator8.n()).done) {
+              _context3.next = 91;
               break;
             }
-            return _context3.delegateYield(_loop(), "t3", 90);
-          case 90:
-            _context3.next = 88;
+            return _context3.delegateYield(_loop(), "t3", 89);
+          case 89:
+            _context3.next = 87;
             break;
-          case 92:
-            _context3.next = 97;
+          case 91:
+            _context3.next = 96;
             break;
-          case 94:
-            _context3.prev = 94;
-            _context3.t4 = _context3["catch"](85);
-            _iterator10.e(_context3.t4);
-          case 97:
-            _context3.prev = 97;
-            _iterator10.f();
-            return _context3.finish(97);
-          case 100:
-            _context3.next = 81;
+          case 93:
+            _context3.prev = 93;
+            _context3.t4 = _context3["catch"](84);
+            _iterator8.e(_context3.t4);
+          case 96:
+            _context3.prev = 96;
+            _iterator8.f();
+            return _context3.finish(96);
+          case 99:
+            _context3.next = 80;
             break;
-          case 102:
-            _context3.next = 107;
+          case 101:
+            _context3.next = 106;
             break;
-          case 104:
-            _context3.prev = 104;
-            _context3.t5 = _context3["catch"](79);
-            _iterator9.e(_context3.t5);
-          case 107:
-            _context3.prev = 107;
-            _iterator9.f();
-            return _context3.finish(107);
-          case 110:
+          case 103:
+            _context3.prev = 103;
+            _context3.t5 = _context3["catch"](78);
+            _iterator7.e(_context3.t5);
+          case 106:
+            _context3.prev = 106;
+            _iterator7.f();
+            return _context3.finish(106);
+          case 109:
             // endregion
             // region handle remaining tasks
             handleTask = function handleTask(type) {
               var tasks = Array.isArray(configuration.commandLine[type]) ? configuration.commandLine[type] : [configuration.commandLine[type]];
-              var _iterator11 = _createForOfIteratorHelper(tasks),
-                _step11;
+              var _iterator9 = _createForOfIteratorHelper(tasks),
+                _step9;
               try {
                 var _loop2 = function _loop2() {
-                  var task = _step11.value;
+                  var task = _step9.value;
                   var evaluated = _clientnode["default"].stringEvaluate(Object.prototype.hasOwnProperty.call(task, 'indicator') ? task.indicator : 'true', {
                     global: global,
                     self: configuration,
@@ -554,44 +510,44 @@ var main = function main(context) {
                     console.info('Running "' + ("".concat(task.command, " ") + commandLineArguments.join(' ')).trim() + '"');
                     var childProcess = (0, _child_process.spawn)(task.command, commandLineArguments, childProcessOptions);
                     var closeHandler = _clientnode["default"].getProcessCloseHandler(resolve, reject);
-                    var _iterator12 = _createForOfIteratorHelper(_clientnode.CloseEventNames),
-                      _step12;
+                    var _iterator10 = _createForOfIteratorHelper(_clientnode.CloseEventNames),
+                      _step10;
                     try {
-                      for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-                        var closeEventName = _step12.value;
+                      for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+                        var closeEventName = _step10.value;
                         childProcess.on(closeEventName, closeHandler);
                       }
                     } catch (err) {
-                      _iterator12.e(err);
+                      _iterator10.e(err);
                     } finally {
-                      _iterator12.f();
+                      _iterator10.f();
                     }
                     childProcesses.push(childProcess);
                     return childProcesses;
                   }));
                 };
-                for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+                for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
                   _loop2();
                 }
               } catch (err) {
-                _iterator11.e(err);
+                _iterator9.e(err);
               } finally {
-                _iterator11.f();
+                _iterator9.f();
               }
             }; /// region a-/synchronous
             if (!['document', 'test', 'test:coverage', 'test:coverage:report'].includes(configuration.givenCommandLineArguments[2])) {
-              _context3.next = 117;
+              _context3.next = 116;
               break;
             }
-            _context3.next = 114;
+            _context3.next = 113;
             return Promise.all(processPromises);
-          case 114:
+          case 113:
             handleTask(configuration.givenCommandLineArguments[2]);
-            _context3.next = 118;
+            _context3.next = 117;
             break;
-          case 117:
+          case 116:
             if (['build:types', 'check:types', 'lint', 'serve', 'test:browser'].includes(configuration.givenCommandLineArguments[2])) handleTask(configuration.givenCommandLineArguments[2]);
-          case 118:
+          case 117:
             finished = false;
             closeHandler = function closeHandler() {
               if (!finished) for (var _i2 = 0, _closeEventHandlers = closeEventHandlers; _i2 < _closeEventHandlers.length; _i2++) {
@@ -600,51 +556,51 @@ var main = function main(context) {
               }
               finished = true;
             };
-            _iterator13 = _createForOfIteratorHelper(_clientnode.CloseEventNames);
+            _iterator11 = _createForOfIteratorHelper(_clientnode.CloseEventNames);
             try {
-              for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-                closeEventName = _step13.value;
+              for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+                closeEventName = _step11.value;
                 process.on(closeEventName, closeHandler);
               }
             } catch (err) {
-              _iterator13.e(err);
+              _iterator11.e(err);
             } finally {
-              _iterator13.f();
+              _iterator11.f();
             }
             if (require.main === module && (configuration.givenCommandLineArguments.length < 3 || !possibleArguments.includes(configuration.givenCommandLineArguments[2]))) console.info("Give one of \"".concat(possibleArguments.join('", "'), "\" as command ") + 'line argument. You can provide a json string as second ' + 'parameter to dynamically overwrite some configurations.\n');
             // endregion
             // region forward nested return codes
-            _context3.prev = 123;
-            _context3.next = 126;
+            _context3.prev = 122;
+            _context3.next = 125;
             return Promise.all(processPromises);
-          case 126:
-            _context3.next = 132;
+          case 125:
+            _context3.next = 131;
             break;
-          case 128:
-            _context3.prev = 128;
-            _context3.t6 = _context3["catch"](123);
+          case 127:
+            _context3.prev = 127;
+            _context3.t6 = _context3["catch"](122);
             console.error(_context3.t6);
             process.exit(_context3.t6.returnCode);
-          case 132:
-            _context3.next = 141;
+          case 131:
+            _context3.next = 140;
             break;
-          case 134:
-            _context3.prev = 134;
+          case 133:
+            _context3.prev = 133;
             _context3.t7 = _context3["catch"](2);
             if (!configuration.debug) {
-              _context3.next = 140;
+              _context3.next = 139;
               break;
             }
             throw _context3.t7;
-          case 140:
+          case 139:
             console.error(_context3.t7);
-          case 141:
+          case 140:
             return _context3.abrupt("return", clear);
-          case 142:
+          case 141:
           case "end":
             return _context3.stop();
         }
-      }, _callee2, null, [[2, 134], [37, 48, 51, 54], [79, 104, 107, 110], [85, 94, 97, 100], [123, 128]]);
+      }, _callee2, null, [[2, 133], [37, 48, 51, 54], [78, 103, 106, 109], [84, 93, 96, 99], [122, 127]]);
     }))();
   } catch (e) {
     return Promise.reject(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "2.0.1271",
+  "version": "2.0.1272",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -132,6 +132,7 @@
     "eslint-plugin-jsdoc": "*",
     "favicons": "*",
     "favicons-webpack-plugin": "*",
+    "glob-all": "*",
     "image-minimizer-webpack-plugin": "*",
     "jest": "*",
     "jsdoc": "*",
@@ -1356,24 +1357,16 @@
             "__evaluate__": "self.files.compose.image ? path.resolve(self.path.source.asset.image, path.relative(self.path.target.asset.image, self.files.compose.image)) : null"
           }
         ],
-        "tidyUpGlobs": {
-          "options": {
-            "glob": {
-              "ignore": [
-                "node_modules/**/*.css.js",
-                "**/node_modules/**/*.css.js"
-              ]
-            }
+        "tidyUpGlobs": [
+          {
+            "__evaluate__": "path.resolve(self.path.target.base, '*.css.js')"
           },
-          "pattern": [
-            {
-              "__evaluate__": "path.resolve(self.path.target.base, '*.css.js')"
-            },
-            {
-              "__evaluate__": "path.resolve(self.path.target.base, '**/*.css.js')"
-            }
-          ]
-        },
+          {
+            "__evaluate__": "path.resolve(self.path.target.base, '**/*.css.js')"
+          },
+          "!node_modules/**/*.css.js",
+          "!**/node_modules/**/*.css.js"
+        ],
         "tidyUpOnClear": [
           {
             "__evaluate__": "path.resolve(self.path.target.base, 'yarn-error.log')"
@@ -1385,25 +1378,17 @@
             "__evaluate__": "path.resolve(self.path.target.base, '.nyc_output')"
           }
         ],
-        "tidyUpOnClearGlobs": {
-          "options": {
-            "glob": {
-              "ignore": [
-                "node_modules/**/*.d.ts",
-                "**/node_modules/**/*.d.ts",
-                "**/declarations.d.ts"
-              ]
-            }
+        "tidyUpOnClearGlobs": [
+          {
+            "__evaluate__": "path.resolve(self.path.target.base, '*.d.ts')"
           },
-          "pattern": [
-            {
-              "__evaluate__": "path.resolve(self.path.target.base, '*.d.ts')"
-            },
-            {
-              "__evaluate__": "path.resolve(self.path.target.base, '**/*.d.ts')"
-            }
-          ]
-        }
+          {
+            "__evaluate__": "path.resolve(self.path.target.base, '**/*.d.ts')"
+          },
+          "!node_modules/**/*.d.ts",
+          "!**/node_modules/**/*.d.ts",
+          "!**/declarations.d.ts"
+        ]
       },
       "performanceHints": {
         "hints": false

package/type.d.ts

@@ -7,7 +7,6 @@ import HtmlWebpackPlugin from 'html-webpack-plugin';
 import ImageMinimizerWebpackPlugin, { PluginOptions as ImageMinimizerOptions } from 'image-minimizer-webpack-plugin';
 import { JSDOM } from 'jsdom';
 import MiniCSSExtractPlugin from 'mini-css-extract-plugin';
-import { Options as RemoveDirectoryRecursivelyOptions } from 'rimraf';
 import TerserWebpackPlugin from 'terser-webpack-plugin';
 import { DefinePlugin as WebpackDefinePlugin, Configuration as BaseWebpackConfiguration, IgnorePlugin as WebpackIgnorePlugin, library as webpackLibrary, ModuleOptions as WebpackModuleOptions, RuleSetRule as WebpackRuleSetRule, RuleSetUseItem as WebpackRuleSetUseItem, WebpackOptionsNormalized } from 'webpack';
 import { WebpackPartial as WorkboxBaseCommonOptions, BasePartial as WorkboxCommonOptions, WebpackGenerateSWOptions as WorkboxGenerateSWOptions, WebpackInjectManifestOptions as WorkboxInjectManifestOptions } from 'workbox-build';
@@ -110,15 +109,9 @@ export interface PathConfiguration extends BasePathConfiguration {
     context: string;
     ignore: Array<string>;
     tidyUp: Array<string>;
-    tidyUpGlobs: {
-        options: RemoveDirectoryRecursivelyOptions;
-        pattern: Array<string>;
-    };
+    tidyUpGlobs: Array<string>;
     tidyUpOnClear: Array<string>;
-    tidyUpOnClearGlobs: {
-        options: RemoveDirectoryRecursivelyOptions;
-        pattern: Array<string>;
-    };
+    tidyUpOnClearGlobs: Array<string>;
 }
 export type DefaultPathConfiguration = BasePathConfiguration & Resolvable;
 export interface BuildConfigurationItem {