feat: 调整新融合模式的示例代码

luckymore · Jul 28, 2023 · a6bbdc0 · a6bbdc0
1 parent 7370453
commit a6bbdc0
Show file tree

Hide file tree

Showing 37 changed files with 13 additions and 13 deletions.
diff --git a/.../blended-taro-native-component/.gitignore → examples/new-blended/.gitignore b/.../blended-taro-native-component/.gitignore → examples/new-blended/.gitignore
diff --git a/...s/blended-taro-native-component/README.md → examples/new-blended/README.md b/...s/blended-taro-native-component/README.md → examples/new-blended/README.md
diff --git a/...nded-taro-native-component/miniapp/app.js → examples/new-blended/miniapp/app.js b/...nded-taro-native-component/miniapp/app.js → examples/new-blended/miniapp/app.js
diff --git a/...ed-taro-native-component/miniapp/app.json → examples/new-blended/miniapp/app.json b/...ed-taro-native-component/miniapp/app.json → examples/new-blended/miniapp/app.json
diff --git a/...ed-taro-native-component/miniapp/app.wxss → examples/new-blended/miniapp/app.wxss b/...ed-taro-native-component/miniapp/app.wxss → examples/new-blended/miniapp/app.wxss
diff --git a/...ve-component/miniapp/pages/index/index.js → .../new-blended/miniapp/pages/index/index.js b/...ve-component/miniapp/pages/index/index.js → .../new-blended/miniapp/pages/index/index.js
diff --git a/...-component/miniapp/pages/index/index.json → ...ew-blended/miniapp/pages/index/index.json b/...-component/miniapp/pages/index/index.json → ...ew-blended/miniapp/pages/index/index.json
diff --git a/...-component/miniapp/pages/index/index.wxml → ...ew-blended/miniapp/pages/index/index.wxml b/...-component/miniapp/pages/index/index.wxml → ...ew-blended/miniapp/pages/index/index.wxml
diff --git a/...-component/miniapp/pages/index/index.wxss → ...ew-blended/miniapp/pages/index/index.wxss b/...-component/miniapp/pages/index/index.wxss → ...ew-blended/miniapp/pages/index/index.wxss
diff --git a/...ive-component/miniapp/project.config.json → ...s/new-blended/miniapp/project.config.json b/...ive-component/miniapp/project.config.json → ...s/new-blended/miniapp/project.config.json
diff --git a/...onent/miniapp/project.private.config.json → ...ended/miniapp/project.private.config.json b/...onent/miniapp/project.private.config.json → ...ended/miniapp/project.private.config.json
diff --git a/...aro-native-component/miniapp/sitemap.json → examples/new-blended/miniapp/sitemap.json b/...aro-native-component/miniapp/sitemap.json → examples/new-blended/miniapp/sitemap.json
diff --git a/...o-native-component/taro-project/.eslintrc → examples/new-blended/taro-project/.eslintrc b/...o-native-component/taro-project/.eslintrc → examples/new-blended/taro-project/.eslintrc
diff --git a/...ve-component/taro-project/babel.config.js → .../new-blended/taro-project/babel.config.js b/...ve-component/taro-project/babel.config.js → .../new-blended/taro-project/babel.config.js
diff --git a/...tive-component/taro-project/config/dev.js → ...es/new-blended/taro-project/config/dev.js b/...tive-component/taro-project/config/dev.js → ...es/new-blended/taro-project/config/dev.js
diff --git a/...ve-component/taro-project/config/index.js → .../new-blended/taro-project/config/index.js b/...ve-component/taro-project/config/index.js → .../new-blended/taro-project/config/index.js
diff --git a/...ive-component/taro-project/config/prod.js → ...s/new-blended/taro-project/config/prod.js b/...ive-component/taro-project/config/prod.js → ...s/new-blended/taro-project/config/prod.js
diff --git a/...ative-component/taro-project/package.json → ...les/new-blended/taro-project/package.json b/...ative-component/taro-project/package.json → ...les/new-blended/taro-project/package.json
@@ -9,7 +9,7 @@
     "css": "sass"
   },
   "scripts": {
-    "build": "taro build native-components --type weapp --watch",
+    "build": "taro build --type weapp --new-blended",
     "dev": "taro build --type weapp --new-blended --watch"
   },
   "browserslist": [
@@ -20,16 +20,16 @@
   "author": "",
   "dependencies": {
     "@babel/runtime": "^7.7.7",
-    "@tarojs/cli": "3.6.7",
-    "@tarojs/components": "3.6.7",
-    "@tarojs/helper": "3.6.7",
-    "@tarojs/plugin-framework-react": "3.6.7",
-    "@tarojs/plugin-platform-weapp": "3.6.7",
-    "@tarojs/react": "3.6.7",
-    "@tarojs/runtime": "3.6.7",
-    "@tarojs/shared": "3.6.7",
-    "@tarojs/taro": "3.6.7",
-    "@tarojs/webpack5-runner": "^3.6.7",
+    "@tarojs/cli": "3.6.10-alpha.4",
+    "@tarojs/components": "3.6.10-alpha.4",
+    "@tarojs/helper": "3.6.10-alpha.4",
+    "@tarojs/plugin-framework-react": "3.6.10-alpha.4",
+    "@tarojs/plugin-platform-weapp": "3.6.10-alpha.4",
+    "@tarojs/react": "3.6.10-alpha.4",
+    "@tarojs/runtime": "3.6.10-alpha.4",
+    "@tarojs/shared": "3.6.10-alpha.4",
+    "@tarojs/taro": "3.6.10-alpha.4",
+    "@tarojs/webpack5-runner": "3.6.10-alpha.4",
     "react": "^16.10.0",
     "react-dom": "^16.10.0"
   },
@@ -38,9 +38,9 @@
     "@tarojs/plugin-indie": "0.0.8",
     "@types/react": "^16.0.0",
     "@types/webpack-env": "^1.13.6",
-    "babel-preset-taro": "3.6.7",
+    "babel-preset-taro": "3.6.10-alpha.4",
     "eslint": "^8.12.0",
-    "eslint-config-taro": "3.6.7",
+    "eslint-config-taro": "3.6.10-alpha.4",
     "eslint-plugin-import": "^2.12.0",
     "eslint-plugin-react": "^7.8.2",
     "eslint-plugin-react-hooks": "^4.2.0",

diff --git a/...component/taro-project/plugin-mv/index.js → ...w-blended/taro-project/plugin-mv/index.js b/...component/taro-project/plugin-mv/index.js → ...w-blended/taro-project/plugin-mv/index.js
diff --git a/...omponent/taro-project/project.config.json → ...-blended/taro-project/project.config.json b/...omponent/taro-project/project.config.json → ...-blended/taro-project/project.config.json
diff --git a/...-component/taro-project/src/app.config.js → ...ew-blended/taro-project/src/app.config.js b/...-component/taro-project/src/app.config.js → ...ew-blended/taro-project/src/app.config.js
diff --git a/...-native-component/taro-project/src/app.js → examples/new-blended/taro-project/src/app.js b/...-native-component/taro-project/src/app.js → examples/new-blended/taro-project/src/app.js
diff --git a/...ct/src/components/article/index.config.js → ...ct/src/components/article/index.config.js b/...ct/src/components/article/index.config.js → ...ct/src/components/article/index.config.js
diff --git a/...-project/src/components/article/index.jsx → ...-project/src/components/article/index.jsx b/...-project/src/components/article/index.jsx → ...-project/src/components/article/index.jsx
diff --git a/...project/src/components/article/index.scss → ...project/src/components/article/index.scss b/...project/src/components/article/index.scss → ...project/src/components/article/index.scss
diff --git a/...o-project/src/components/common/index.jsx → ...o-project/src/components/common/index.jsx b/...o-project/src/components/common/index.jsx → ...o-project/src/components/common/index.jsx
diff --git a/...-project/src/components/common/index.scss → ...-project/src/components/common/index.scss b/...-project/src/components/common/index.scss → ...-project/src/components/common/index.scss
diff --git a/...ect/src/components/picker/index.config.js → ...ect/src/components/picker/index.config.js b/...ect/src/components/picker/index.config.js → ...ect/src/components/picker/index.config.js
diff --git a/...o-project/src/components/picker/index.jsx → ...o-project/src/components/picker/index.jsx b/...o-project/src/components/picker/index.jsx → ...o-project/src/components/picker/index.jsx
diff --git a/...-project/src/components/picker/index.scss → ...-project/src/components/picker/index.scss b/...-project/src/components/picker/index.scss → ...-project/src/components/picker/index.scss
diff --git a/...-project/src/pages/detail/index.config.js → ...-project/src/pages/detail/index.config.js b/...-project/src/pages/detail/index.config.js → ...-project/src/pages/detail/index.config.js
diff --git a/...t/taro-project/src/pages/detail/index.jsx → ...d/taro-project/src/pages/detail/index.jsx b/...t/taro-project/src/pages/detail/index.jsx → ...d/taro-project/src/pages/detail/index.jsx
diff --git a/.../taro-project/src/pages/detail/index.scss → .../taro-project/src/pages/detail/index.scss b/.../taro-project/src/pages/detail/index.scss → .../taro-project/src/pages/detail/index.scss
diff --git a/...o-project/src/pages/index/index.config.js → ...o-project/src/pages/index/index.config.js b/...o-project/src/pages/index/index.config.js → ...o-project/src/pages/index/index.config.js
diff --git a/...nt/taro-project/src/pages/index/index.jsx → ...ed/taro-project/src/pages/index/index.jsx b/...nt/taro-project/src/pages/index/index.jsx → ...ed/taro-project/src/pages/index/index.jsx
diff --git a/...t/taro-project/src/pages/index/index.scss → ...d/taro-project/src/pages/index/index.scss b/...t/taro-project/src/pages/index/index.scss → ...d/taro-project/src/pages/index/index.scss
diff --git a/...o-native-component/taro-project/yarn.lock → examples/new-blended/taro-project/yarn.lock b/...o-native-component/taro-project/yarn.lock → examples/new-blended/taro-project/yarn.lock