@tarojs/cli 4.0.3-alpha.4 → 4.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/create/fetchTemplate.js +4 -2
- package/dist/create/fetchTemplate.js.map +1 -1
- package/dist/create/page.js +13 -8
- package/dist/create/page.js.map +1 -1
- package/dist/presets/commands/create.js +6 -0
- package/dist/presets/commands/create.js.map +1 -1
- package/package.json +10 -10
- package/src/create/fetchTemplate.ts +4 -2
- package/src/create/page.ts +12 -10
- package/src/presets/commands/create.ts +6 -0
|
@@ -100,7 +100,9 @@ function fetchTemplate(templateSource, templateRootPath, clone) {
|
|
|
100
100
|
const creatorFile = path.join(templateRootPath, name, constants_1.TEMPLATE_CREATOR);
|
|
101
101
|
if (!helper_1.fs.existsSync(creatorFile))
|
|
102
102
|
return { name, value: name };
|
|
103
|
-
const { name: displayName, platforms = '', desc = '', compiler } = require(creatorFile);
|
|
103
|
+
const { name: displayName, platforms = '', desc = '', isPrivate = false, compiler } = require(creatorFile);
|
|
104
|
+
if (isPrivate)
|
|
105
|
+
return null;
|
|
104
106
|
return {
|
|
105
107
|
name: displayName || name,
|
|
106
108
|
value: name,
|
|
@@ -108,7 +110,7 @@ function fetchTemplate(templateSource, templateRootPath, clone) {
|
|
|
108
110
|
compiler,
|
|
109
111
|
desc
|
|
110
112
|
};
|
|
111
|
-
});
|
|
113
|
+
}).filter(Boolean);
|
|
112
114
|
return Promise.resolve(res);
|
|
113
115
|
}
|
|
114
116
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchTemplate.js","sourceRoot":"","sources":["../../src/create/fetchTemplate.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"fetchTemplate.js","sourceRoot":"","sources":["../../src/create/fetchTemplate.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,kCAAiC;AAEjC,2CAA0C;AAC1C,kCAAiC;AACjC,iCAAyB;AACzB,8CAA6C;AAC7C,2BAA0B;AAE1B,kCAAqE;AACrE,2CAA8C;AAU9C,MAAM,oBAAoB,GAAG,WAAW,CAAA;AAExC,SAAwB,aAAa,CAAE,cAAsB,EAAE,gBAAwB,EAAE,KAAe;IACtG,MAAM,IAAI,GAAG,IAAA,4BAAqB,EAAC,cAAc,CAAC,CAAA;IAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAA;IAClE,IAAI,IAAY,CAAA;IAChB,qDAAqD;IACrD,OAAO,IAAI,OAAO,CAAO,CAAO,OAAO,EAAE,EAAE;QACzC,YAAY;QACZ,IAAI,WAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;YAAE,MAAM,WAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACtD,MAAM,WAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;QACjC,MAAM,WAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAExB,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,cAAc,YAAY,CAAC,CAAC,KAAK,EAAE,CAAA;QAE9D,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YACnB,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAA;YACpC,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAM,KAAK,EAAC,EAAE;gBAC3E,IAAI,KAAK,EAAE,CAAC;oBACV,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;oBAClB,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;oBACrB,OAAO,CAAC,IAAI,CAAC,cAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAA;oBACtC,MAAM,WAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;oBACzB,OAAO,OAAO,EAAE,CAAA;gBAClB,CAAC;gBACD,OAAO,CAAC,KAAK,GAAG,OAAO,CAAA;gBACvB,OAAO,CAAC,OAAO,CAAC,GAAG,cAAK,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;gBAC/C,OAAO,EAAE,CAAA;YACX,CAAC,CAAA,CAAC,CAAA;QACJ,CAAC;aAAM,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YAC1B,sCAAsC;YACtC,IAAI,GAAG,iBAAiB,CAAA;YACxB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,GAAG,MAAM,CAAC,CAAA;YAClD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;YAC3C,eAAK,CAAC,GAAG,CAAgB,cAAc,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC;iBACjE,IAAI,CAAC,QAAQ,CAAC,EAAE;gBACf,MAAM,EAAE,GAAG,WAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;gBACxC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;gBACtB,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;oBACnB,QAAQ;oBACR,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,CAAA;oBAC/B,GAAG,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;oBACjC,MAAM,KAAK,GAAG,IAAA,2BAAoB,EAAC,SAAS,CAAC,CAAC,MAAM,CAClD,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CACnF,CAAA;oBAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBACvB,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;wBACrB,OAAO,CAAC,IAAI,CAAC,cAAK,CAAC,GAAG,CAAC,gBAAgB,IAAI,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAA;wBACnE,OAAO,OAAO,EAAE,CAAA;oBAClB,CAAC;oBACD,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;oBAErC,OAAO,CAAC,KAAK,GAAG,OAAO,CAAA;oBACvB,OAAO,CAAC,OAAO,CAAC,GAAG,cAAK,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;oBAC/C,OAAO,EAAE,CAAA;gBACX,CAAC,CAAC,CAAA;gBACF,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,GAAG,MAAM,KAAK,CAAA,CAAC,CAAC,CAAC,CAAA;YAC1C,CAAC,CAAC;iBACD,KAAK,CAAC,CAAM,KAAK,EAAC,EAAE;gBACnB,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;gBACrB,OAAO,CAAC,IAAI,CAAC,cAAK,CAAC,GAAG,CAAC,gBAAgB,KAAK,EAAE,CAAC,CAAC,CAAA;gBAChD,MAAM,WAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;gBACzB,OAAO,OAAO,EAAE,CAAA;YAClB,CAAC,CAAA,CAAC,CAAA;QACN,CAAC;IACH,CAAC,CAAA,CAAC,CAAC,IAAI,CAAC,GAAS,EAAE;QACjB,MAAM,cAAc,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAE5D,eAAe;QACf,IAAI,CAAC,WAAE,CAAC,UAAU,CAAC,cAAc,CAAC;YAAE,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAE9D,MAAM,eAAe,GAAG,CAAC,CACvB,WAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;YACxD,WAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC,CAC9D,CAAA;QAED,IAAI,eAAe,EAAE,CAAC;YACpB,MAAM;YACN,MAAM,KAAK,GAAG,IAAA,2BAAoB,EAAC,cAAc,CAAC;iBAC/C,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC;iBAC1F,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACzB,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBACf,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,CAAA;gBAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAA;gBAC9C,OAAO,WAAE,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;YAChD,CAAC,CAAC,CACH,CAAA;YACD,MAAM,WAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;YAEzB,MAAM,GAAG,GAAiB,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBACzC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,EAAE,4BAAgB,CAAC,CAAA;gBAEvE,IAAI,CAAC,WAAE,CAAC,UAAU,CAAC,WAAW,CAAC;oBAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;gBAC7D,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,GAAG,EAAE,EAAE,IAAI,GAAG,EAAE,EAAE,SAAS,GAAG,KAAK,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;gBAC1G,IAAI,SAAS;oBAAE,OAAO,IAAI,CAAA;gBAE1B,OAAO;oBACL,IAAI,EAAE,WAAW,IAAI,IAAI;oBACzB,KAAK,EAAE,IAAI;oBACX,SAAS;oBACT,QAAQ;oBACR,IAAI;iBACL,CAAA;YACH,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAiB,CAAA;YAElC,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAC7B,CAAC;aAAM,CAAC;YACN,MAAM;YACN,MAAM,WAAE,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;YACrF,MAAM,WAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;YAEzB,IAAI,GAAG,GAAe,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;YAEvF,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,EAAE,4BAAgB,CAAC,CAAA;YAEvE,IAAI,WAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC/B,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,GAAG,EAAE,EAAE,IAAI,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;gBAEvF,GAAG,GAAG;oBACJ,IAAI,EAAE,WAAW,IAAI,IAAI;oBACzB,KAAK,EAAE,IAAI;oBACX,SAAS;oBACT,QAAQ;oBACR,IAAI,EAAE,IAAI,IAAI,cAAc;iBAC7B,CAAA;YACH,CAAC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC;AAlID,gCAkIC"}
|
package/dist/create/page.js
CHANGED
|
@@ -123,16 +123,21 @@ class Page extends creator_1.default {
|
|
|
123
123
|
let templateSource = helper_1.DEFAULT_TEMPLATE_SRC;
|
|
124
124
|
if (!homedir)
|
|
125
125
|
helper_1.chalk.yellow('找不到用户根目录，使用默认模版源！');
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
if (helper_1.fs.existsSync(taroConfig)) {
|
|
129
|
-
const config = yield helper_1.fs.readJSON(taroConfig);
|
|
130
|
-
templateSource = config && config.templateSource ? config.templateSource : helper_1.DEFAULT_TEMPLATE_SRC;
|
|
126
|
+
if (this.conf.templateSource) {
|
|
127
|
+
templateSource = this.conf.templateSource;
|
|
131
128
|
}
|
|
132
129
|
else {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
130
|
+
const taroConfigPath = path.join(homedir, helper_1.TARO_CONFIG_FOLDER);
|
|
131
|
+
const taroConfig = path.join(taroConfigPath, helper_1.TARO_BASE_CONFIG);
|
|
132
|
+
if (helper_1.fs.existsSync(taroConfig)) {
|
|
133
|
+
const config = yield helper_1.fs.readJSON(taroConfig);
|
|
134
|
+
templateSource = config && config.templateSource ? config.templateSource : helper_1.DEFAULT_TEMPLATE_SRC;
|
|
135
|
+
}
|
|
136
|
+
else {
|
|
137
|
+
yield helper_1.fs.createFile(taroConfig);
|
|
138
|
+
yield helper_1.fs.writeJSON(taroConfig, { templateSource });
|
|
139
|
+
templateSource = helper_1.DEFAULT_TEMPLATE_SRC;
|
|
140
|
+
}
|
|
136
141
|
}
|
|
137
142
|
// 从模板源下载模板
|
|
138
143
|
yield (0, fetchTemplate_1.default)(templateSource, this.templatePath(''), this.conf.clone);
|
package/dist/create/page.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/create/page.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/create/page.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,9 @@ exports.default = (ctx) => {
|
|
|
31
31
|
const description = options.description || '';
|
|
32
32
|
const afterCreate = options.afterCreate;
|
|
33
33
|
const templateSource = options.templateSource;
|
|
34
|
+
const framework = options.framework;
|
|
35
|
+
const css = options.css;
|
|
36
|
+
const typescript = options.typescript;
|
|
34
37
|
const clone = options.clone;
|
|
35
38
|
const { chalk } = ctx.helper;
|
|
36
39
|
const { appPath } = ctx.paths;
|
|
@@ -43,6 +46,9 @@ exports.default = (ctx) => {
|
|
|
43
46
|
const page = new Page({
|
|
44
47
|
clone,
|
|
45
48
|
subPkg: options.subpkg,
|
|
49
|
+
framework,
|
|
50
|
+
css,
|
|
51
|
+
typescript,
|
|
46
52
|
pageDir: options.dir,
|
|
47
53
|
pageName: name,
|
|
48
54
|
projectDir: appPath,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/presets/commands/create.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,qCAAoC;AAwBpC,kBAAe,CAAC,GAAmB,EAAE,EAAE;IACrC,GAAG,CAAC,eAAe,CAAC;QAClB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,eAAe,EAAE,IAAI;YACrB,aAAa,EAAE,IAAI;YACnB,mBAAmB,EAAE,MAAM;YAC3B,6BAA6B,EAAE,IAAI;YACnC,eAAe,EAAE,4DAA4D;SAC9E;QACD,YAAY,EAAE;YACZ,kBAAkB;YAClB,4CAA4C;YAC5C,6CAA6C;SAC9C;QACD,EAAE,CAAE,EAAE,CAAC,EAAE,OAAO,EAAE;YAChB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,4CAA+B,CAAA;YACxD,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,CAAA;YACjC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,EAAE,CAAA;YAC7C,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAA;YACvC,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,CAAA;YAC7C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAA;YAC3B,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,MAAM,CAAA;YAC5B,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,KAAK,CAAA;YAE7B,QAAQ,IAAI,EAAE,CAAC;gBACb,6CAAgC,CAAC,CAAC,CAAC;oBACjC,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;wBAC7B,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAA;oBAC/C,CAAC;oBAED,MAAM,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAA;oBACjD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC;wBACpB,KAAK;wBACL,MAAM,EAAE,OAAO,CAAC,MAAM;wBACtB,OAAO,EAAE,OAAO,CAAC,GAAG;wBACpB,QAAQ,EAAE,IAAI;wBACd,UAAU,EAAE,OAAO;wBACnB,WAAW;wBACX,cAAc;wBACd,WAAW;wBACL,0BAA0B,CAAE,EAA4B;;gCAC5D,MAAM,GAAG,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,sBAAsB,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;4BAC1E,CAAC;yBAAA;qBACF,CAAC,CAAA;oBAEF,IAAI,CAAC,MAAM,EAAE,CAAA;oBACb,MAAK;gBACP,CAAC;gBACD,kEAA2C;gBAC3C,8DAAyC;gBACzC;oBACA,CAAC;wBACC,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;4BAC7B,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAA;wBAC/C,CAAC;wBAED,MAAM,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC,OAAO,CAAA;wBACrD,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;4BACxB,UAAU,EAAE,IAAI;4BAChB,UAAU,EAAE,OAAO;4BACnB,IAAI;4BACJ,WAAW;4BACX,QAAQ,EAAE,gBAAgB;yBAC3B,CAAC,CAAA;wBAEF,MAAM,CAAC,MAAM,EAAE,CAAA;wBACf,MAAK;oBACP,CAAC;gBACD;oBACE,MAAK;YACT,CAAC;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/presets/commands/create.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/cli",
|
|
3
|
-
"version": "4.0.3
|
|
3
|
+
"version": "4.0.3",
|
|
4
4
|
"description": "cli tool for taro",
|
|
5
5
|
"author": "O2Team",
|
|
6
6
|
"license": "MIT",
|
|
@@ -41,21 +41,21 @@
|
|
|
41
41
|
"ora": "^5.4.1",
|
|
42
42
|
"semver": "^7.6.0",
|
|
43
43
|
"validate-npm-package-name": "^5.0.0",
|
|
44
|
-
"@tarojs/binding": "4.0.3
|
|
45
|
-
"@tarojs/helper": "4.0.3
|
|
46
|
-
"@tarojs/service": "4.0.3
|
|
47
|
-
"@tarojs/shared": "4.0.3
|
|
44
|
+
"@tarojs/binding": "4.0.3",
|
|
45
|
+
"@tarojs/helper": "4.0.3",
|
|
46
|
+
"@tarojs/service": "4.0.3",
|
|
47
|
+
"@tarojs/shared": "4.0.3"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
50
|
"@babel/types": "^7.24.0",
|
|
51
51
|
"@types/babel__traverse": "^7.20.2",
|
|
52
52
|
"eslint-plugin-react": "^7.34.1",
|
|
53
53
|
"eslint-plugin-react-hooks": "^4.4.0",
|
|
54
|
-
"@tarojs/taro": "4.0.3
|
|
55
|
-
"@tarojs/plugin-platform-weapp": "4.0.3
|
|
56
|
-
"@tarojs/webpack5-runner": "4.0.3
|
|
57
|
-
"
|
|
58
|
-
"
|
|
54
|
+
"@tarojs/taro": "4.0.3",
|
|
55
|
+
"@tarojs/plugin-platform-weapp": "4.0.3",
|
|
56
|
+
"@tarojs/webpack5-runner": "4.0.3",
|
|
57
|
+
"@tarojs/plugin-platform-h5": "4.0.3",
|
|
58
|
+
"babel-preset-taro": "4.0.3"
|
|
59
59
|
},
|
|
60
60
|
"scripts": {
|
|
61
61
|
"prod": "pnpm run build",
|
|
@@ -112,7 +112,8 @@ export default function fetchTemplate (templateSource: string, templateRootPath:
|
|
|
112
112
|
const creatorFile = path.join(templateRootPath, name, TEMPLATE_CREATOR)
|
|
113
113
|
|
|
114
114
|
if (!fs.existsSync(creatorFile)) return { name, value: name }
|
|
115
|
-
const { name: displayName, platforms = '', desc = '', compiler } = require(creatorFile)
|
|
115
|
+
const { name: displayName, platforms = '', desc = '', isPrivate = false, compiler } = require(creatorFile)
|
|
116
|
+
if (isPrivate) return null
|
|
116
117
|
|
|
117
118
|
return {
|
|
118
119
|
name: displayName || name,
|
|
@@ -121,7 +122,8 @@ export default function fetchTemplate (templateSource: string, templateRootPath:
|
|
|
121
122
|
compiler,
|
|
122
123
|
desc
|
|
123
124
|
}
|
|
124
|
-
})
|
|
125
|
+
}).filter(Boolean) as ITemplates[]
|
|
126
|
+
|
|
125
127
|
return Promise.resolve(res)
|
|
126
128
|
} else {
|
|
127
129
|
// 单模板
|
package/src/create/page.ts
CHANGED
|
@@ -162,17 +162,19 @@ export default class Page extends Creator {
|
|
|
162
162
|
let templateSource = DEFAULT_TEMPLATE_SRC
|
|
163
163
|
if (!homedir) chalk.yellow('找不到用户根目录，使用默认模版源！')
|
|
164
164
|
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
if (fs.existsSync(taroConfig)) {
|
|
169
|
-
const config = await fs.readJSON(taroConfig)
|
|
170
|
-
templateSource = config && config.templateSource ? config.templateSource : DEFAULT_TEMPLATE_SRC
|
|
165
|
+
if (this.conf.templateSource) {
|
|
166
|
+
templateSource = this.conf.templateSource
|
|
171
167
|
} else {
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
168
|
+
const taroConfigPath = path.join(homedir, TARO_CONFIG_FOLDER)
|
|
169
|
+
const taroConfig = path.join(taroConfigPath, TARO_BASE_CONFIG)
|
|
170
|
+
if (fs.existsSync(taroConfig)) {
|
|
171
|
+
const config = await fs.readJSON(taroConfig)
|
|
172
|
+
templateSource = config && config.templateSource ? config.templateSource : DEFAULT_TEMPLATE_SRC
|
|
173
|
+
} else {
|
|
174
|
+
await fs.createFile(taroConfig)
|
|
175
|
+
await fs.writeJSON(taroConfig, { templateSource })
|
|
176
|
+
templateSource = DEFAULT_TEMPLATE_SRC
|
|
177
|
+
}
|
|
176
178
|
}
|
|
177
179
|
|
|
178
180
|
// 从模板源下载模板
|
|
@@ -43,6 +43,9 @@ export default (ctx: IPluginContext) => {
|
|
|
43
43
|
const description = options.description || ''
|
|
44
44
|
const afterCreate = options.afterCreate
|
|
45
45
|
const templateSource = options.templateSource
|
|
46
|
+
const framework = options.framework
|
|
47
|
+
const css = options.css
|
|
48
|
+
const typescript = options.typescript
|
|
46
49
|
const clone = options.clone
|
|
47
50
|
const { chalk } = ctx.helper
|
|
48
51
|
const { appPath } = ctx.paths
|
|
@@ -57,6 +60,9 @@ export default (ctx: IPluginContext) => {
|
|
|
57
60
|
const page = new Page({
|
|
58
61
|
clone,
|
|
59
62
|
subPkg: options.subpkg,
|
|
63
|
+
framework,
|
|
64
|
+
css,
|
|
65
|
+
typescript,
|
|
60
66
|
pageDir: options.dir,
|
|
61
67
|
pageName: name,
|
|
62
68
|
projectDir: appPath,
|