Skip to content

Commit 3ab23dc

Browse files
seebeesseebees
committed
chore: WebPack 5 build updates
Upgrade several testing dependencies. The largest change was removing support for the way we were doing code coverage. Compile source and tests in one go.
1 parent 417db72 commit 3ab23dc

File tree

62 files changed

+194
-185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+194
-185
lines changed

‎.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ module.exports = {
2525
'plugin:@typescript-eslint/recommended',
2626
'prettier',
2727
],
28-
ignorePatterns: ['node_modules/'],
28+
ignorePatterns: ['node_modules/', '*.d.ts'],
2929
rules: {
3030
// These are the most useful linting rules.
3131
// They rely on types so they are the slowest rules,

‎.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.d.ts

‎modules/cache-material/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
"tslib": "^2.2.0"
2626
},
2727
"sideEffects": false,
28-
"main": "./build/main/index.js",
29-
"module": "./build/module/index.js",
30-
"types": "./build/main/index.d.ts",
28+
"main": "./build/main/src/index.js",
29+
"module": "./build/module/src/index.js",
30+
"types": "./build/main/src/index.d.ts",
3131
"files": [
32-
"build/**/*"
32+
"build/**/src/*"
3333
]
3434
}

‎modules/cache-material/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"extends": "../tsconfig.settings.json",
33
"compilerOptions": {
44
"outDir": "build/main",
5-
"rootDir": "./src"
5+
"rootDir": "./"
66
},
7-
"include": ["src/**/*.ts"],
7+
"include": ["src/**/*.ts", "test/**/*.ts"],
88
"exclude": ["node_modules/**"],
99
"references": [
1010
{ "path": "../material-management" },

‎modules/caching-materials-manager-browser/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
"tslib": "^2.2.0"
2828
},
2929
"sideEffects": false,
30-
"main": "./build/main/index.js",
31-
"module": "./build/module/index.js",
32-
"types": "./build/main/index.d.ts",
30+
"main": "./build/main/src/index.js",
31+
"module": "./build/module/src/index.js",
32+
"types": "./build/main/src/index.d.ts",
3333
"files": [
34-
"build/**/*"
34+
"build/**/src/*"
3535
]
3636
}

‎modules/caching-materials-manager-browser/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"extends": "../tsconfig.settings.json",
33
"compilerOptions": {
44
"outDir": "build/main",
5-
"rootDir": "./src"
5+
"rootDir": "./"
66
},
7-
"include": ["src/**/*.ts"],
7+
"include": ["src/**/*.ts", "test/**/*.ts"],
88
"exclude": ["node_modules/**"],
99
"references": [
1010
{ "path": "../material-management-browser" },

‎modules/caching-materials-manager-node/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
"tslib": "^2.2.0"
2424
},
2525
"sideEffects": false,
26-
"main": "./build/main/index.js",
27-
"module": "./build/module/index.js",
28-
"types": "./build/main/index.d.ts",
26+
"main": "./build/main/src/index.js",
27+
"module": "./build/module/src/index.js",
28+
"types": "./build/main/src/index.d.ts",
2929
"files": [
30-
"build/**/*"
30+
"build/**/src/*"
3131
]
3232
}

‎modules/caching-materials-manager-node/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"extends": "../tsconfig.settings.json",
33
"compilerOptions": {
44
"outDir": "build/main",
5-
"rootDir": "./src"
5+
"rootDir": "./"
66
},
7-
"include": ["src/**/*.ts"],
7+
"include": ["src/**/*.ts", "test/**/*.ts"],
88
"exclude": ["node_modules/**"],
99
"references": [
1010
{ "path": "../material-management-node" },

‎modules/client-browser/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
"tslib": "^2.2.0"
3535
},
3636
"sideEffects": false,
37-
"main": "./build/main/index.js",
38-
"module": "./build/module/index.js",
39-
"types": "./build/main/index.d.ts",
37+
"main": "./build/main/src/index.js",
38+
"module": "./build/module/src/index.js",
39+
"types": "./build/main/src/index.d.ts",
4040
"files": [
41-
"build/**/*"
41+
"build/**/src/*"
4242
]
4343
}

‎modules/client-browser/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"extends": "../tsconfig.settings.json",
33
"compilerOptions": {
44
"outDir": "build/main",
5-
"rootDir": "./src"
5+
"rootDir": "./"
66
},
7-
"include": ["src/**/*.ts"],
7+
"include": ["src/**/*.ts", "test/**/*.ts"],
88
"exclude": ["node_modules/**"],
99
"references": [
1010
{ "path": "../encrypt-browser" },

‎modules/client-node/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
"tslib": "^2.2.0"
3434
},
3535
"sideEffects": false,
36-
"main": "./build/main/index.js",
37-
"types": "./build/main/index.d.ts",
36+
"main": "./build/main/src/index.js",
37+
"types": "./build/main/src/index.d.ts",
3838
"files": [
39-
"build/**/*"
39+
"build/**/src/*"
4040
]
4141
}

‎modules/client-node/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"extends": "../tsconfig.settings.json",
33
"compilerOptions": {
44
"outDir": "build/main",
5-
"rootDir": "./src"
5+
"rootDir": "./"
66
},
7-
"include": ["src/**/*.ts"],
7+
"include": ["src/**/*.ts", "test/**/*.ts"],
88
"exclude": ["node_modules/**"],
99
"references": [
1010
{ "path": "../encrypt-node" },

‎modules/decrypt-browser/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
"tslib": "^2.2.0"
2424
},
2525
"sideEffects": false,
26-
"main": "./build/main/index.js",
27-
"module": "./build/module/index.js",
28-
"types": "./build/main/index.d.ts",
26+
"main": "./build/main/src/index.js",
27+
"module": "./build/module/src/index.js",
28+
"types": "./build/main/src/index.d.ts",
2929
"files": [
30-
"build/**/*"
30+
"build/**/src/*"
3131
]
3232
}

‎modules/decrypt-browser/tsconfig.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
"extends": "../tsconfig.settings.json",
33
"compilerOptions": {
44
"outDir": "build/main",
5-
"rootDir": "./src"
5+
"rootDir": "./"
66
},
7-
"include": ["src/**/*.ts"],
7+
"include": ["src/**/*.ts", "test/**/*.ts"],
88
"exclude": ["node_modules/**"],
99
"references": [
1010
{ "path": "../material-management-browser" },
11-
{ "path": "../serialize" }
11+
{ "path": "../serialize" },
12+
{ "path": "../kms-keyring-browser" }
1213
]
1314
}

‎modules/decrypt-node/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
"tslib": "^2.2.0"
2727
},
2828
"sideEffects": false,
29-
"main": "./build/main/index.js",
30-
"module": "./build/module/index.js",
31-
"types": "./build/main/index.d.ts",
29+
"main": "./build/main/src/index.js",
30+
"module": "./build/module/src/index.js",
31+
"types": "./build/main/src/index.d.ts",
3232
"files": [
33-
"build/**/*"
33+
"build/**/src/*"
3434
]
3535
}

‎modules/decrypt-node/tsconfig.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
"extends": "../tsconfig.settings.json",
33
"compilerOptions": {
44
"outDir": "build/main",
5-
"rootDir": "./src"
5+
"rootDir": "./"
66
},
7-
"include": ["src/**/*.ts"],
7+
"include": ["src/**/*.ts", "test/**/*.ts"],
88
"exclude": ["node_modules/**"],
99
"references": [
1010
{ "path": "../material-management-node" },
11-
{ "path": "../serialize" }
11+
{ "path": "../serialize" },
12+
{ "path": "../kms-keyring-node" }
1213
]
1314
}

‎modules/encrypt-browser/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
"tslib": "^2.2.0"
2525
},
2626
"sideEffects": false,
27-
"main": "./build/main/index.js",
28-
"module": "./build/module/index.js",
29-
"types": "./build/main/index.d.ts",
27+
"main": "./build/main/src/index.js",
28+
"module": "./build/module/src/index.js",
29+
"types": "./build/main/src/index.d.ts",
3030
"files": [
31-
"build/**/*"
31+
"build/**/src/*"
3232
]
3333
}

‎modules/encrypt-browser/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"extends": "../tsconfig.settings.json",
33
"compilerOptions": {
44
"outDir": "build/main",
5-
"rootDir": "./src"
5+
"rootDir": "./"
66
},
7-
"include": ["src/**/*.ts"],
7+
"include": ["src/**/*.ts", "test/**/*.ts"],
88
"exclude": ["node_modules/**"],
99
"references": [
1010
{ "path": "../material-management-browser" },

‎modules/encrypt-node/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
"tslib": "^2.2.0"
2626
},
2727
"sideEffects": false,
28-
"main": "./build/main/index.js",
29-
"module": "./build/module/index.js",
30-
"types": "./build/main/index.d.ts",
28+
"main": "./build/main/src/index.js",
29+
"module": "./build/module/src/index.js",
30+
"types": "./build/main/src/index.d.ts",
3131
"files": [
32-
"build/**/*"
32+
"build/**/src/*"
3333
]
3434
}

‎modules/encrypt-node/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"extends": "../tsconfig.settings.json",
33
"compilerOptions": {
44
"outDir": "build/main",
5-
"rootDir": "./src"
5+
"rootDir": "./"
66
},
7-
"include": ["src/**/*.ts"],
7+
"include": ["src/**/*.ts", "test/**/*.ts"],
88
"exclude": ["node_modules/**"],
99
"references": [
1010
{ "path": "../material-management-node" },

‎modules/example-browser/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"webpack": "^4.42.1",
4343
"webpack-cli": "4.6.0"
4444
},
45-
"main": "./build/main/index.js",
46-
"module": "./build/module/index.js",
45+
"main": "./build/main/src/index.js",
46+
"module": "./build/module/src/index.js",
4747
"types": "./build/main/index.d.ts"
4848
}

‎modules/example-browser/tsconfig.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
"extends": "../tsconfig.settings.json",
33
"compilerOptions": {
44
"outDir": "build/main",
5-
"rootDir": "./src"
5+
"rootDir": "./",
6+
"allowJs": true,
67
},
7-
"include": ["src/**/*.ts"],
8+
"include": ["src/**/*.ts", "test/**/*.ts", "src/**/*.js"],
89
"exclude": ["node_modules/**"],
910
"references": [
1011
{ "path": "../client-browser" }

‎modules/example-node/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
"tslib": "^2.2.0"
2323
},
2424
"sideEffects": false,
25-
"main": "./build/main/index.js",
26-
"module": "./build/module/index.js",
27-
"types": "./build/main/index.d.ts",
25+
"main": "./build/main/src/index.js",
26+
"module": "./build/module/src/index.js",
27+
"types": "./build/main/src/index.d.ts",
2828
"files": [
29-
"build/**/*"
29+
"build/**/src/*"
3030
]
3131
}

‎modules/example-node/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"extends": "../tsconfig.settings.json",
33
"compilerOptions": {
44
"outDir": "build/main",
5-
"rootDir": "./src"
5+
"rootDir": "./"
66
},
7-
"include": ["src/**/*.ts"],
7+
"include": ["src/**/*.ts", "test/**/*.ts"],
88
"exclude": ["node_modules/**"],
99
"references": [
1010
{ "path": "../client-node" }

‎modules/hkdf-node/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
"tslib": "^2.2.0"
2424
},
2525
"sideEffects": false,
26-
"main": "./build/main/index.js",
27-
"module": "./build/module/index.js",
28-
"types": "./build/main/index.d.ts",
26+
"main": "./build/main/src/index.js",
27+
"module": "./build/module/src/index.js",
28+
"types": "./build/main/src/index.d.ts",
2929
"files": [
30-
"build/**/*"
30+
"build/**/src/*"
3131
],
3232
"standard": {
3333
"fix": true,

‎modules/hkdf-node/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"extends": "../tsconfig.settings.json",
33
"compilerOptions": {
44
"outDir": "build/main",
5-
"rootDir": "./src"
5+
"rootDir": "./"
66
},
7-
"include": ["src/**/*.ts"],
7+
"include": ["src/**/*.ts", "test/**/*.ts"],
88
"exclude": ["node_modules/**"]
99
}

‎modules/integration-browser/package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,29 +26,29 @@
2626
"@trust/keyto": "^1.0.1",
2727
"@types/got": "^9.6.9",
2828
"@types/stream-to-promise": "^2.2.0",
29-
"@types/yargs": "^15.0.3",
30-
"@types/yauzl": "^2.9.1",
29+
"@types/yargs": "^17.0.1",
30+
"buffer": "^6.0.3",
3131
"got": "^11.8.0",
3232
"jasmine-core": "^3.5.0",
33-
"karma": "6.3.2",
33+
"karma": "^6.3.4",
3434
"karma-chrome-launcher": "^3.1.0",
3535
"karma-jasmine": "^4.0.1",
3636
"karma-json-fixtures-preprocessor": "0.0.6",
3737
"karma-parallel": "^0.3.1",
38-
"karma-webpack": "^4.0.2",
38+
"karma-webpack": "^5.0.0",
39+
"null-loader": "^4.0.1",
3940
"stream-to-promise": "^3.0.0",
40-
"tslib": "^2.2.0",
41-
"webpack": "^4.42.1",
42-
"yargs": "^15.3.1",
43-
"yauzl": "^2.10.0"
41+
"tslib": "^2.3.0",
42+
"webpack": "^5.42.0",
43+
"yargs": "^17.0.1"
4444
},
4545
"sideEffects": false,
46-
"main": "./build/main/index.js",
47-
"module": "./build/module/index.js",
48-
"types": "./build/main/index.d.ts",
49-
"bin": "./build/main/cli.js",
46+
"main": "./build/main/src/index.js",
47+
"module": "./build/module/src/index.js",
48+
"types": "./build/main/src/index.d.ts",
49+
"bin": "./build/main/src/cli.js",
5050
"files": [
51-
"build/**/*",
51+
"build/**/src/*",
5252
"karma.conf.js"
5353
]
5454
}

‎modules/integration-browser/src/cli.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ const cli = yargs
7878
},
7979
})
8080
.demandCommand()
81-
const fixtures = join(__dirname, '../../fixtures')
81+
// This path needs to agree with the path in `karma.conf.js`
82+
const fixtures = join(__dirname, '../../../fixtures')
8283
/* Sad side effect. */
8384
if (!existsSync(fixtures)) {
8485
mkdirSync(fixtures)

0 commit comments

Comments
 (0)