weboptimizer 2.0.1205 → 2.0.1209

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "2.0.1205",
+  "version": "2.0.1209",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -81,6 +81,7 @@
     "update": "yarn version --patch && yarn publish",
     "update:documentation": "documentation-website"
   },
+  "runkitExample": "require('@babel/runtime/package.json')\n\nconst {default: main} = require('weboptimizer')\n\nawait main('./', './', ['clear'])",
   "dependencies": {
     "@babel/core": "*",
     "@babel/plugin-proposal-decorators": "*",
@@ -611,30 +612,26 @@
       },
       "favicon": {
         "background": "white",
-        "emitStats": false,
-        "icons": {
-          "android": true,
-          "appleIcon": true,
-          "appleStartup": true,
-          "coast": true,
-          "favicons": true,
-          "firefox": true,
-          "opengraph": true,
-          "twitter": true,
-          "windows": true,
-          "yandex": true
+        "cache": true,
+        "favicons": {
+          "appName": {
+            "__evaluate__": "self.name"
+          },
+          "icons": {
+            "android": true,
+            "appleIcon": true,
+            "appleStartup": true,
+            "favicons": true,
+            "windows": true,
+            "yandex": true
+          }
         },
         "inject": true,
         "logo": {
           "__evaluate__": "self.path.source.asset.favicon"
         },
-        "persistentCache": true,
         "prefix": {
           "__evaluate__": "`${path.relative(self.path.target.base, path.resolve(self.path.target.asset.image, 'favicons-[chunkhash]'))}/`"
-        },
-        "statsFilename": "iconStats.json",
-        "title": {
-          "__evaluate__": "self.name"
         }
       },
       "files": {

package/readme.md

@@ -31,6 +31,8 @@ Project status
 -->
 [![documentation website](https://img.shields.io/website-up-down-green-red/https/torben.website/weboptimizer.svg?label=documentation-website)](https://torben.website/weboptimizer)
 
+[![Try out](https://badge.runkitcdn.com/weboptimizer.svg)](https://npm.runkit.com/weboptimizer)
+
 Use case
 --------
 

package/type.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 /// <reference types="webpack-env" />
 import { AnyFunction, Encoding, Mapping, PlainObject, SecondParameter } from 'clientnode/type';
-import { FaviconStreamOptions } from 'favicons';
 import FaviconWebpackPlugin from 'favicons-webpack-plugin';
+import { FaviconWebpackPlugionOptions as FaviconWebpackPluginOptions } from 'favicons-webpack-plugin/src/options';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import ImageMinimizerWebpackPlugin, { PluginOptions as ImageMinimizerOptions } from 'image-minimizer-webpack-plugin';
 import { JSDOM } from 'jsdom';
@@ -278,9 +278,7 @@ export interface ResolvedConfiguration {
         self: ExportFormat;
     };
     extensions: Extensions;
-    favicon: Mapping<FaviconStreamOptions> & {
-        logo: string;
-    };
+    favicon: FaviconWebpackPluginOptions;
     files: {
         additionalPaths: Array<string>;
         compose: {

package/webpackConfigurator.d.ts

@@ -1,3 +1,4 @@
 import { WebpackConfiguration } from './type';
+export declare const optionalRequire: <T = unknown>(id: string) => T | null;
 export declare let webpackConfiguration: WebpackConfiguration;
 export default webpackConfiguration;

package/webpackConfigurator.js

@@ -19,12 +19,10 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof3 = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.webpackConfiguration = exports["default"] = void 0;
+exports.webpackConfiguration = exports.optionalRequire = exports["default"] = void 0;
 
 var _construct2 = _interopRequireDefault(require("@babel/runtime/helpers/construct"));
 
@@ -36,7 +34,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-var _clientnode = _interopRequireWildcard(require("clientnode"));
+var _clientnode = _interopRequireDefault(require("clientnode"));
 
 var _jsdom = require("jsdom");
 
@@ -61,10 +59,6 @@ var _optionalRequire,
     _configuration$cache2,
     _configuration$path$c2;
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -75,12 +69,31 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-var postcssCSSnano = (0, _clientnode.optionalRequire)('cssnano');
-var postcssFontpath = (0, _clientnode.optionalRequire)('postcss-fontpath');
-var postcssImport = (0, _clientnode.optionalRequire)('postcss-import');
-var postcssSprites = (0, _clientnode.optionalRequire)('postcss-sprites');
-var updateRule = (_optionalRequire = (0, _clientnode.optionalRequire)('postcss-sprites/lib/core')) === null || _optionalRequire === void 0 ? void 0 : _optionalRequire.updateRule;
-var postcssURL = (0, _clientnode.optionalRequire)('postcss-url');
+/// region optional imports
+// NOTE: Has to be defined here to ensure to resolve from here.
+var currentRequire =
+/*
+    typeof __non_webpack_require__ === 'function' ?
+        __non_webpack_require__ :
+*/
+eval("typeof require === 'undefined' ? null : require");
+
+var optionalRequire = function optionalRequire(id) {
+  try {
+    return currentRequire ? currentRequire(id) : null;
+  } catch (error) {
+    return null;
+  }
+};
+
+exports.optionalRequire = optionalRequire;
+var postcssCSSnano = optionalRequire('cssnano');
+var postcssFontpath = optionalRequire('postcss-fontpath');
+var postcssImport = optionalRequire('postcss-import');
+var postcssSprites = optionalRequire('postcss-sprites');
+var updateRule = (_optionalRequire = optionalRequire('postcss-sprites/lib/core')) === null || _optionalRequire === void 0 ? void 0 : _optionalRequire.updateRule;
+var postcssURL = optionalRequire('postcss-url'); /// endregion
+
 var pluginNameResourceMapping = {
   HTML: 'html-webpack-plugin',
   MiniCSSExtract: 'mini-css-extract-plugin',
@@ -96,7 +109,7 @@ for (var _i = 0, _Object$entries = Object.entries(pluginNameResourceMapping); _i
       name = _Object$entries$_i[0],
       alias = _Object$entries$_i[1];
 
-  var plugin = (0, _clientnode.optionalRequire)(alias);
+  var plugin = optionalRequire(alias);
   if (plugin) plugins[name] = plugin;else console.debug("Optional webpack plugin \"".concat(name, "\" not available."));
 }
 
@@ -819,7 +832,7 @@ var scope = {
   configuration: configuration,
   isFilePathInDependencies: isFilePathInDependencies,
   loader: loader,
-  require: _clientnode.currentRequire
+  require: currentRequire
 };
 
 var evaluate = function evaluate(object) {
@@ -862,7 +875,7 @@ var cssUse = _module.preprocessor.cascadingStyleSheet.additional.pre.map(evaluat
   options: _module.cascadingStyleSheet.options || {}
 }, _module.preprocessor.cascadingStyleSheet.loader ? {
   loader: _module.preprocessor.cascadingStyleSheet.loader,
-  options: _clientnode["default"].extend(true, (0, _clientnode.optionalRequire)('postcss') ? {
+  options: _clientnode["default"].extend(true, optionalRequire('postcss') ? {
     postcssOptions: {
       /*
           NOTE: Some plugins like "postcss-import" are
@@ -1216,7 +1229,7 @@ try {
   for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
     var pluginConfiguration = _step15.value;
 
-    var _plugin = (0, _clientnode.optionalRequire)(pluginConfiguration.name.module);
+    var _plugin = optionalRequire(pluginConfiguration.name.module);
 
     if (_plugin) pluginInstances.push((0, _construct2["default"])(_plugin[pluginConfiguration.name.initializer], (0, _toConsumableArray2["default"])(pluginConfiguration.parameters)));else console.warn("Configured plugin module \"".concat(pluginConfiguration.name.module, "\" ") + 'could not be loaded.');
   } // endregion
@@ -1256,7 +1269,7 @@ if ((_configuration$path$c = configuration.path.configuration) !== null && _conf
   require.resolve(configuration.path.configuration.json);
 
   try {
-    customConfiguration = (0, _clientnode.currentRequire)(configuration.path.configuration.json);
+    customConfiguration = currentRequire(configuration.path.configuration.json);
   } catch (error) {
     console.debug('Importing provided json webpack configuration file path ' + "under \"".concat(configuration.path.configuration.json, "\" failed: ") + _clientnode["default"].represent(error));
   }
@@ -1370,7 +1383,7 @@ if (!Array.isArray(_module.skipParseRegularExpressions) || _module.skipParseRegu
 if ((_configuration$path$c2 = configuration.path.configuration) !== null && _configuration$path$c2 !== void 0 && _configuration$path$c2.javaScript) try {
   require.resolve(configuration.path.configuration.javaScript);
 
-  var result = (0, _clientnode.optionalRequire)(configuration.path.configuration.javaScript);
+  var result = optionalRequire(configuration.path.configuration.javaScript);
   if (_clientnode["default"].isPlainObject(result)) {
     if (Object.prototype.hasOwnProperty.call(result, 'replaceWebOptimizer')) exports.webpackConfiguration = webpackConfiguration = result.replaceWebOptimizer;else _clientnode["default"].extend(true, webpackConfiguration, result);
   } else console.debug('Failed to load given JavaScript configuration file path "' + "".concat(configuration.path.configuration.javaScript, "\"."));