@tarojs/service 3.6.6-alpha.1 → 3.6.6-alpha.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/Config.js +3 -4
- package/dist/Config.js.map +1 -1
- package/dist/platform-plugin-base/mini.js +11 -1
- package/dist/platform-plugin-base/mini.js.map +1 -1
- package/package.json +7 -7
- package/src/Config.ts +1 -1
- package/src/platform-plugin-base/mini.ts +12 -2
- package/types/platform-plugin-base/mini.d.ts +1 -8
package/dist/Config.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const helper_1 = require("@tarojs/helper");
|
|
4
|
-
const fs = require("fs-extra");
|
|
5
4
|
const ora = require("ora");
|
|
6
5
|
const path = require("path");
|
|
7
6
|
const merge = require("webpack-merge");
|
|
@@ -17,7 +16,7 @@ class Config {
|
|
|
17
16
|
this.initialGlobalConfig = {};
|
|
18
17
|
this.isInitSuccess = false;
|
|
19
18
|
this.configPath = (0, helper_1.resolveScriptPath)(path.join(this.appPath, constants_1.CONFIG_DIR_NAME, constants_1.DEFAULT_CONFIG_FILE));
|
|
20
|
-
if (!fs.existsSync(this.configPath)) {
|
|
19
|
+
if (!helper_1.fs.existsSync(this.configPath)) {
|
|
21
20
|
if (this.disableGlobalConfig)
|
|
22
21
|
return;
|
|
23
22
|
this.initGlobalConfig();
|
|
@@ -43,10 +42,10 @@ class Config {
|
|
|
43
42
|
return console.error('获取不到用户 home 路径');
|
|
44
43
|
const globalPluginConfigPath = path.join((0, helper_1.getUserHomeDir)(), helper_1.TARO_GLOBAL_CONFIG_DIR, helper_1.TARO_GLOBAL_CONFIG_FILE);
|
|
45
44
|
const spinner = ora(`开始获取 taro 全局配置文件： ${globalPluginConfigPath}`).start();
|
|
46
|
-
if (!fs.existsSync(globalPluginConfigPath))
|
|
45
|
+
if (!helper_1.fs.existsSync(globalPluginConfigPath))
|
|
47
46
|
return spinner.warn(`获取 taro 全局配置文件失败，不存在全局配置文件：${globalPluginConfigPath}`);
|
|
48
47
|
try {
|
|
49
|
-
this.initialGlobalConfig = fs.readJSONSync(globalPluginConfigPath) || {};
|
|
48
|
+
this.initialGlobalConfig = helper_1.fs.readJSONSync(globalPluginConfigPath) || {};
|
|
50
49
|
spinner.succeed('获取 taro 全局配置成功');
|
|
51
50
|
}
|
|
52
51
|
catch (e) {
|
package/dist/Config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Config.js","sourceRoot":"","sources":["../src/Config.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"Config.js","sourceRoot":"","sources":["../src/Config.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.TaroPlatformBase = void 0;
|
|
13
|
+
const helper_1 = require("@tarojs/helper");
|
|
13
14
|
const shared_1 = require("@tarojs/shared");
|
|
15
|
+
const package_1 = require("../utils/package");
|
|
14
16
|
const platform_1 = require("./platform");
|
|
15
17
|
class TaroPlatformBase extends platform_1.default {
|
|
16
18
|
constructor() {
|
|
@@ -91,7 +93,15 @@ ${exampleCommand}`));
|
|
|
91
93
|
* @param extraOptions 需要额外合入 Options 的配置项
|
|
92
94
|
*/
|
|
93
95
|
getOptions(extraOptions = {}) {
|
|
94
|
-
const { ctx,
|
|
96
|
+
const { ctx, globalObject, fileType, template } = this;
|
|
97
|
+
const config = (0, helper_1.recursiveMerge)(Object.assign({}, this.config, {
|
|
98
|
+
env: {
|
|
99
|
+
FRAMEWORK: JSON.stringify(this.config.framework),
|
|
100
|
+
TARO_ENV: JSON.stringify(this.platform),
|
|
101
|
+
TARO_PLATFORM: JSON.stringify(this.platformType),
|
|
102
|
+
TARO_VERSION: JSON.stringify((0, package_1.getPkgVersion)())
|
|
103
|
+
}
|
|
104
|
+
}));
|
|
95
105
|
return Object.assign(Object.assign(Object.assign({}, config), { nodeModulesPath: ctx.paths.nodeModulesPath, buildAdapter: config.platform, platformType: this.platformType, globalObject,
|
|
96
106
|
fileType,
|
|
97
107
|
template }), extraOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mini.js","sourceRoot":"","sources":["../../src/platform-plugin-base/mini.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA8C;AAE9C,yCAAqC;AAarC,MAAsB,gBAA8C,SAAQ,kBAAe;IAA3F;;QACE,iBAAY,GAAG,sBAAa,CAAC,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"mini.js","sourceRoot":"","sources":["../../src/platform-plugin-base/mini.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/service",
|
|
3
|
-
"version": "3.6.6-alpha.
|
|
3
|
+
"version": "3.6.6-alpha.3",
|
|
4
4
|
"description": "Taro Service",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"types": "types/index.d.ts",
|
|
@@ -24,16 +24,15 @@
|
|
|
24
24
|
},
|
|
25
25
|
"homepage": "https://github.com/NervJS/taro#readme",
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"fs-extra": "^8.1.0",
|
|
28
27
|
"joi": "^17.6.0",
|
|
29
28
|
"lodash": "^4.17.21",
|
|
30
29
|
"resolve": "^1.22.0",
|
|
31
30
|
"tapable": "^1.1.3",
|
|
32
31
|
"webpack-merge": "^4.2.2",
|
|
33
32
|
"ora": "^5.0.0",
|
|
34
|
-
"@tarojs/helper": "3.6.6-alpha.
|
|
35
|
-
"@tarojs/shared": "3.6.6-alpha.
|
|
36
|
-
"@tarojs/taro": "3.6.6-alpha.
|
|
33
|
+
"@tarojs/helper": "3.6.6-alpha.3",
|
|
34
|
+
"@tarojs/shared": "3.6.6-alpha.3",
|
|
35
|
+
"@tarojs/taro": "3.6.6-alpha.3"
|
|
37
36
|
},
|
|
38
37
|
"devDependencies": {
|
|
39
38
|
"webpack": "5.78.0"
|
|
@@ -43,7 +42,8 @@
|
|
|
43
42
|
"dev": "tsc -w",
|
|
44
43
|
"prod": "tsc",
|
|
45
44
|
"clean": "rimraf dist types",
|
|
46
|
-
"test": "jest",
|
|
47
|
-
"test:
|
|
45
|
+
"test": "cross-env NODE_ENV=jest jest",
|
|
46
|
+
"test:ci": "cross-env NODE_ENV=jest jest --ci -i --passWithNoTests",
|
|
47
|
+
"test:dev": "cross-env NODE_ENV=jest jest --watch"
|
|
48
48
|
}
|
|
49
49
|
}
|
package/src/Config.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
createSwcRegister,
|
|
3
3
|
ENTRY,
|
|
4
|
+
fs,
|
|
4
5
|
getModuleDefaultExport,
|
|
5
6
|
getUserHomeDir,
|
|
6
7
|
OUTPUT_DIR,
|
|
@@ -9,7 +10,6 @@ import {
|
|
|
9
10
|
TARO_GLOBAL_CONFIG_DIR,
|
|
10
11
|
TARO_GLOBAL_CONFIG_FILE
|
|
11
12
|
} from '@tarojs/helper'
|
|
12
|
-
import * as fs from 'fs-extra'
|
|
13
13
|
import * as ora from 'ora'
|
|
14
14
|
import * as path from 'path'
|
|
15
15
|
import * as merge from 'webpack-merge'
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { recursiveMerge } from '@tarojs/helper'
|
|
1
2
|
import { PLATFORM_TYPE } from '@tarojs/shared'
|
|
2
3
|
|
|
4
|
+
import { getPkgVersion } from '../utils/package'
|
|
3
5
|
import TaroPlatform from './platform'
|
|
4
6
|
|
|
5
7
|
import type { RecursiveTemplate, UnRecursiveTemplate } from '@tarojs/shared/dist/template'
|
|
@@ -100,8 +102,16 @@ ${exampleCommand}`))
|
|
|
100
102
|
* @param extraOptions 需要额外合入 Options 的配置项
|
|
101
103
|
*/
|
|
102
104
|
protected getOptions (extraOptions = {}) {
|
|
103
|
-
const { ctx,
|
|
104
|
-
|
|
105
|
+
const { ctx, globalObject, fileType, template } = this
|
|
106
|
+
const config = recursiveMerge(Object.assign({}, this.config, {
|
|
107
|
+
env: {
|
|
108
|
+
FRAMEWORK: JSON.stringify(this.config.framework),
|
|
109
|
+
TARO_ENV: JSON.stringify(this.platform),
|
|
110
|
+
TARO_PLATFORM: JSON.stringify(this.platformType),
|
|
111
|
+
TARO_VERSION: JSON.stringify(getPkgVersion())
|
|
112
|
+
}
|
|
113
|
+
}))
|
|
114
|
+
|
|
105
115
|
return {
|
|
106
116
|
...config,
|
|
107
117
|
nodeModulesPath: ctx.paths.nodeModulesPath,
|
|
@@ -32,14 +32,7 @@ export declare abstract class TaroPlatformBase<T extends TConfig = TConfig> exte
|
|
|
32
32
|
* 准备 mini-runner 参数
|
|
33
33
|
* @param extraOptions 需要额外合入 Options 的配置项
|
|
34
34
|
*/
|
|
35
|
-
protected getOptions(extraOptions?: {}):
|
|
36
|
-
nodeModulesPath: string;
|
|
37
|
-
buildAdapter: any;
|
|
38
|
-
platformType: PLATFORM_TYPE;
|
|
39
|
-
globalObject: string;
|
|
40
|
-
fileType: IFileType;
|
|
41
|
-
template: RecursiveTemplate | UnRecursiveTemplate;
|
|
42
|
-
};
|
|
35
|
+
protected getOptions(extraOptions?: {}): any;
|
|
43
36
|
/**
|
|
44
37
|
* 调用 mini-runner 开始编译
|
|
45
38
|
* @param extraOptions 需要额外传入 @tarojs/mini-runner 的配置项
|