weboptimizer 2.0.1140 → 2.0.1143

package/ejsLoader.js

@@ -19,6 +19,8 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _typeof = require("@babel/runtime/helpers/typeof");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -34,7 +36,7 @@ var _core = require("@babel/core");
 
 var _babelPresetMinify = _interopRequireDefault(require("babel-preset-minify"));
 
-var _clientnode = _interopRequireDefault(require("clientnode"));
+var _clientnode = _interopRequireWildcard(require("clientnode"));
 
 var _ejs = _interopRequireDefault(require("ejs"));
 
@@ -48,6 +50,10 @@ var _configurator = _interopRequireDefault(require("./configurator"));
 
 var _helper = _interopRequireDefault(require("./helper"));
 
+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 || _typeof(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; }
@@ -201,7 +207,7 @@ var loader = function loader(source) {
 
         if (typeof result === 'string') {
           var filePath = isString ? options.filename : result;
-          if (filePath && (0, _path.extname)(filePath) === '.js') result = eval('require')(filePath);else {
+          if (filePath && (0, _path.extname)(filePath) === '.js') result = (0, _clientnode.currentRequire)(filePath);else {
             if (!isString) {
               var encoding = configuration.encoding;
               if (typeof options.encoding === 'string') encoding = options.encoding;

package/helper.js

@@ -19,6 +19,8 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _typeof = require("@babel/runtime/helpers/typeof");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -32,12 +34,16 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
-var _clientnode = _interopRequireDefault(require("clientnode"));
+var _clientnode = _interopRequireWildcard(require("clientnode"));
 
 var _fs = require("fs");
 
 var _path = require("path");
 
+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 || _typeof(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; }
@@ -1133,7 +1139,7 @@ var Helper = /*#__PURE__*/function () {
       var fileName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'package.json';
       var filePath = Helper.findPackageDescriptorFilePath(modulePath, fileName);
       if (!filePath) return null;
-      var configuration = eval('require')(filePath);
+      var configuration = (0, _clientnode.currentRequire)(filePath);
       /*
           If the package.json does not have a name property, try again from
           one level higher.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "2.0.1140",
+  "version": "2.0.1143",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",

package/tsconfig.json

@@ -22,5 +22,8 @@
         "strict": true,
         "target": "esnext"
     },
-    "include": ["*.ts", "*.tsx", "test/*.ts", "test/*.tsx"]
+    "include": [
+        "*.ts", "*.tsx",
+        "*/*.ts", "*/*.tsx"
+    ]
 }

package/tsconfigApplication.json

@@ -13,5 +13,9 @@
         }
     },
     "extends": "./tsconfig.json",
-    "include": ["../../source/*.ts", "../../source/*.tsx"]
+        "include": [
+            "../../*.ts", "../../*.tsx",
+            "../../*/*.ts", "../../*/*.tsx"
+        ]
+    ]
 }

package/tsconfigLibrary.json

@@ -13,5 +13,8 @@
         }
     },
     "extends": "./tsconfig.json",
-    "include": ["../../*.ts", "../../*.tsx"]
+    "include": [
+        "../../*.ts", "../../*.tsx",
+        "../../*/*.ts", "../../*/*.tsx"
+    ]
 }

package/webpackConfigurator.js

@@ -805,7 +805,7 @@ var scope = {
   configuration: configuration,
   isFilePathInDependencies: isFilePathInDependencies,
   loader: loader,
-  require: eval('require')
+  require: _clientnode.currentRequire
 };
 
 var evaluate = function evaluate(object) {