Merge pull request #35 from HXTIA/dev

feat：C端应用主流程0.11.0版本测试
HXTIA · May 19, 2024 · f2ac0d7 · f2ac0d7
2 parents 2efcf67 + 4d4895a
commit f2ac0d7
Show file tree

Hide file tree

Showing 189 changed files with 6,820 additions and 9,319 deletions.
diff --git a/.env.development b/.env.development
@@ -1,4 +1,4 @@
 # 配置要求：必须以TARO_APP_开头否则不可以通过process.env.TARO_APP_XX获得
 
 # 域名
-TARO_APP_DOMAIN="https://hxtia.com:80"
+TARO_APP_DOMAIN="https://805807.cn:8080"
diff --git a/.env.production b/.env.production
@@ -1,4 +1,4 @@
 # 配置要求：必须以TARO_APP_开头否则不可以通过process.env.TARO_APP_XX获得
 
 # 域名
-TARO_APP_DOMAIN="https://hxtia.com:80"
+TARO_APP_DOMAIN="https://805807.cn:8080"
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,17 +1,20 @@
 module.exports = {
   extends: [
-    "taro/react"
+    'taro/react',
   ],
   rules: {
-    "react/jsx-uses-react": "off",
-    "react/react-in-jsx-scope": "off",
+    'react/jsx-uses-react': 'off',
+    'react/react-in-jsx-scope': 'off',
     'import/no-commonjs': 'off',
+    'semi': ['error', 'never'],
+    'max-len': ['error', { 'code': 110 }],
+    'quotes': ['error', 'single'],
   },
   parserOptions: {
     requireConfigFile: false,
   },
   env: {
-      node: true, // 启用目标环境的全局变量
-      browser: true,
+    node: true, // 启用目标环境的全局变量
+    browser: true,
   },
 }
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 node_modules/
 dist/
 .swc/
-DS_Store
+.DS_Store
 temp.json
 .cache/
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/babel.config.js b/babel.config.js
@@ -30,5 +30,6 @@ module.exports = {
       },
       '@taroify/icons',
     ],
+    ['@babel/plugin-proposal-decorators', { 'legacy': true }]
   ],
 }
diff --git a/config/dev.js b/config/dev.js
@@ -4,6 +4,7 @@ module.exports = {
   },
   // 定义编译常量
   defineConstants: {
+    isDev: true
   },
   mini: {},
   h5: {}

diff --git a/config/index.js b/config/index.js
@@ -63,6 +63,11 @@ const config = {
         },
       },
     },
+    /** 提取css */
+    // miniCssExtractPluginOption: {
+    //   filename: '[name].css',
+    //   chunkFilename: '[name].css',
+    // },
   },
 }
 

diff --git a/config/prod.js b/config/prod.js
@@ -2,7 +2,9 @@ module.exports = {
   env: {
     NODE_ENV: '"production"'
   },
-  defineConstants: {},
+  defineConstants: {
+    isDev: false
+  },
   mini: {
     /** 自动提取了chunk */
     // commonChunks: {},
@@ -13,10 +15,10 @@ module.exports = {
     },
 
     /** 提取css */
-    miniCssExtractPluginOption: {
-      filename: '[name].css',
-      chunkFilename: '[name].css',
-    },
+    // miniCssExtractPluginOption: {
+    //   filename: '[name].css',
+    //   chunkFilename: '[name].css',
+    // },
   }
   /** 看起来会默认压缩 */
   // jsMinimizer: 'terser', // 默认压缩为terser

diff --git a/package.json b/package.json
@@ -39,10 +39,12 @@
   "author": "HardenSG <2767525216@qq.com>",
   "dependencies": {
     "@babel/runtime": "^7.7.7",
+    "@poster-render/taro-react": "^3.6.3",
     "@rematch/core": "^2.2.0",
     "@rematch/immer": "^2.1.3",
     "@rematch/select": "^3.1.2",
-    "@taroify/core": "0.1.0-alpha.1",
+    "@taroify/core": "0.1.5-alpha.0",
+    "@taroify/icons": "0.1.5-alpha.0",
     "@tarojs/components": "3.5.11",
     "@tarojs/helper": "3.5.11",
     "@tarojs/plugin-framework-react": "3.5.11",
@@ -68,6 +70,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.8.0",
+    "@babel/plugin-proposal-decorators": "^7.24.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
     "@tarojs/cli": "3.5.11",
     "@tarojs/plugin-terser": "^2.2.10",
@@ -86,6 +89,7 @@
     "eslint-plugin-react": "^7.8.2",
     "eslint-plugin-react-hooks": "^4.2.0",
     "exec-sh": "^0.4.0",
+    "mini-css-extract-plugin": "^2.8.1",
     "react-refresh": "^0.11.0",
     "stylelint": "^14.4.0",
     "typescript": "^4.1.0",
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,5 +30,6 @@ module.exports = { @@
           },
           '@taroify/icons',
         ],
+        ['@babel/plugin-proposal-decorators', { 'legacy': true }]
       ],
     }