@tarojs/service 3.6.6-alpha.1 → 3.6.6
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/package.json +7 -7
- package/src/Config.ts +1 -1
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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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/service",
|
|
3
|
-
"version": "3.6.6
|
|
3
|
+
"version": "3.6.6",
|
|
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
|
|
35
|
-
"@tarojs/shared": "3.6.6
|
|
36
|
-
"@tarojs/taro": "3.6.6
|
|
33
|
+
"@tarojs/helper": "3.6.6",
|
|
34
|
+
"@tarojs/shared": "3.6.6",
|
|
35
|
+
"@tarojs/taro": "3.6.6"
|
|
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'
|