diff --git a/examples/blended-taro-native-component/.gitignore b/examples/new-blended/.gitignore similarity index 100% rename from examples/blended-taro-native-component/.gitignore rename to examples/new-blended/.gitignore diff --git a/examples/blended-taro-native-component/README.md b/examples/new-blended/README.md similarity index 100% rename from examples/blended-taro-native-component/README.md rename to examples/new-blended/README.md diff --git a/examples/blended-taro-native-component/miniapp/app.js b/examples/new-blended/miniapp/app.js similarity index 100% rename from examples/blended-taro-native-component/miniapp/app.js rename to examples/new-blended/miniapp/app.js diff --git a/examples/blended-taro-native-component/miniapp/app.json b/examples/new-blended/miniapp/app.json similarity index 100% rename from examples/blended-taro-native-component/miniapp/app.json rename to examples/new-blended/miniapp/app.json diff --git a/examples/blended-taro-native-component/miniapp/app.wxss b/examples/new-blended/miniapp/app.wxss similarity index 100% rename from examples/blended-taro-native-component/miniapp/app.wxss rename to examples/new-blended/miniapp/app.wxss diff --git a/examples/blended-taro-native-component/miniapp/pages/index/index.js b/examples/new-blended/miniapp/pages/index/index.js similarity index 100% rename from examples/blended-taro-native-component/miniapp/pages/index/index.js rename to examples/new-blended/miniapp/pages/index/index.js diff --git a/examples/blended-taro-native-component/miniapp/pages/index/index.json b/examples/new-blended/miniapp/pages/index/index.json similarity index 100% rename from examples/blended-taro-native-component/miniapp/pages/index/index.json rename to examples/new-blended/miniapp/pages/index/index.json diff --git a/examples/blended-taro-native-component/miniapp/pages/index/index.wxml b/examples/new-blended/miniapp/pages/index/index.wxml similarity index 100% rename from examples/blended-taro-native-component/miniapp/pages/index/index.wxml rename to examples/new-blended/miniapp/pages/index/index.wxml diff --git a/examples/blended-taro-native-component/miniapp/pages/index/index.wxss b/examples/new-blended/miniapp/pages/index/index.wxss similarity index 100% rename from examples/blended-taro-native-component/miniapp/pages/index/index.wxss rename to examples/new-blended/miniapp/pages/index/index.wxss diff --git a/examples/blended-taro-native-component/miniapp/project.config.json b/examples/new-blended/miniapp/project.config.json similarity index 100% rename from examples/blended-taro-native-component/miniapp/project.config.json rename to examples/new-blended/miniapp/project.config.json diff --git a/examples/blended-taro-native-component/miniapp/project.private.config.json b/examples/new-blended/miniapp/project.private.config.json similarity index 100% rename from examples/blended-taro-native-component/miniapp/project.private.config.json rename to examples/new-blended/miniapp/project.private.config.json diff --git a/examples/blended-taro-native-component/miniapp/sitemap.json b/examples/new-blended/miniapp/sitemap.json similarity index 100% rename from examples/blended-taro-native-component/miniapp/sitemap.json rename to examples/new-blended/miniapp/sitemap.json diff --git a/examples/blended-taro-native-component/taro-project/.eslintrc b/examples/new-blended/taro-project/.eslintrc similarity index 100% rename from examples/blended-taro-native-component/taro-project/.eslintrc rename to examples/new-blended/taro-project/.eslintrc diff --git a/examples/blended-taro-native-component/taro-project/babel.config.js b/examples/new-blended/taro-project/babel.config.js similarity index 100% rename from examples/blended-taro-native-component/taro-project/babel.config.js rename to examples/new-blended/taro-project/babel.config.js diff --git a/examples/blended-taro-native-component/taro-project/config/dev.js b/examples/new-blended/taro-project/config/dev.js similarity index 100% rename from examples/blended-taro-native-component/taro-project/config/dev.js rename to examples/new-blended/taro-project/config/dev.js diff --git a/examples/blended-taro-native-component/taro-project/config/index.js b/examples/new-blended/taro-project/config/index.js similarity index 100% rename from examples/blended-taro-native-component/taro-project/config/index.js rename to examples/new-blended/taro-project/config/index.js diff --git a/examples/blended-taro-native-component/taro-project/config/prod.js b/examples/new-blended/taro-project/config/prod.js similarity index 100% rename from examples/blended-taro-native-component/taro-project/config/prod.js rename to examples/new-blended/taro-project/config/prod.js diff --git a/examples/blended-taro-native-component/taro-project/package.json b/examples/new-blended/taro-project/package.json similarity index 59% rename from examples/blended-taro-native-component/taro-project/package.json rename to examples/new-blended/taro-project/package.json index e33a487f8310..accc9cbbe99b 100644 --- a/examples/blended-taro-native-component/taro-project/package.json +++ b/examples/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/examples/blended-taro-native-component/taro-project/plugin-mv/index.js b/examples/new-blended/taro-project/plugin-mv/index.js similarity index 100% rename from examples/blended-taro-native-component/taro-project/plugin-mv/index.js rename to examples/new-blended/taro-project/plugin-mv/index.js diff --git a/examples/blended-taro-native-component/taro-project/project.config.json b/examples/new-blended/taro-project/project.config.json similarity index 100% rename from examples/blended-taro-native-component/taro-project/project.config.json rename to examples/new-blended/taro-project/project.config.json diff --git a/examples/blended-taro-native-component/taro-project/src/app.config.js b/examples/new-blended/taro-project/src/app.config.js similarity index 100% rename from examples/blended-taro-native-component/taro-project/src/app.config.js rename to examples/new-blended/taro-project/src/app.config.js diff --git a/examples/blended-taro-native-component/taro-project/src/app.js b/examples/new-blended/taro-project/src/app.js similarity index 100% rename from examples/blended-taro-native-component/taro-project/src/app.js rename to examples/new-blended/taro-project/src/app.js diff --git a/examples/blended-taro-native-component/taro-project/src/components/article/index.config.js b/examples/new-blended/taro-project/src/components/article/index.config.js similarity index 100% rename from examples/blended-taro-native-component/taro-project/src/components/article/index.config.js rename to examples/new-blended/taro-project/src/components/article/index.config.js diff --git a/examples/blended-taro-native-component/taro-project/src/components/article/index.jsx b/examples/new-blended/taro-project/src/components/article/index.jsx similarity index 100% rename from examples/blended-taro-native-component/taro-project/src/components/article/index.jsx rename to examples/new-blended/taro-project/src/components/article/index.jsx diff --git a/examples/blended-taro-native-component/taro-project/src/components/article/index.scss b/examples/new-blended/taro-project/src/components/article/index.scss similarity index 100% rename from examples/blended-taro-native-component/taro-project/src/components/article/index.scss rename to examples/new-blended/taro-project/src/components/article/index.scss diff --git a/examples/blended-taro-native-component/taro-project/src/components/common/index.jsx b/examples/new-blended/taro-project/src/components/common/index.jsx similarity index 100% rename from examples/blended-taro-native-component/taro-project/src/components/common/index.jsx rename to examples/new-blended/taro-project/src/components/common/index.jsx diff --git a/examples/blended-taro-native-component/taro-project/src/components/common/index.scss b/examples/new-blended/taro-project/src/components/common/index.scss similarity index 100% rename from examples/blended-taro-native-component/taro-project/src/components/common/index.scss rename to examples/new-blended/taro-project/src/components/common/index.scss diff --git a/examples/blended-taro-native-component/taro-project/src/components/picker/index.config.js b/examples/new-blended/taro-project/src/components/picker/index.config.js similarity index 100% rename from examples/blended-taro-native-component/taro-project/src/components/picker/index.config.js rename to examples/new-blended/taro-project/src/components/picker/index.config.js diff --git a/examples/blended-taro-native-component/taro-project/src/components/picker/index.jsx b/examples/new-blended/taro-project/src/components/picker/index.jsx similarity index 100% rename from examples/blended-taro-native-component/taro-project/src/components/picker/index.jsx rename to examples/new-blended/taro-project/src/components/picker/index.jsx diff --git a/examples/blended-taro-native-component/taro-project/src/components/picker/index.scss b/examples/new-blended/taro-project/src/components/picker/index.scss similarity index 100% rename from examples/blended-taro-native-component/taro-project/src/components/picker/index.scss rename to examples/new-blended/taro-project/src/components/picker/index.scss diff --git a/examples/blended-taro-native-component/taro-project/src/pages/detail/index.config.js b/examples/new-blended/taro-project/src/pages/detail/index.config.js similarity index 100% rename from examples/blended-taro-native-component/taro-project/src/pages/detail/index.config.js rename to examples/new-blended/taro-project/src/pages/detail/index.config.js diff --git a/examples/blended-taro-native-component/taro-project/src/pages/detail/index.jsx b/examples/new-blended/taro-project/src/pages/detail/index.jsx similarity index 100% rename from examples/blended-taro-native-component/taro-project/src/pages/detail/index.jsx rename to examples/new-blended/taro-project/src/pages/detail/index.jsx diff --git a/examples/blended-taro-native-component/taro-project/src/pages/detail/index.scss b/examples/new-blended/taro-project/src/pages/detail/index.scss similarity index 100% rename from examples/blended-taro-native-component/taro-project/src/pages/detail/index.scss rename to examples/new-blended/taro-project/src/pages/detail/index.scss diff --git a/examples/blended-taro-native-component/taro-project/src/pages/index/index.config.js b/examples/new-blended/taro-project/src/pages/index/index.config.js similarity index 100% rename from examples/blended-taro-native-component/taro-project/src/pages/index/index.config.js rename to examples/new-blended/taro-project/src/pages/index/index.config.js diff --git a/examples/blended-taro-native-component/taro-project/src/pages/index/index.jsx b/examples/new-blended/taro-project/src/pages/index/index.jsx similarity index 100% rename from examples/blended-taro-native-component/taro-project/src/pages/index/index.jsx rename to examples/new-blended/taro-project/src/pages/index/index.jsx diff --git a/examples/blended-taro-native-component/taro-project/src/pages/index/index.scss b/examples/new-blended/taro-project/src/pages/index/index.scss similarity index 100% rename from examples/blended-taro-native-component/taro-project/src/pages/index/index.scss rename to examples/new-blended/taro-project/src/pages/index/index.scss diff --git a/examples/blended-taro-native-component/taro-project/yarn.lock b/examples/new-blended/taro-project/yarn.lock similarity index 100% rename from examples/blended-taro-native-component/taro-project/yarn.lock rename to examples/new-blended/taro-project/yarn.lock