@varlet/cli 1.20.1-alpha.1 → 1.20.1-alpha.10

package/lib/config/postcss.config.d.ts

@@ -1 +1,4 @@
-export declare function createPostcssOptions(path: string): any;
+export declare const defaultConfig: {
+    plugins: string[];
+};
+export declare function getPostcssOptions(): any;

package/lib/config/postcss.config.js

@@ -1,42 +1,18 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPostcssOptions = void 0;
+exports.getPostcssOptions = exports.defaultConfig = void 0;
+var lodash_1 = require("lodash");
 var fs_extra_1 = require("fs-extra");
-function createPostcssOptions(path) {
-    var rawOptions = (fs_extra_1.pathExistsSync(path) && require(path)) || {};
-    var rawPlugins = Array.isArray(rawOptions.plugins) ? rawOptions.plugins : [];
-    return __assign(__assign({}, rawOptions), { plugins: __spreadArray([require.resolve('autoprefixer')], __read(rawPlugins)) });
+var constant_1 = require("../shared/constant");
+exports.defaultConfig = {
+    plugins: [require.resolve('postcss-preset-env')],
+};
+function getPostcssOptions() {
+    var config = {};
+    if (fs_extra_1.pathExistsSync(constant_1.POSTCSS_CONFIG)) {
+        delete require.cache[require.resolve(constant_1.POSTCSS_CONFIG)];
+        config = require(constant_1.POSTCSS_CONFIG);
+    }
+    return lodash_1.merge(exports.defaultConfig, config);
 }
-exports.createPostcssOptions = createPostcssOptions;
+exports.getPostcssOptions = getPostcssOptions;

package/lib/config/webpack.base.config.js

@@ -34,7 +34,7 @@ exports.CSS_LOADERS = [
     require.resolve('css-loader'),
     {
         loader: require.resolve('postcss-loader'),
-        options: { postcssOptions: postcss_config_1.createPostcssOptions(constant_1.POSTCSS_CONFIG) },
+        options: { postcssOptions: postcss_config_1.getPostcssOptions() },
     },
 ];
 function createBasePlugins() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "1.20.1-alpha.1+3769f8b0",
+  "version": "1.20.1-alpha.10+89c77d4c",
   "description": "cli of varlet",
   "bin": {
     "varlet-cli": "./lib/index.js"
@@ -31,7 +31,7 @@
     "dev": "tsc --watch",
     "build": "tsc"
   },
-  "gitHead": "3769f8b0837bc16f9bc4d7ce3405cac61c1f79e1",
+  "gitHead": "89c77d4cb34cca2a4734796192dbd8403cca288d",
   "dependencies": {
     "@babel/core": "^7.14.8",
     "@babel/preset-env": "^7.14.8",
@@ -44,11 +44,10 @@
     "@varlet/markdown-loader": "^1.20.0",
     "@varlet/stylelint-config": "^1.9.0",
     "@varlet/touch-emulator": "^1.0.1",
-    "@varlet/ui": "^1.20.1-alpha.1+3769f8b0",
+    "@varlet/ui": "^1.20.1-alpha.10+89c77d4c",
     "@vue/babel-plugin-jsx": "^1.0.6",
     "@vue/compiler-sfc": "3.1.4",
     "@vue/test-utils": "^2.0.0-rc.6",
-    "autoprefixer": "9",
     "babel-jest": "26.6.3",
     "babel-loader": "^8.2.2",
     "babel-plugin-import": "^1.13.3",
@@ -60,7 +59,7 @@
     "commitizen": "^4.2.2",
     "conventional-changelog-cli": "^2.1.1",
     "copy-webpack-plugin": "^9.0.1",
-    "css-loader": "^5.0.0",
+    "css-loader": "^5.2.7",
     "cz-conventional-changelog": "^3.3.0",
     "eslint": "^7.30.0",
     "execa": "^5.0.0",
@@ -77,8 +76,9 @@
     "lodash": "^4.17.21",
     "ora": "^5.4.0",
     "portfinder": "^1.0.28",
-    "postcss": "7",
+    "postcss": "^8.3.7",
     "postcss-loader": "^4.0.4",
+    "postcss-preset-env": "^6.7.0",
     "prettier": "^2.3.2",
     "release-it": "^14.11.5",
     "slash": "^3.0.0",