package.json

@@ -48,30 +48,29 @@
     "test:mp-weixin": "cross-env UNI_PLATFORM=mp-weixin jest -i"
   },
   "dependencies": {
-    "@dcloudio/uni-app": "2.0.2-3081220230817001",
+    "@dcloudio/uni-app": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-app-plus": "2.0.2-3081220230817001",
+    "@dcloudio/uni-app-plus": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-h5": "2.0.2-3081220230817001",
+    "@dcloudio/uni-h5": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-i18n": "2.0.2-3081220230817001",
+    "@dcloudio/uni-i18n": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-mp-360": "2.0.2-3081220230817001",
+    "@dcloudio/uni-mp-360": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-mp-alipay": "2.0.2-3081220230817001",
+    "@dcloudio/uni-mp-alipay": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-mp-baidu": "2.0.2-3081220230817001",
+    "@dcloudio/uni-mp-baidu": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-mp-jd": "2.0.2-3081220230817001",
+    "@dcloudio/uni-mp-jd": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-mp-kuaishou": "2.0.2-3081220230817001",
+    "@dcloudio/uni-mp-kuaishou": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-mp-lark": "2.0.2-3081220230817001",
+    "@dcloudio/uni-mp-lark": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-mp-qq": "2.0.2-3081220230817001",
+    "@dcloudio/uni-mp-qq": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-mp-toutiao": "2.0.2-3081220230817001",
+    "@dcloudio/uni-mp-toutiao": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-mp-vue": "2.0.2-3081220230817001",
+    "@dcloudio/uni-mp-vue": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-mp-weixin": "2.0.2-3081220230817001",
+    "@dcloudio/uni-mp-weixin": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-mp-xhs": "2.0.2-3081220230817001",
+    "@dcloudio/uni-mp-xhs": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-quickapp-native": "2.0.2-3081220230817001",
+    "@dcloudio/uni-quickapp-native": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-quickapp-webview": "2.0.2-3081220230817001",
+    "@dcloudio/uni-quickapp-webview": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-stacktracey": "2.0.2-3081220230817001",
+    "@dcloudio/uni-stacktracey": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-stat": "2.0.2-3081220230817001",
+    "@dcloudio/uni-stat": "^2.0.2-3081220230817001",
     "@vue/shared": "^3.0.0",
     "core-js": "^3.6.5",
     "flv.js": "^1.6.2",
     "flyio": "^0.6.2",
-    "postcss-windicss": "file:src/vendor/postcss-windicss",
     "uview-ui": "^1.8.8",
     "vue": "^2.6.11",
     "vuex": "^3.2.0",
@@ -79,17 +78,17 @@
   },
   "devDependencies": {
     "@dcloudio/types": "^3.3.2",
-    "@dcloudio/uni-automator": "2.0.2-3081220230817001",
+    "@dcloudio/uni-automator": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-cli-i18n": "2.0.2-3081220230817001",
+    "@dcloudio/uni-cli-i18n": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-cli-shared": "2.0.2-3081220230817001",
+    "@dcloudio/uni-cli-shared": "^2.0.2-3081220230817001",
     "@dcloudio/uni-helper-json": "*",
-    "@dcloudio/uni-migration": "2.0.2-3081220230817001",
+    "@dcloudio/uni-migration": "^2.0.2-3081220230817001",
-    "@dcloudio/uni-template-compiler": "2.0.2-3081220230817001",
+    "@dcloudio/uni-template-compiler": "^2.0.2-3081220230817001",
-    "@dcloudio/vue-cli-plugin-hbuilderx": "2.0.2-3081220230817001",
+    "@dcloudio/vue-cli-plugin-hbuilderx": "^2.0.2-3081220230817001",
-    "@dcloudio/vue-cli-plugin-uni": "2.0.2-3081220230817001",
+    "@dcloudio/vue-cli-plugin-uni": "^2.0.2-3081220230817001",
-    "@dcloudio/vue-cli-plugin-uni-optimize": "2.0.2-3081220230817001",
+    "@dcloudio/vue-cli-plugin-uni-optimize": "^2.0.2-3081220230817001",
-    "@dcloudio/webpack-uni-mp-loader": "2.0.2-3081220230817001",
+    "@dcloudio/webpack-uni-mp-loader": "^2.0.2-3081220230817001",
-    "@dcloudio/webpack-uni-pages-loader": "2.0.2-3081220230817001",
+    "@dcloudio/webpack-uni-pages-loader": "^2.0.2-3081220230817001",
     "@vue/cli-plugin-babel": "~4.5.12",
     "@vue/cli-service": "~4.5.12",
     "babel-plugin-import": "^1.11.0",
@@ -97,10 +96,11 @@
     "jest": "^25.4.0",
     "mini-types": "*",
     "miniprogram-api-typings": "*",
+    "node-sass": "^4.14.1",
     "postcss-comment": "^2.0.0",
-    "postcss-windicss": "file:src/vendor/postcss-windicss",
+    "sass-loader": "^10.1.1",
-    "sass": "^1.43.4",
+    "stylus": "^0.54.8",
-    "sass-loader": "^8.0.2",
+    "stylus-loader": "^3.0.2",
     "vue-template-compiler": "^2.6.11"
   },
   "browserslist": [

postcss.config.js

@@ -3,7 +3,6 @@ const webpack = require('webpack')
 const config = {
   parser: require('postcss-comment'),
   plugins: [
-    require('postcss-windicss')({}),
     require('postcss-import')({
       resolve (id, basedir, importOptions) {
         if (id.startsWith('~@/')) {

src/App.vue

@@ -12,9 +12,6 @@
 	}
 </script>
 
-<style>
-@windicss;
-</style>
 <style lang="scss">
 	@import "uview-ui/index.scss";
 	/*每个页面公共css */
@@ -470,4 +467,3 @@
 		}
 	}
 </style>
-

src/vendor/README.md

@@ -1,5 +0,0 @@
-
-## Project setup
-```
-自定义插件
-```

src/vendor/postcss-windicss/.eslintignore

@@ -1,2 +0,0 @@
-dist
-node_modules

src/vendor/postcss-windicss/.eslintrc

@@ -1,8 +0,0 @@
-{
-  "env": {
-    "jest": true
-  },
-  "extends": ["@antfu"],
-  "plugins": ["jest"],
-  "rules": {}
-}

src/vendor/postcss-windicss/.gitignore

@@ -1,85 +0,0 @@
-# Created by .ignore support plugin (hsz.mobi)
-### Node template
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# We use pnpm instead of npm in this project.
-package-lock.json
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-
-# next.js build output
-.next
-
-# nuxt.js build output
-.nuxt
-
-# Nuxt generate
-!dist
-src
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless
-
-# IDE
-.idea

src/vendor/postcss-windicss/dist/index.d.ts

@@ -1,3 +0,0 @@
-declare const postcss = true;
-
-export { postcss };

src/vendor/postcss-windicss/dist/index.js

@@ -1,172 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-
-// src/index.ts
-var _exithook = require('exit-hook'); var _exithook2 = _interopRequireDefault(_exithook);
-var _postcss = require('postcss');
-var _pluginutils = require('@windicss/plugin-utils');
-
-// src/dev.ts
-var _fs = require('fs');
-var _chokidar = require('chokidar'); var _chokidar2 = _interopRequireDefault(_chokidar);
-
-// src/utils.ts
-
-async function touch(path, mode = "utime") {
-  if (mode === "utime")
-    return await touchUtime(path);
-  else
-    return await touchInsert(path);
-}
-var TOUCH_REG = /\/\*\s*windicss-touch:.*\*\//;
-async function touchInsert(path) {
-  let css = await _fs.promises.readFile(path, "utf-8");
-  const banner = `/* windicss-touch: ${Date.now()} */`;
-  let replaced = false;
-  css = css.replace(TOUCH_REG, () => {
-    replaced = true;
-    return banner;
-  });
-  if (!replaced)
-    css = `${banner}
-${css}`;
-  await _fs.promises.writeFile(path, css, "utf-8");
-}
-async function touchUtime(path) {
-  return new Promise((resolve, reject) => {
-    const time = new Date();
-    _fs.utimes.call(void 0, path, time, time, (err) => {
-      if (err) {
-        return _fs.open.call(void 0, path, "w", (err2, fd) => {
-          if (err2)
-            return reject(err2);
-          _fs.close.call(void 0, fd, (err3) => err3 ? reject(err3) : resolve(fd));
-        });
-      }
-      resolve(false);
-    });
-  });
-}
-
-// src/context.ts
-var _debug2 = require('debug'); var _debug3 = _interopRequireDefault(_debug2);
-var context = {};
-var isDev = process.env.NODE_ENV === "development";
-var debug = _debug3.default.call(void 0, "postcss-windicss");
-
-// src/dev.ts
-var watcher;
-function shutdownWatcher() {
-  if (watcher) {
-    debug("shutting down watcher");
-    watcher.close();
-    watcher = void 0;
-  }
-}
-async function startDevWatcher(options = {}) {
-  shutdownWatcher();
-  debug("starting dev watcher");
-  const utils = context.utils;
-  await utils.ensureInit();
-  const {
-    touchMode = "utime"
-  } = options;
-  watcher = _chokidar2.default.watch(utils.options.scanOptions.include, {
-    ignored: utils.options.scanOptions.exclude,
-    ignoreInitial: true
-  });
-  if (utils.configFilePath)
-    watcher.add(utils.configFilePath);
-  watcher.on("change", async (path) => {
-    if (path === context.entry)
-      return;
-    if (path === utils.configFilePath) {
-      debug("reload config", utils.configFilePath);
-      utils.init();
-      return;
-    }
-    debug("update from", path);
-    await utils.extractFile(await _fs.promises.readFile(path, "utf-8"));
-    if (context.entry)
-      touch(context.entry, touchMode);
-  });
-  if (context.entry)
-    touch(context.entry, touchMode);
-}
-
-// src/index.ts
-var plugin = (options) => {
-  if (!context.utils) {
-    context.utils = _pluginutils.createUtils.call(void 0, __spreadProps(__spreadValues({}, options), {
-      onOptionsResolved() {
-        if (isDev)
-          setTimeout(() => startDevWatcher(options));
-      }
-    }), {
-      name: "postcss-windicss"
-    });
-    if (isDev)
-      _exithook2.default.call(void 0, shutdownWatcher);
-    debug(isDev ? "development mode" : "production mode");
-  }
-  const utils = context.utils;
-  return (root) => {
-    const promiseArray = [];
-    root.walkAtRules((atRule) => {
-      var _a;
-      const entry = (_a = atRule.root().source) == null ? void 0 : _a.input.from;
-      if (atRule.name === "windicss") {
-        context.entry = entry;
-        promiseArray.push(utils.generateCSS().then((data) => {
-          atRule.replaceWith(_postcss.parse.call(void 0, data));
-        }));
-      } else if (["apply"].includes(atRule.name)) {
-        const rule = atRule.parent;
-        if (!rule)
-          return;
-        promiseArray.push(utils.ensureInit().then(() => {
-          const css = rule.toString();
-          const transformed = css ? utils.transformCSS(css, entry || "") : void 0;
-          if (transformed)
-            rule.replaceWith(_postcss.parse.call(void 0, transformed));
-        }));
-      } else if (["screen", "variants"].includes(atRule.name)) {
-        promiseArray.push(utils.ensureInit().then(() => {
-          const css = atRule.toString();
-          const transformed = css ? utils.transformCSS(css, entry || "") : void 0;
-          if (transformed)
-            atRule.replaceWith(_postcss.parse.call(void 0, transformed));
-        }));
-      }
-    });
-    root.walkDecls((decl) => {
-      const match = decl.value.match(/^\s*theme\((['"])(.*)\1\)\s*$/);
-      if (match && match[2])
-        decl.value = utils.processor.theme(match[2]).toString();
-    });
-    return Promise.all(promiseArray);
-  };
-};
-var postcss = true;
-plugin.postcss = true;
-module.exports = _postcss.plugin.call(void 0, "postcss-windicss", plugin);
-
-
-exports.postcss = postcss;

src/vendor/postcss-windicss/jest.config.js

@@ -1,12 +0,0 @@
-module.exports = {
-  roots: [
-    '<rootDir>/test',
-  ],
-  testMatch: [
-    '**/__tests__/**/*.+(ts|tsx|js)',
-    '**/?(*.)+(spec|test).+(ts|tsx|js)',
-  ],
-  transform: {
-    '^.+\\.(ts|tsx)$': 'ts-jest',
-  },
-}

src/vendor/postcss-windicss/package.json

@@ -1,52 +0,0 @@
-{
-  "name": "postcss-windicss",
-  "version": "1.0.0",
-  "description": "PostCSS plugin for Windi CSS",
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
-  "keywords": [
-    "postcss",
-    "postcss-plugin",
-    "windicss"
-  ],
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "prepublishOnly": "npm run build",
-    "dev": "npm run build -- --watch",
-    "build": "tsup src/index.ts --format cjs --dts",
-    "release": "bumpp --commit --push --tag",
-    "lint": "eslint \"{src,test}/**/*.ts\"",
-    "lint:fix": "npm run lint -- --fix",
-    "test": "jest"
-  },
-  "dependencies": {
-    "@windicss/plugin-utils": "^0.16.0",
-    "chokidar": "^3.5.1",
-    "debug": "^4.3.2",
-    "exit-hook": "^2.2.1",
-    "windicss": "^3.0.12"
-  },
-  "peerDependencies": {
-    "postcss": "^7.0.0"
-  },
-  "devDependencies": {
-    "@antfu/eslint-config": "^0.6.5",
-    "@antfu/ni": "^0.7.0",
-    "@types/debug": "^4.1.5",
-    "@types/jest": "^26.0.23",
-    "@types/node": "^15.6.1",
-    "bumpp": "^6.0.6",
-    "eslint": "^7.27.0",
-    "eslint-plugin-jest": "^24.3.6",
-    "esno": "^0.5.0",
-    "git-ensure": "^0.1.0",
-    "jest": "^27.0.1",
-    "postcss": "^7.0.39",
-    "ts-jest": "^27.0.1",
-    "tsup": "^4.11.1",
-    "typescript": "^4.3.2"
-  }
-}

src/vendor/postcss-windicss/tsconfig.json

@@ -1,12 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es2017",
-    "module": "esnext",
-    "lib": ["esnext"],
-    "moduleResolution": "node",
-    "esModuleInterop": true,
-    "strict": false,
-    "strictNullChecks": true,
-    "resolveJsonModule": true
-  }
-}

windi.config.js

@@ -1,24 +0,0 @@
-import { defineConfig } from 'windicss/helpers'
-import colors from 'windicss/colors'
-
-export default defineConfig({
-  darkMode: 'class',
-  extract: {
-    exclude: [
-      'node_modules/**/*',
-      '.git/**/*',
-      'src/vendor/**',
-    ],
-  },
-  theme: {
-    container: {
-      screens: {},
-    },
-    colors: {
-      ...colors,
-    },
-  },
-  shortcuts: {
-
-  }
-})