@tarojs/service 3.4.0-beta.3 → 3.5.0-canary.1

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.
Files changed (5) hide show
  1. package/dist/Config.js +2 -2
  2. package/dist/Kernel.js +1 -1
  3. package/package.json +5 -5
  4. package/src/Config.ts +1 -1
  5. package/src/Kernel.ts +1 -1
package/dist/Config.js CHANGED
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const path = require("path");
4
4
  const fs = require("fs-extra");
5
- const lodash_1 = require("lodash");
5
+ const merge = require("webpack-merge");
6
6
  const helper_1 = require("@tarojs/helper");
7
7
  const constants_1 = require("./utils/constants");
8
8
  class Config {
@@ -23,7 +23,7 @@ class Config {
23
23
  ]
24
24
  });
25
25
  try {
26
- this.initialConfig = helper_1.getModuleDefaultExport(require(this.configPath))(lodash_1.merge);
26
+ this.initialConfig = helper_1.getModuleDefaultExport(require(this.configPath))(merge);
27
27
  this.isInitSuccess = true;
28
28
  }
29
29
  catch (err) {
package/dist/Kernel.js CHANGED
@@ -58,7 +58,7 @@ class Kernel extends events_1.EventEmitter {
58
58
  Object.assign(this.paths, {
59
59
  configPath: this.config.configPath,
60
60
  sourcePath: path.join(this.appPath, this.initialConfig.sourceRoot),
61
- outputPath: path.join(this.appPath, this.initialConfig.outputRoot)
61
+ outputPath: path.resolve(this.appPath, this.initialConfig.outputRoot)
62
62
  });
63
63
  }
64
64
  this.debugger(`initPaths:${JSON.stringify(this.paths, null, 2)}`);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tarojs/service",
3
- "version": "3.4.0-beta.3",
3
+ "version": "3.5.0-canary.1",
4
4
  "description": "Taro Service",
5
5
  "main": "index.js",
6
6
  "types": "types/index.d.ts",
@@ -34,13 +34,13 @@
34
34
  "homepage": "https://github.com/NervJS/taro#readme",
35
35
  "dependencies": {
36
36
  "@hapi/joi": "17.1.1",
37
- "@tarojs/helper": "3.4.0-beta.3",
38
- "@tarojs/shared": "3.4.0-beta.3",
39
- "@tarojs/taro": "3.4.0-beta.3",
37
+ "@tarojs/helper": "3.5.0-canary.1",
38
+ "@tarojs/shared": "3.5.0-canary.1",
39
+ "@tarojs/taro": "3.5.0-canary.1",
40
40
  "fs-extra": "^8.0.1",
41
41
  "lodash": "^4.17.21",
42
42
  "resolve": "^1.6.0",
43
43
  "tapable": "^1.1.3"
44
44
  },
45
- "gitHead": "2ef7e8c10c9e5784e98bb1ad3a803d5fd6a46c8b"
45
+ "gitHead": "c61624d2f763e6d31e67d6cf9c564efc8b0d0887"
46
46
  }
package/src/Config.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import * as path from 'path'
2
2
  import * as fs from 'fs-extra'
3
3
 
4
- import { merge } from 'lodash'
4
+ import * as merge from 'webpack-merge'
5
5
  import { IProjectConfig } from '@tarojs/taro/types/compile'
6
6
  import {
7
7
  SOURCE_DIR,
package/src/Kernel.ts CHANGED
@@ -94,7 +94,7 @@ export default class Kernel extends EventEmitter {
94
94
  Object.assign(this.paths, {
95
95
  configPath: this.config.configPath,
96
96
  sourcePath: path.join(this.appPath, this.initialConfig.sourceRoot as string),
97
- outputPath: path.join(this.appPath, this.initialConfig.outputRoot as string)
97
+ outputPath: path.resolve(this.appPath, this.initialConfig.outputRoot as string)
98
98
  })
99
99
  }
100
100
  this.debugger(`initPaths:${JSON.stringify(this.paths, null, 2)}`)