Feat/init command add source root (#15991)

* feat: 增加sourceRoot参数 * feat: create page 增加 template source * feat: 增加create page clone 参数 * chore: 移除冗余的 yarn.lock * chore(release): publish 3.6.32-alpha.1 --tag=alpha * feat: 增加templates mkdirp逻辑 * chore(release): publish 3.6.32-alpha.2 --tag=alpha --------- Co-authored-by: weiyanhai <[email protected]>
NervJS · Jul 4, 2024 · 473d5ef · 473d5ef
1 parent bab6f51
commit 473d5ef
Show file tree

Hide file tree

Showing 75 changed files with 86 additions and 75 deletions.
diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/binding",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "Node binding for taro",
   "main": "binding.js",
   "typings": "binding.d.ts",

diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-darwin-arm64",
   "description": "Native binding for taro",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "os": [
     "darwin"
   ],

diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-darwin-x64",
   "description": "Native binding for taro",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "os": [
     "darwin"
   ],

diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-linux-x64-gnu",
   "description": "Native binding for taro",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "os": [
     "linux"
   ],

diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/binding-linux-x64-musl",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "os": [
     "linux"
   ],

diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-win32-x64-msvc",
   "description": "Native binding for taro",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "os": [
     "win32"
   ],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "taro",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "开放式跨端跨框架开发解决方案",
   "homepage": "https://github.com/NervJS/taro#readme",
   "author": "O2Team",

diff --git a/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json b/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-react-jsx-to-rn-stylesheet",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "Transform stylesheet selector to style in JSX Elements.",
   "license": "MIT",
   "main": "dist/index.js",

diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-taroapi",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc",

diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-taro",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "Taro babel preset",
   "author": "yuche <[email protected]>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/babel-preset-taro#readme",

diff --git a/packages/create-app/package.json b/packages/create-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/create-app",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "create taro app with one command",
   "author": "VincentW <[email protected]>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/create-app#readme",

diff --git a/packages/css-to-react-native/package.json b/packages/css-to-react-native/package.json
@@ -1,7 +1,7 @@
 {
   "name": "taro-css-to-react-native",
   "description": "Convert CSS text to a React Native stylesheet object",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "main": "dist/index.js",
   "license": "MIT",
   "files": [

diff --git a/packages/eslint-config-taro/package.json b/packages/eslint-config-taro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-taro",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "Taro specific linting rules for ESLint",
   "main": "index.js",
   "files": [

diff --git a/packages/postcss-html-transform/package.json b/packages/postcss-html-transform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-html-transform",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "transform html tag name selector",
   "main": "index.js",
   "author": "drchan",

diff --git a/packages/postcss-plugin-constparse/package.json b/packages/postcss-plugin-constparse/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-plugin-constparse",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "parse constants defined in config",
   "main": "index.js",
   "author": "Simba",

diff --git a/packages/postcss-pxtransform/package.json b/packages/postcss-pxtransform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-pxtransform",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "PostCSS plugin px 转小程序 rpx及h5 rem 单位",
   "main": "index.js",
   "keywords": [

diff --git a/packages/postcss-unit-transform/package.json b/packages/postcss-unit-transform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-taro-unit-transform",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "小程序单位转换",
   "main": "index.js",
   "scripts": {

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/shared",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "Taro utils internal use.",
   "author": "yuche <[email protected]>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/shared#readme",

diff --git a/packages/stylelint-config-taro-rn/package.json b/packages/stylelint-config-taro-rn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stylelint-config-taro-rn",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "Shareable stylelint config for React Native CSS modules",
   "main": "index.js",
   "files": [

diff --git a/packages/stylelint-taro-rn/package.json b/packages/stylelint-taro-rn/package.json
@@ -1,7 +1,7 @@
 {
   "name": "stylelint-taro-rn",
   "description": "A collection of React Native specific rules for stylelint",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "main": "dist/index.js",
   "files": [
     "dist",

diff --git a/packages/taro-alipay/package.json b/packages/taro-alipay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-platform-alipay",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "支付宝小程序平台插件",
   "author": "Chen-jj",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro-alipay#readme",

diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/api",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "Taro common API",
   "author": "yuche <[email protected]>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/api#readme",

diff --git a/packages/taro-cli-convertor/package.json b/packages/taro-cli-convertor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/cli-convertor",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "cli tool for taro-convert",
   "main": "index.js",
   "scripts": {

diff --git a/packages/taro-cli/package.json b/packages/taro-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/cli",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "cli tool for taro",
   "main": "index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/taro-cli/src/create/fetchTemplate.ts b/packages/taro-cli/src/create/fetchTemplate.ts
@@ -26,6 +26,7 @@ export default function fetchTemplate (templateSource: string, templateRootPath:
   return new Promise<void>(async (resolve) => {
     // 下载文件的缓存目录
     if (fs.existsSync(tempPath)) await fs.remove(tempPath)
+    await fs.mkdirp(templateRootPath)
     await fs.mkdir(tempPath)
 
     const spinner = ora(`正在从 ${templateSource} 拉取远程模板...`).start()

diff --git a/packages/taro-cli/src/create/page.ts b/packages/taro-cli/src/create/page.ts
@@ -13,6 +13,8 @@ export interface IPageConf {
   projectName: string
   npm: NpmType
   template: string
+  clone?: boolean
+  templateSource?: string
   description?: string
   pageName: string
   date?: string
@@ -31,6 +33,8 @@ interface ITemplateInfo {
   typescript?: boolean
   compiler?: CompilerType
   template?: string
+  templateSource?: string
+  clone?: boolean
 }
 
 type TCustomTemplateInfo = Omit<ITemplateInfo & {
@@ -123,13 +127,14 @@ export default class Page extends Creator {
       const config = await fs.readJSON(taroConfig)
       templateSource = config && config.templateSource ? config.templateSource : DEFAULT_TEMPLATE_SRC
     } else {
+      templateSource = this.conf.templateSource || DEFAULT_TEMPLATE_SRC
+
       await fs.createFile(taroConfig)
-      await fs.writeJSON(taroConfig, { templateSource: DEFAULT_TEMPLATE_SRC })
-      templateSource = DEFAULT_TEMPLATE_SRC
+      await fs.writeJSON(taroConfig, { templateSource })
     }
 
     // 从模板源下载模板
-    await fetchTemplate(templateSource, this.templatePath(''))
+    await fetchTemplate(templateSource, this.templatePath(''), this.conf.clone)
   }
 
   async create () {

diff --git a/packages/taro-cli/src/presets/commands/create.ts b/packages/taro-cli/src/presets/commands/create.ts
@@ -39,6 +39,8 @@ export default (ctx: IPluginContext) => {
       const type = options.type || createTemplateTypeEnum.PAGE
       const name = _[1] || options.name
       const description = options.description || ''
+      const templateSource = options.templateSource
+      const clone = options.clone
       const { chalk } = ctx.helper
       const { appPath } = ctx.paths
 
@@ -50,9 +52,11 @@ export default (ctx: IPluginContext) => {
 
           const Page = require('../../create/page').default
           const page = new Page({
+            clone,
             pageName: name,
             projectDir: appPath,
             description,
+            templateSource,
             async modifyCustomTemplateConfig (cb: TSetCustomTemplateConfig) {
               await ctx.applyPlugins({ name: hooks.MODIFY_CREATE_TEMPLATE, opts: cb })
             }

diff --git a/packages/taro-cli/src/presets/commands/init.ts b/packages/taro-cli/src/presets/commands/init.ts
@@ -18,9 +18,10 @@ export default (ctx: IPluginContext) => {
       // init project
       const { appPath } = ctx.paths
       const { options } = opts
-      const { projectName, templateSource, clone, template, description, typescript, css, npm, framework, compiler } = options
+      const { projectName, templateSource, clone, template, description, typescript, css, npm, framework, compiler, sourceRoot } = options
       const Project = require('../../create/project').default
       const project = new Project({
+        sourceRoot,
         projectName,
         projectDir: appPath,
         npm,

diff --git a/packages/taro-components-advanced/package.json b/packages/taro-components-advanced/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-advanced",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-library-react",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "Taro 组件库 React 版本库",
   "private": true,
   "main": "index.js",

diff --git a/packages/taro-components-library-vue2/package.json b/packages/taro-components-library-vue2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-library-vue2",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "Taro 组件库 Vue2 版本库",
   "private": true,
   "main": "index.js",

diff --git a/packages/taro-components-library-vue3/package.json b/packages/taro-components-library-vue3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-library-vue3",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "Taro 组件库 Vue3 版本库",
   "private": true,
   "main": "index.js",

diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-react",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "",
   "main:h5": "src/index.js",
   "main": "dist/index.js",

diff --git a/packages/taro-components-rn/package.json b/packages/taro-components-rn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-rn",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "多端解决方案基础组件（RN）",
   "main": "./dist/index.js",
   "scripts": {

diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "Taro 组件库",
   "browser": "dist/index.js",
   "main:h5": "dist/index.js",

diff --git a/packages/taro-extend/package.json b/packages/taro-extend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/extend",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "Taro extend functionality",
   "author": "yuche <[email protected]>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro-extend#readme",

diff --git a/packages/taro-h5/package.json b/packages/taro-h5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-h5",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "Taro h5 framework",
   "browser": "dist/index.js",
   "main:h5": "dist/index.esm.js",

diff --git a/packages/taro-helper/package.json b/packages/taro-helper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/helper",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "Taro Helper",
   "main": "index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/taro-jd/package.json b/packages/taro-jd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-platform-jd",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "京东小程序平台插件",
   "author": "Chen-jj",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro-jd#readme",

diff --git a/packages/taro-loader/package.json b/packages/taro-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-loader",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "Taro runner use webpack loader",
   "author": "yuche <[email protected]>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro-loader#readme",

diff --git a/packages/taro-mini-runner/package.json b/packages/taro-mini-runner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/mini-runner",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "Mini app runner for taro",
   "main": "index.js",
   "scripts": {

diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-platform-h5",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "Web 端平台插件",
   "author": "ZakaryCode",
   "license": "MIT",

diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-platform-harmony-hybrid",
-  "version": "3.6.32",
+  "version": "3.6.32-alpha.2",
   "description": "Harmony 端平台插件",
   "author": "ZakaryCode",
   "license": "MIT",