weboptimizer 3.0.5 → 3.0.6

package/ejsLoader.d.ts

@@ -2,8 +2,7 @@ import { Encoding, Mapping } from 'clientnode';
 import { Options, TemplateFunction as EJSTemplateFunction } from 'ejs';
 import { LoaderContext } from 'webpack';
 import { Extensions, Replacements } from './type';
-export type PreCompiledTemplateFunction = ((..._parameters: Array<unknown>) => string);
-export type TemplateFunction = EJSTemplateFunction | PreCompiledTemplateFunction;
+export type TemplateFunction = EJSTemplateFunction;
 export type CompilerOptions = Options & {
     encoding: Encoding;
     isString?: boolean;

package/ejsLoader.js

@@ -21,8 +21,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.loader = exports["default"] = void 0;
-var _construct2 = _interopRequireDefault(require("@babel/runtime/helpers/construct"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _core = require("@babel/core");
 var _babelPresetMinify = _interopRequireDefault(require("babel-preset-minify"));
@@ -146,8 +144,6 @@ var loader = exports.loader = function loader(source) {
       delete options.isString;
       var stepLocals;
       var scope = {};
-      var originalScopeNames = [];
-      var scopeNames = [];
       for (var step = 1; step <= compileSteps; step += 1) {
         // On every odd compile step we have to determine the environment.
         if (step % 2) {
@@ -160,10 +156,6 @@ var loader = exports.loader = function loader(source) {
             include: require,
             require: require
           }, Array.isArray(stepLocals) ? {} : stepLocals);else if (!Array.isArray(stepLocals)) scope = stepLocals;
-          originalScopeNames = Array.isArray(stepLocals) ? stepLocals : Object.keys(scope);
-          scopeNames = originalScopeNames.map(function (name) {
-            return (0, _clientnode.convertToValidVariableName)(name);
-          });
           // endregion
         }
         if (typeof result === 'string') {
@@ -181,23 +173,11 @@ var loader = exports.loader = function loader(source) {
               // NOTE: Needed to manipulate code after compiling.
               options.client = true;
             result = _ejs["default"].compile(result, options);
-
-            /*
-                Provide all scope names when "_with" options isn't
-                enabled
-            */
-            if (options.strict || !options._with) {
-              var localsName = options.localsName || 'locals';
-              while (scopeNames.includes(localsName)) localsName = "_".concat(localsName);
-
-              /* eslint-disable @typescript-eslint/no-implied-eval */
-              result = (0, _construct2["default"])(Function, (0, _toConsumableArray2["default"])(scopeNames).concat([localsName, "return ".concat(result.toString(), "(") + "".concat(localsName, ",") + "".concat(localsName, ".escapeFn,") + "".concat(localsName, ".include,") + "".concat(localsName, ".rethrow)")]));
-              /* eslint-enable @typescript-eslint/no-implied-eval */
-            }
           }
-        } else result = compressHTML(!options.strict && options._with ? result(scope, scope.escapeFn, scope.include) : result.apply(void 0, (0, _toConsumableArray2["default"])(originalScopeNames.map(function (name) {
-          return scope[name];
-        }).concat(!options.strict && options._with ? [] : scope))));
+        } else {
+          result = result(scope);
+          result = compressHTML(result);
+        }
       }
       if (compileSteps % 2) {
         var _givenOptions$compres2, _givenOptions$compres3, _givenOptions$compres4, _givenOptions$compres5;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -77,7 +77,7 @@
     "lint:base": "eslint --no-warn-ignored *.ts */*.ts test/*/*.ts",
     "prepare": "yarn build",
     "prettify": "yarn lint:base --fix || true",
-    "test": "yarn build:test && jest --config ./jest.json --noStackTrace --root-dir './' --test-regex '/test/.+\\\\.js$' test/browser.js test/configurator.js test/helper.js test/ejsLoader.js test/stylelintConfigurator.js test/index.js test/webpackConfigurator.js",
+    "test": "yarn build:test && jest --config ./weboptimizerJest.json --noStackTrace --root-dir './' --test-regex '/test/.+\\\\.js$' test/browser.js test/configurator.js test/helper.js test/ejsLoader.js test/stylelintConfigurator.js test/index.js test/webpackConfigurator.js",
     "test:coverage": "yarn test --ci --coverage --coverageReporters=text --coverageReporters=text-summary --silent --testLocationInResults",
     "test:coverage:report": "yarn test:coverage --coverageDirectory=.coverage --coverageReporters=lcov --outputFile=lcov.info",
     "test:watch": "yarn test --watch",
@@ -136,7 +136,7 @@
     "documentation-website": "^1.0.401",
     "eslint": "^10.0.3",
     "eslint-config-google": "^0.14.0",
-    "eslint-plugin-jsdoc": "^62.7.1",
+    "eslint-plugin-jsdoc": "^62.8.0",
     "favicons": "^7.2.0",
     "favicons-webpack-plugin": "^6.0.1",
     "globals": "^17.4.0",