xhs-mp-pack 2.1.0 → 2.1.2

package/dist/plugins/cssMinimizer/CssMinimizerMinify.d.ts

@@ -0,0 +1,10 @@
+export function minify(options: any): Promise<{
+    outputs: never[];
+    warnings: never[];
+    errors: never[];
+}>;
+export function transform(options: any): Promise<{
+    outputs: never[];
+    warnings: never[];
+    errors: never[];
+}>;

package/dist/plugins/cssMinimizer/CssMinimizerMinify.js

@@ -1,73 +1,57 @@
-
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 // @ts-nocheck
-const minify = async (options) => {
+const minify = (options) => __awaiter(void 0, void 0, void 0, function* () {
     const minifyFns = Array.isArray(options.minimizer.implementation)
         ? options.minimizer.implementation
         : [options.minimizer.implementation];
-
     const result = { outputs: [], warnings: [], errors: [] };
-
     let needSourceMap = false;
-
     for (let i = 0; i <= minifyFns.length - 1; i++) {
         const minifyFn = minifyFns[i];
         const minifyOptions = Array.isArray(options.minimizer.options)
             ? options.minimizer.options[i]
             : options.minimizer.options;
-        const prevResult =
-            result.outputs.length > 0
-                ? result.outputs[result.outputs.length - 1]
-                : { code: options.input, map: options.inputSourceMap };
+        const prevResult = result.outputs.length > 0
+            ? result.outputs[result.outputs.length - 1]
+            : { code: options.input, map: options.inputSourceMap };
         const { code, map } = prevResult;
         // eslint-disable-next-line no-await-in-loop
-        const minifyResult = await minifyFn(
-            { [options.name]: code },
-            map,
-            minifyOptions
-        );
-
+        const minifyResult = yield minifyFn({ [options.name]: code }, map, minifyOptions);
         if (typeof minifyResult.code !== "string") {
-            throw new Error(
-                "minimizer function doesn't return the 'code' property or result is not a string value"
-            );
+            throw new Error("minimizer function doesn't return the 'code' property or result is not a string value");
         }
-
         if (minifyResult.map) {
             needSourceMap = true;
         }
-
         if (minifyResult.errors) {
             result.errors = result.errors.concat(minifyResult.errors);
         }
-
         if (minifyResult.warnings) {
             result.warnings = result.warnings.concat(minifyResult.warnings);
         }
-
         result.outputs.push({ code: minifyResult.code, map: minifyResult.map });
     }
-
     if (!needSourceMap) {
         result.outputs = [result.outputs[result.outputs.length - 1]];
     }
-
     return result;
-};
-
-async function transform(options) {
-    // 'use strict' => this === undefined (Clean Scope)
-    // Safer for possible security issues, albeit not critical at all here
-    // eslint-disable-next-line no-new-func, no-param-reassign
-    const evaluatedOptions = new Function(
-        "exports",
-        "require",
-        "module",
-        "__filename",
-        "__dirname",
-        `'use strict'\nreturn ${options}`
-    )(exports, require, module, __filename, __dirname);
-
-    return minify(evaluatedOptions);
+});
+function transform(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // 'use strict' => this === undefined (Clean Scope)
+        // Safer for possible security issues, albeit not critical at all here
+        // eslint-disable-next-line no-new-func, no-param-reassign
+        const evaluatedOptions = new Function("exports", "require", "module", "__filename", "__dirname", `'use strict'\nreturn ${options}`)(exports, require, module, __filename, __dirname);
+        return minify(evaluatedOptions);
+    });
 }
-
 module.exports = { minify, transform };

package/dist/plugins/cssMinimizer/CssMinimizerUtils.d.ts

@@ -0,0 +1,10 @@
+/// <reference types=".pnpm/source-map-js@1.2.0/node_modules/source-map-js" />
+export function throttleAll(limit: any, tasks: any): Promise<any>;
+export function memoize(fn: any): () => any;
+export function cssnanoMinify(input: any, sourceMap: any, minimizerOptions?: {
+    preset: string;
+}): Promise<{
+    code: string;
+    map: import("source-map-js").RawSourceMap | undefined;
+    warnings: string[];
+}>;

package/dist/plugins/cssMinimizer/CssMinimizerUtils.js

@@ -1,147 +1,125 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 // @ts-nocheck
-const notSettled = Symbol(`not-settled`)
-
+const notSettled = Symbol(`not-settled`);
 function throttleAll(limit, tasks) {
-  if (!Number.isInteger(limit) || limit < 1) {
-    throw new TypeError(
-      `Expected \`limit\` to be a finite number > 0, got \`${limit}\` (${typeof limit})`,
-    )
-  }
-
-  if (!Array.isArray(tasks) || !tasks.every(task => typeof task === `function`)) {
-    throw new TypeError(`Expected \`tasks\` to be a list of functions returning a promise`)
-  }
-
-  return new Promise((resolve, reject) => {
-    const result = Array(tasks.length).fill(notSettled)
-    const entries = tasks.entries()
-    const next = () => {
-      const { done, value } = entries.next()
-
-      if (done) {
-        const isLast = !result.includes(notSettled)
-
-        if (isLast) resolve(result)
-
-        return
-      }
-
-      const [index, task] = value
-
-      const onFulfilled = x => {
-        result[index] = x
-        next()
-      }
-
-      task().then(onFulfilled, reject)
+    if (!Number.isInteger(limit) || limit < 1) {
+        throw new TypeError(`Expected \`limit\` to be a finite number > 0, got \`${limit}\` (${typeof limit})`);
     }
-
-    Array(limit).fill(0).forEach(next)
-  })
-}
-
-async function cssnanoMinify(input, sourceMap, minimizerOptions = { preset: 'default' }) {
-  const load = async module => {
-    let exports
-
-    try {
-      // eslint-disable-next-line import/no-dynamic-require, global-require
-      exports = require(module)
-
-      return exports
-    } catch (requireError) {
-      let importESM
-
-      try {
-        // eslint-disable-next-line no-new-func
-        importESM = new Function('id', 'return import(id);')
-      } catch (e) {
-        importESM = null
-      }
-
-      if (requireError.code === 'ERR_REQUIRE_ESM' && importESM) {
-        exports = await importESM(module)
-
-        return exports.default
-      }
-
-      throw requireError
-    }
-  }
-
-  const [[name, code]] = Object.entries(input)
-  const postcssOptions = {
-    from: name,
-    ...minimizerOptions.processorOptions,
-  }
-
-  if (typeof postcssOptions.parser === 'string') {
-    try {
-      postcssOptions.parser = await load(postcssOptions.parser)
-    } catch (error) {
-      throw new Error(
-        `Loading PostCSS "${postcssOptions.parser}" parser failed: ${error.message}\n\n(@${name})`,
-      )
-    }
-  }
-
-  if (typeof postcssOptions.stringifier === 'string') {
-    try {
-      postcssOptions.stringifier = await load(postcssOptions.stringifier)
-    } catch (error) {
-      throw new Error(
-        `Loading PostCSS "${postcssOptions.stringifier}" stringifier failed: ${error.message}\n\n(@${name})`,
-      )
-    }
-  }
-
-  if (typeof postcssOptions.syntax === 'string') {
-    try {
-      postcssOptions.syntax = await load(postcssOptions.syntax)
-    } catch (error) {
-      throw new Error(
-        `Loading PostCSS "${postcssOptions.syntax}" syntax failed: ${error.message}\n\n(@${name})`,
-      )
+    if (!Array.isArray(tasks) || !tasks.every(task => typeof task === `function`)) {
+        throw new TypeError(`Expected \`tasks\` to be a list of functions returning a promise`);
     }
-  }
-
-  if (sourceMap) {
-    postcssOptions.map = { annotation: false }
-  }
-
-  const postcss = require('postcss').default
-  const cssnano = require('cssnano')
-  const result = await postcss([cssnano(minimizerOptions)]).process(code, postcssOptions)
-
-  return {
-    code: result.css,
-    map: result.map ? result.map.toJSON() : undefined,
-    warnings: result.warnings().map(String),
-  }
+    return new Promise((resolve, reject) => {
+        const result = Array(tasks.length).fill(notSettled);
+        const entries = tasks.entries();
+        const next = () => {
+            const { done, value } = entries.next();
+            if (done) {
+                const isLast = !result.includes(notSettled);
+                if (isLast)
+                    resolve(result);
+                return;
+            }
+            const [index, task] = value;
+            const onFulfilled = x => {
+                result[index] = x;
+                next();
+            };
+            task().then(onFulfilled, reject);
+        };
+        Array(limit).fill(0).forEach(next);
+    });
+}
+function cssnanoMinify(input, sourceMap, minimizerOptions = { preset: 'default' }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const load = (module) => __awaiter(this, void 0, void 0, function* () {
+            let exports;
+            try {
+                // eslint-disable-next-line import/no-dynamic-require, global-require
+                exports = require(module);
+                return exports;
+            }
+            catch (requireError) {
+                let importESM;
+                try {
+                    // eslint-disable-next-line no-new-func
+                    importESM = new Function('id', 'return import(id);');
+                }
+                catch (e) {
+                    importESM = null;
+                }
+                if (requireError.code === 'ERR_REQUIRE_ESM' && importESM) {
+                    exports = yield importESM(module);
+                    return exports.default;
+                }
+                throw requireError;
+            }
+        });
+        const [[name, code]] = Object.entries(input);
+        const postcssOptions = Object.assign({ from: name }, minimizerOptions.processorOptions);
+        if (typeof postcssOptions.parser === 'string') {
+            try {
+                postcssOptions.parser = yield load(postcssOptions.parser);
+            }
+            catch (error) {
+                throw new Error(`Loading PostCSS "${postcssOptions.parser}" parser failed: ${error.message}\n\n(@${name})`);
+            }
+        }
+        if (typeof postcssOptions.stringifier === 'string') {
+            try {
+                postcssOptions.stringifier = yield load(postcssOptions.stringifier);
+            }
+            catch (error) {
+                throw new Error(`Loading PostCSS "${postcssOptions.stringifier}" stringifier failed: ${error.message}\n\n(@${name})`);
+            }
+        }
+        if (typeof postcssOptions.syntax === 'string') {
+            try {
+                postcssOptions.syntax = yield load(postcssOptions.syntax);
+            }
+            catch (error) {
+                throw new Error(`Loading PostCSS "${postcssOptions.syntax}" syntax failed: ${error.message}\n\n(@${name})`);
+            }
+        }
+        if (sourceMap) {
+            postcssOptions.map = { annotation: false };
+        }
+        const postcss = require('postcss').default;
+        const cssnano = require('cssnano');
+        const result = yield postcss([cssnano(minimizerOptions)]).process(code, postcssOptions);
+        return {
+            code: result.css,
+            map: result.map ? result.map.toJSON() : undefined,
+            warnings: result.warnings().map(String),
+        };
+    });
 }
-
-
 function memoize(fn) {
-  let cache = false
-  let result
-
-  return () => {
-    if (cache) {
-      return result
-    }
-    result = fn()
-    cache = true
-    // Allow to clean up memory for fn
-    // and all dependent resources
-    // eslint-disable-next-line no-undefined, no-param-reassign
-    fn = undefined
-
-    return result
-  }
+    let cache = false;
+    let result;
+    return () => {
+        if (cache) {
+            return result;
+        }
+        result = fn();
+        cache = true;
+        // Allow to clean up memory for fn
+        // and all dependent resources
+        // eslint-disable-next-line no-undefined, no-param-reassign
+        fn = undefined;
+        return result;
+    };
 }
-
 module.exports = {
-  throttleAll,
-  memoize,
-  cssnanoMinify,
-}
+    throttleAll,
+    memoize,
+    cssnanoMinify,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xhs-mp-pack",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "xhs mp compiler core.",
   "preferGlobal": true,
   "category": "esm",
@@ -55,9 +55,9 @@
     "watchpack": "^2.4.0",
     "webpack-chain": "^6.5.1",
     "webpack-sources": "^3.2.3",
-    "xhs-mp-compiler-utils": "2.1.0",
-    "xhs-mp-project": "2.1.0",
-    "xhs-mp-shared-fs": "2.1.0"
+    "xhs-mp-compiler-utils": "2.1.2",
+    "xhs-mp-project": "2.1.2",
+    "xhs-mp-shared-fs": "2.1.2"
   },
   "devDependencies": {
     "@types/babel__generator": "7.6.3",