Skip to content

Commit f662065

Browse files
committed
chore: upgrade major version of webpack and vuepress
1 parent 039e7be commit f662065

File tree

5 files changed

+3243
-2772
lines changed

5 files changed

+3243
-2772
lines changed

docs/.vuepress/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ module.exports = {
2929
docsBranch: "master",
3030
editLinks: true,
3131
editLinkText: "Edit this page on GitHub",
32-
nav: [
32+
navbar: [
3333
{ text: "Home", link: "/" },
3434
{ text: "Guide", link: "/guide/testing" },
3535
{

package.json

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"node": ">=12.0.0"
88
},
99
"dependencies": {
10-
"@types/webpack": "4.4.17",
10+
"@types/webpack": "5.28.0",
1111
"acorn": "8.6.0",
1212
"connect": "3.7.0",
1313
"fs-extra": "10.0.0",
@@ -19,20 +19,22 @@
1919
"optional-require": "1.1.8",
2020
"requirejs": "2.3.6",
2121
"serve-static": "1.14.1",
22-
"webpack": "4.46.0",
22+
"webpack": "5.65.0",
2323
"which": "2.0.2"
2424
},
2525
"peerDependencies": {
2626
"karma": ">= 1.7.0",
27-
"karma-chrome-launcher": "2.1.1",
28-
"karma-coverage": "1.1.1",
29-
"karma-mocha": "1.3.0",
30-
"karma-mocha-reporter": "2.2.3",
31-
"karma-openui5": "0.2.2",
32-
"karma-requirejs": "1.1.0",
27+
"karma-chrome-launcher": ">= 2.1.1 < 3.1.0",
28+
"karma-coverage": ">=1.1.1 < 2.1.0",
29+
"karma-mocha": ">= 1.3.0 < 2.0.1",
30+
"karma-mocha-reporter": "^2.2.3",
31+
"karma-openui5": "^0.2.2",
32+
"karma-requirejs": "^1.1.0",
3333
"mocha": "*"
3434
},
3535
"devDependencies": {
36+
"@vuepress/shared-utils": "^1.8.2",
37+
"@vue/component-compiler-utils": "^3.3.0",
3638
"chai": "4.3.4",
3739
"chai-as-promised": "7.1.1",
3840
"chai-string": "1.5.0",
@@ -41,15 +43,15 @@
4143
"eslint-config-prettier": "8.3.0",
4244
"eslint-plugin-import": "2.25.3",
4345
"gitty": "3.7.2",
44-
"jest": "27.4.2",
46+
"jest": "27.4.3",
4547
"jsonfile": "6.1.0",
4648
"npm-run-all": "4.1.5",
4749
"prettier": "2.5.0",
4850
"semver": "7.3.5",
4951
"shx": "0.3.3",
5052
"typedoc": "0.22.10",
5153
"typescript": "4.5.2",
52-
"vuepress": "1.8.2"
54+
"vuepress-next": "^0.13.0"
5355
},
5456
"resolutions": {
5557
"**/mixin-deep": "^1.3.2",

src/bundling.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -774,16 +774,19 @@ const bundling = {
774774
if (err.details) {
775775
console.error(err.details)
776776
reject(err.details)
777+
return
777778
} else {
778779
reject(err)
780+
return
779781
}
780782
}
781783

782784
const info = stats.toJson()
783785

784786
if (stats.hasErrors()) {
785787
console.error(info.errors)
786-
reject(info.errors.join("\n"))
788+
reject(info.errors)
789+
return
787790
}
788791

789792
if (stats.hasWarnings()) {

test/bundling_spec.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ describe("The, Exported bundling APIs", () => {
759759
outDir: distFolder,
760760
})
761761
).to.be.rejectedWith(
762-
"Webpack has been initialised using a configuration object that does not match the API schema"
762+
"Invalid configuration object. Webpack has been initialized using a configuration object that does not match the API schema."
763763
)
764764
})
765765

@@ -775,9 +775,12 @@ describe("The, Exported bundling APIs", () => {
775775
bundler,
776776
outDir: distFolder,
777777
})
778-
).to.be.rejectedWith(
779-
"./rapidstart/service/b2.js\nModule not found: Error: Can't resolve 'bamba'"
780-
)
778+
).to.be.rejectedWith([
779+
{
780+
message: `Module not found: Error: Can't resolve 'bamba' in 'C:\\Users\\I051950\\repos\\webide-client-tools\\test\\resources\\webpack_error\\rapidstart\\service'`,
781+
moduleName: `./rapidstart/service/b2.js`,
782+
},
783+
])
781784
})
782785

783786
afterEach(() => {

0 commit comments

Comments
 (0)