Skip to content

Commit a020c76

Browse files
committed
@dr-js/dev@0.4.0-dev.1
notable change: - break: use `webpack@5` - break: use `@dr-js/*@0.4.0-dev.*` - ci: unmark `windows-latest + 14.x` as unstable. issue may be fixed, check: nodejs/help#2660 and nodejs/node#33166 - script sort - package update
1 parent 532c123 commit a020c76

File tree

10 files changed

+1173
-392
lines changed

10 files changed

+1173
-392
lines changed

.github/workflows/ci-test.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,10 @@ jobs:
77
strategy:
88
fail-fast: false # allow all test to run to the end
99
matrix:
10-
os: [ ubuntu-latest, macos-latest ]
10+
os: [ ubuntu-latest, macos-latest, windows-latest ]
1111
node-version: [ 12.x, 14.x ]
12-
unstable: [ false ]
13-
include:
14-
- os: windows-latest
15-
node-version: 12.x
16-
unstable: false
17-
- os: windows-latest
18-
node-version: 14.x
19-
unstable: true # check: https://github.com/nodejs/help/issues/2660 and https://github.com/nodejs/node/issues/33166
2012

2113
runs-on: ${{ matrix.os }}
22-
continue-on-error: ${{ matrix.unstable }}
2314

2415
steps:
2516
- name: Reset Git config # fix win32 CI cause `something to commit` test error: https://github.com/actions/checkout/issues/135#issuecomment-602171132

SPEC.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,14 +229,14 @@
229229
| babel-plugin-minify-replace | ^0.5.0 |
230230
| babel-plugin-module-resolver | ^4.0.0 |
231231
| babel-plugin-styled-components | ^1.11.1 |
232-
| eslint | ^7.9.0 |
233-
| eslint-plugin-import | ^2.22.0 |
232+
| eslint | ^7.11.0 |
233+
| eslint-plugin-import | ^2.22.1 |
234234
| eslint-plugin-node | ^11.1.0 |
235235
| eslint-plugin-promise | ^4.2.1 |
236-
| eslint-plugin-react | ^7.20.6 |
236+
| eslint-plugin-react | ^7.21.4 |
237237
| prop-types | ^15.7.2 |
238-
| puppeteer | ^5.3.0 |
238+
| puppeteer | ^5.3.1 |
239239
| react | ^16.13.1 |
240240
| styled-components | ^5.2.0 |
241-
| terser | ^5.3.1 |
242-
| webpack | ^4.44.1 |
241+
| terser | ^5.3.4 |
242+
| webpack | ^5.0.0 |

package-lock.json

Lines changed: 1148 additions & 360 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "@dr-js/dev",
4-
"version": "0.4.0-dev.0",
4+
"version": "0.4.0-dev.1",
55
"description": "A collection of strange functions, for development",
66
"author": "dr-js",
77
"license": "MIT",
@@ -50,12 +50,13 @@
5050
"npm": ">=6.14"
5151
},
5252
"dependencies": {
53-
"@dr-js/core": "^0.3.0 || ^0.3.1-dev.0",
54-
"@dr-js/node": "^0.3.0 || ^0.3.1-dev.0"
53+
"@dr-js/core": "0.4.0-dev.4",
54+
"@dr-js/node": "0.4.0-dev.0"
5555
},
5656
"devDependencies": {
57-
"@dr-js/dev": "0.3.0",
58-
"@dr-js/dev-web": "0.3.0"
57+
"@dr-js/dev": "0.4.0-dev.0",
58+
"@dr-js/dev-web": "0.4.0-dev.0",
59+
"webpack": "^5.0.0"
5960
},
6061
"sideEffects": false
6162
}

resource/__config__/base-1-script/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"INIT#package.json"
66
],
77
"dependencies": {
8-
"terser": "^5.3.1"
8+
"terser": "^5.3.4"
99
},
1010
"sideEffects": false
1111
}

resource/eslint/[react]/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"eslint-config-almost-standard-jsx-v8.js"
66
],
77
"dependencies": {
8-
"eslint-plugin-react": "^7.20.6",
8+
"eslint-plugin-react": "^7.21.4",
99
"babel-eslint": "^10.1.0"
1010
}
1111
}

resource/eslint/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"eslint-config-almost-standard-v14.js"
66
],
77
"dependencies": {
8-
"eslint": "^7.9.0",
9-
"eslint-plugin-import": "^2.22.0",
8+
"eslint": "^7.11.0",
9+
"eslint-plugin-import": "^2.22.1",
1010
"eslint-plugin-node": "^11.1.0",
1111
"eslint-plugin-promise": "^4.2.1"
1212
}

resource/puppeteer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"INIT#package.json"
55
],
66
"dependencies": {
7-
"puppeteer": "^5.3.0"
7+
"puppeteer": "^5.3.1"
88
}
99
}

resource/webpack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"INIT#package.json"
55
],
66
"dependencies": {
7-
"webpack": "^4.44.1",
7+
"webpack": "^5.0.0",
88
"babel-loader": "^8.1.0"
99
}
1010
}

source/webpack.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import Webpack from 'webpack'
12
import { dirname } from 'path'
23
import { writeFileSync } from 'fs'
3-
import webpack from 'webpack'
44

55
import { binary, time, padTable } from '@dr-js/core/module/common/format'
66
import { createDirectory } from '@dr-js/core/module/node/file/Directory'
@@ -69,7 +69,7 @@ const compileWithWebpack = async ({ config, isWatch, profileOutput, namedChunkGr
6969
config.profile = true
7070
}
7171

72-
const compiler = webpack(config)
72+
const compiler = Webpack(config)
7373
const logStats = getLogStats(isWatch, logger)
7474

7575
if (isWatch) {
@@ -79,6 +79,7 @@ const compileWithWebpack = async ({ config, isWatch, profileOutput, namedChunkGr
7979
} else {
8080
logger.log('[compile] start')
8181
const stats = await new Promise((resolve, reject) => compiler.run(getStatsCheck(reject, resolve)))
82+
await new Promise((resolve, reject) => compiler.close((error, result) => error ? reject(error) : resolve(result))) // close for Webpack5
8283
logStats(stats)
8384
let statsJSON
8485
const getStatsJSON = () => {
@@ -130,20 +131,20 @@ const commonFlag = async ({
130131
}) => ({
131132
mode,
132133
bail: isProduction,
133-
target: isNodeEnv ? 'node' : 'web', // support node main modules like 'fs'
134+
target: isNodeEnv ? 'node12' : 'web', // support node main modules like 'fs'
134135
node: isNodeEnv ? false : undefined, // do not polyfill fake node environment when build for node
135136
output,
136137
entry,
137138
resolve,
138139
externals,
139140
module: { rules: [ { test: /\.js$/, use: { loader: 'babel-loader', options: babelOption } } ] },
140141
plugins: [
141-
new webpack.DefinePlugin({
142+
new Webpack.DefinePlugin({
142143
'process.env.NODE_ENV': JSON.stringify(mode),
143144
__DEV__: !isProduction,
144145
...extraDefine
145146
}),
146-
isNodeBin && new webpack.BannerPlugin({ banner: '#!/usr/bin/env node', raw: true }),
147+
isNodeBin && new Webpack.BannerPlugin({ banner: '#!/usr/bin/env node', raw: true }),
147148
...extraPluginList
148149
].filter(Boolean),
149150
optimization: { minimize: isMinimize },

0 commit comments

Comments
 (0)