Skip to content

Commit 1b7ff3e

Browse files
authored
refactor: simplify webpack config (#40)
* refactor: simplify webpack config Signed-off-by: JayFate <[email protected]> * refactor: rm dsl-xvm/src/loaders/module-loader.js Signed-off-by: JayFate <[email protected]> --------- Signed-off-by: JayFate <[email protected]>
1 parent 0c2f926 commit 1b7ff3e

File tree

8 files changed

+175
-205
lines changed

8 files changed

+175
-205
lines changed

__tests__/examples/sample.test.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,16 @@ const { Writable } = require('stream')
88
const fetch = require('node-fetch')
99
const fkill = require('fkill')
1010
const stripAnsi = require('strip-ansi')
11+
const fs = require('fs-extra')
1112
const { run, lsfiles, readZip, wipeDynamic } = require('hap-dev-utils')
1213
const { compile } = require('../../packages/hap-toolkit/lib')
1314

1415
const cwd = path.resolve(__dirname, '../../examples/sample')
1516

1617
describe('hap-toolkit', () => {
18+
const distDir = path.resolve(cwd, 'dist')
19+
fs.removeSync(distDir)
20+
1721
it(
1822
'hap-build: 默认流式打包,包内存在META-INF文件',
1923
async () => {

packages/hap-dsl-xvm/src/loaders/module-loader.js

Lines changed: 0 additions & 28 deletions
This file was deleted.

packages/hap-packager/src/plugins/handler-plugin.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
import Compilation from 'webpack/lib/Compilation'
7-
import { compileOptionsMeta, compileOptionsObject } from '@hap-toolkit/shared-utils'
7+
import { globalConfig } from '@hap-toolkit/shared-utils'
88
import { getEntryFiles } from '../common/info'
99

1010
let ConcatSource
@@ -49,7 +49,7 @@ function wrapCode(fileName, compilation, enableE2e, entryFiles) {
4949
}
5050

5151
if (entryFiles.indexOf(fileName) === -1) {
52-
if (compileOptionsObject.splitChunksMode === compileOptionsMeta.splitChunksModeEnum.SMART) {
52+
if (globalConfig.isSmartMode) {
5353
// 抽取的JS chunk的处理,不加createPageHandler
5454
return new ConcatSource(compilation.assets[fileName])
5555
}

packages/hap-packager/src/plugins/zip-plugin.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@
55

66
import fs from 'fs-extra'
77
import path from 'path'
8-
import {
9-
colorconsole,
10-
readJson,
11-
globalConfig,
12-
compileOptionsMeta,
13-
compileOptionsObject
14-
} from '@hap-toolkit/shared-utils'
8+
import { colorconsole, readJson, globalConfig, compileOptionsMeta } from '@hap-toolkit/shared-utils'
159
import { sortFilesBy, lsdirdeep, genPriorities } from '../common/utils'
1610
import { getSkeletonConfig } from '../common/info'
1711
import { DIGEST_ZIP_PATH } from '../common/constant'
@@ -322,7 +316,7 @@ ZipPlugin.prototype.apply = function (compiler) {
322316
}
323317

324318
// 抽取公共JS:app-chunks.json放在app.js之前,page-chunks.json放在app.js之后,便于流式加载
325-
if (compileOptionsObject.splitChunksMode === compileOptionsMeta.splitChunksModeEnum.SMART) {
319+
if (globalConfig.isSmartMode) {
326320
const appIndex = options.priorities.findIndex((item) => {
327321
return item === 'app.js'
328322
})

packages/hap-packager/src/webpack.post.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,7 @@
55

66
import path from 'path'
77
import { sync as resolveSync } from 'resolve'
8-
import {
9-
globalConfig,
10-
readJson,
11-
compileOptionsMeta,
12-
compileOptionsObject
13-
} from '@hap-toolkit/shared-utils'
8+
import { globalConfig, readJson, compileOptionsObject } from '@hap-toolkit/shared-utils'
149

1510
import {
1611
CopyDslPlugin,
@@ -116,7 +111,7 @@ function postHook(webpackConf, defaultsOptions, quickappConfig = {}) {
116111
}
117112

118113
// 抽取公共js(仅smart模式开启)
119-
if (compileOptionsObject.splitChunksMode === compileOptionsMeta.splitChunksModeEnum.SMART) {
114+
if (globalConfig.isSmartMode) {
120115
webpackConf.plugins.push(
121116
new SplitChunksAdaptPlugin({
122117
subpackages,

packages/hap-shared-utils/src/config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@ export default {
1818
outputPath: './build', // 输出目录,
1919
dataCoverage: './.nyc_output', // 项目运行的代码覆盖率数据
2020
command: 'build',
21-
server: { port: 8000 }
21+
server: { port: 8000 },
22+
// 代码风格规则
23+
isSmartMode: false
2224
}

packages/hap-toolkit/__tests__/__snapshots__/splitChunks.test.js.snap

Lines changed: 16 additions & 16 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)