Skip to content

Commit 3b2ceec

Browse files
Merge pull request #37 from privatenumber/develop
2 parents 64f73d7 + af33446 commit 3b2ceec

File tree

8 files changed

+1229
-1619
lines changed

8 files changed

+1229
-1619
lines changed

.github/workflows/release.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ jobs:
1818
node-version: 14.x
1919
- name: Install dependencies
2020
run: npx ci
21-
- name: Build
22-
run: npm run build
21+
- name: Test
22+
run: npm run test # Produces distribution via pretest
2323
- name: Lint
2424
run: npm run lint
25-
- name: Test
26-
run: npm run test --if-present
2725
- name: Release
2826
env:
2927
GH_TOKEN: ${{ secrets.GH_TOKEN }}

.github/workflows/test.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ jobs:
2424
node-version: ${{ matrix.node-version }}
2525
- name: Install dependencies
2626
run: npx ci
27-
- name: Build
28-
run: npm run build
27+
- name: Test
28+
run: npm run test
2929
- name: Lint
3030
run: npm run lint
31-
- name: Test
32-
run: npm run test --if-present

jest.config.js

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ const useWebpack5 = process.env.WEBPACK === '5';
22

33
module.exports = {
44
preset: 'es-jest',
5-
transformIgnorePatterns: [
6-
'node_modules/.pnpm(?!/(aggregate-error|indent-string|clean-stack|escape-string-regexp))',
7-
],
8-
testEnvironment: 'node',
95
moduleNameMapper: useWebpack5
106
? {
117
'^webpack$': 'webpack5',

package.json

+14-15
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"lint": "eslint .",
2828
"build": "tsc",
2929
"typecheck": "tsc --noEmit",
30+
"pretest": "npm run build",
3031
"test": "npm run test:wp4 && npm run test:wp5",
3132
"test:wp4": "jest",
3233
"test:wp5": "WEBPACK=5 jest"
@@ -39,36 +40,34 @@
3940
"lint-staged": {
4041
"*.{js,ts}": "eslint"
4142
},
43+
"peerDependencies": {
44+
"webpack": "^4.42.0 || ^5.10.0"
45+
},
4246
"dependencies": {
4347
"@types/estree": "^0.0.50",
44-
"acorn": "^8.5.0",
45-
"astring": "^1.7.5",
48+
"acorn": "^8.6.0",
49+
"astring": "^1.8.1",
4650
"has-own-prop": "^2.0.0",
4751
"magic-string": "^0.25.7",
52+
"source-map": "^0.7.3",
4853
"webpack-sources": "^2.2.0"
4954
},
5055
"devDependencies": {
51-
"@pvtnbr/eslint-config": "^0.5.0",
56+
"@pvtnbr/eslint-config": "^0.6.1",
5257
"@types/estree": "^0.0.50",
53-
"@types/jest": "^26.0.24",
58+
"@types/jest": "^27.0.3",
5459
"@types/mini-css-extract-plugin": "^2.4.0",
55-
"@types/webpack": "^4.41.31",
60+
"@types/webpack": "^4.41.32",
5661
"@types/webpack-manifest-plugin": "^3.0.5",
57-
"aggregate-error": "^4.0.0",
5862
"css-loader": "^5.2.4",
59-
"es-jest": "^1.2.0",
63+
"es-jest": "^1.5.0",
6064
"eslint": "^7.32.0",
61-
"esno": "^0.5.0",
62-
"fs-require": "^1.0.0",
6365
"husky": "^4.3.8",
64-
"jest": "^26.6.3",
65-
"lint-staged": "^10.5.4",
66-
"memfs": "^3.2.2",
66+
"jest": "^27.3.1",
67+
"lint-staged": "^12.1.2",
6768
"mini-css-extract-plugin": "^1.6.0",
68-
"source-map": "^0.7.3",
6969
"tempy": "^1.0.1",
70-
"typescript": "^4.4.4",
71-
"unionfs": "^4.4.0",
70+
"typescript": "^4.5.2",
7271
"webpack": "4.42.0",
7372
"webpack-manifest-plugin": "^3.1.1",
7473
"webpack-test-utils": "^1.1.0",

0 commit comments

Comments
 (0)