Skip to content

Commit a70686e

Browse files
committed
test(e2e): simplify web-extension webpack build, bump webdriver version
1 parent efb46ec commit a70686e

File tree

4 files changed

+33
-22
lines changed

4 files changed

+33
-22
lines changed

packages/e2e/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
"babel-loader": "^8.2.5",
140140
"blake2b-no-wasm": "2.1.4",
141141
"buffer": "^6.0.3",
142-
"chromedriver": "^107.0.0",
142+
"chromedriver": "^110.0.0",
143143
"copy-webpack-plugin": "^10.2.4",
144144
"delay": "^5.0.0",
145145
"eslint": "^7.32.0",
@@ -151,6 +151,7 @@
151151
"madge": "^5.0.1",
152152
"mock-browser": "^0.92.14",
153153
"npm-run-all": "^4.1.5",
154+
"null-loader": "^4.0.1",
154155
"readable-stream": "^3.6.0",
155156
"shx": "^0.3.3",
156157
"ts-jest": "^28.0.7",

packages/e2e/test/web-extension/webpack.config.base.js

+4-8
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ module.exports = {
1414
module: {
1515
// configuration regarding modules
1616
rules: [
17+
{
18+
test: /docker\.js$/,
19+
use: 'null-loader'
20+
},
1721
{
1822
exclude: /node_modules/,
1923
resolve: {
@@ -36,14 +40,6 @@ module.exports = {
3640
path: distDir
3741
},
3842
plugins: [
39-
new NormalModuleReplacementPlugin(/@cardano-sdk/, (resource) => {
40-
const base = resource.context.replace(path.join(__dirname, '../../../'));
41-
const level = base.match(/\//g).length + 2;
42-
const prefix = Array.from({ length: level }).join('../');
43-
// eslint-disable-next-line prefer-template
44-
const newPath = resource.request.replace(/@cardano-sdk\//, prefix) + '/src';
45-
resource.request = newPath;
46-
}),
4743
new DefinePlugin({
4844
'process.env': JSON.stringify(process.env)
4945
}),

yarn-project.nix

+3-2
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ cacheEntries = {
866866
"axios@npm:0.25.0" = { filename = "axios-npm-0.25.0-a1c287d287-2a8a3787c0.zip"; sha512 = "2a8a3787c05f2a0c9c3878f49782357e2a9f38945b93018fb0c4fd788171c43dceefbb577988628e09fea53952744d1ecebde234b561f1e703aa43e0a598a3ad"; };
867867
"axios@npm:0.27.2" = { filename = "axios-npm-0.27.2-dbe3a48aea-38cb754046.zip"; sha512 = "38cb7540465fe8c4102850c4368053c21683af85c5fdf0ea619f9628abbcb59415d1e22ebc8a6390d2bbc9b58a9806c874f139767389c862ec9b772235f06854"; };
868868
"axios@npm:1.1.3" = { filename = "axios-npm-1.1.3-4b63965ac1-cab3b17bf6.zip"; sha512 = "cab3b17bf6092c9387f7023d699db093cfa23650b56c4422cd474d124b78b2e3b5a520f932c330664a58ab85b867b1c25a95cace475ef72d236888c852b84e6d"; };
869-
"axios@npm:1.2.0" = { filename = "axios-npm-1.2.0-ad83373c57-f08ce214e9.zip"; sha512 = "f08ce214e957dfde45b837f8d3c7861424608fb7df32faa638835e338782a9f4c0b05074e92e0e8dcca3a1e6250112fbbe1b15a6b21104da633d84745bbb79cc"; };
869+
"axios@npm:1.3.4" = { filename = "axios-npm-1.3.4-01ea685178-7440edefcf.zip"; sha512 = "7440edefcf8498bc3cdf39de00443e8101f249972c83b739c6e880d9d669fea9486372dbe8739e88b3bf8bb1ad15f6106693f206f078f4516fe8fd47b1c3093c"; };
870870
"b4a@npm:1.6.1" = { filename = "b4a-npm-1.6.1-11ac2fd316-9d085922d4.zip"; sha512 = "9d085922d4a6bcaac69e68520681cd60da0e2dca8ea80a89cd27a3a3037058d4669a2904aa9925c7f567d84f62f64beafaf0c831771bd4eb86ca5ecbbca402d8"; };
871871
"babel-eslint@npm:10.0.3" = { filename = "babel-eslint-npm-10.0.3-ba50cae6ec-d3bf355c20.zip"; sha512 = "d3bf355c20d1a2f0667ace6c43263eecb0d09342a833129c67cc9f554a5dbc335bd6a73cbd3001ee6074570ca2184366ddff6c58afccf8fd55e249c02ff54288"; };
872872
"babel-jest@npm:28.1.3" = { filename = "babel-jest-npm-28.1.3-3bb56d0efd-57ccd2296e.zip"; sha512 = "57ccd2296e1839687b5df2fd138c3d00717e0369e385254b012ccd4ee70e75f5d5c8e6cfcdf92d155015b468cfebb847b38e69bb5805d8aaf730e20575127cc6"; };
@@ -985,7 +985,7 @@ cacheEntries = {
985985
"chownr@npm:2.0.0" = { filename = "chownr-npm-2.0.0-638f1c9c61-c57cf9dd07.zip"; sha512 = "c57cf9dd0791e2f18a5ee9c1a299ae6e801ff58fee96dc8bfd0dcb4738a6ce58dd252a3605b1c93c6418fe4f9d5093b28ffbf4d66648cb2a9c67eaef9679be2f"; };
986986
"chrome-launcher@npm:0.15.1" = { filename = "chrome-launcher-npm-0.15.1-93903cae0a-b534221b83.zip"; sha512 = "b534221b831afc59a0058a1f8406a77d7b4a592342785418e2ef97099b073609b0ca0e4be39d1ed842aa2b64b02ab5ccb45166eada9a37b775c757fb201d7fa5"; };
987987
"chrome-trace-event@npm:1.0.3" = { filename = "chrome-trace-event-npm-1.0.3-e0ae3dcd60-cb8b1fc7e8.zip"; sha512 = "cb8b1fc7e881aaef973bd0c4a43cd353c2ad8323fb471a041e64f7c2dd849cde4aad15f8b753331a32dda45c973f032c8a03b8177fc85d60eaa75e91e08bfb97"; };
988-
"chromedriver@npm:107.0.3" = { filename = "chromedriver-npm-107.0.3-83121f82fa-e8f3f8cc5e.zip"; sha512 = "e8f3f8cc5e5f8fd2c6a22cd37b5350835c9300812f7e6ae1d9eba1d83fa6f25f10de66e376dae6b8530a1b084f09652f59056ea40c77ae2e378a0fec467e36b0"; };
988+
"chromedriver@npm:110.0.0" = { filename = "chromedriver-npm-110.0.0-aa62d30dbf-52c51f21ef.zip"; sha512 = "52c51f21ef523865af6496736e92689bf8a16d477653cb096ff22ad3bbf16495935b6f42f860a3cdea3123e2d8a4084688acc07a06da4924b7c0e2d2bc646ae4"; };
989989
"ci-info@npm:2.0.0" = { filename = "ci-info-npm-2.0.0-78012236a1-3b374666a8.zip"; sha512 = "3b374666a85ea3ca43fa49aa3a048d21c9b475c96eb13c133505d2324e7ae5efd6a454f41efe46a152269e9b6a00c9edbe63ec7fa1921957165aae16625acd67"; };
990990
"ci-info@npm:3.5.0" = { filename = "ci-info-npm-3.5.0-9f42814be7-7def378970.zip"; sha512 = "7def3789706ec18db3dc371dc699bd0df12057d54b796201f50ba87200e0849d3d83c68da00ab2ab8cdd738d91b25ab9e31620588f8d7e64ffaa1f760fd121cf"; };
991991
"ci-info@npm:3.7.1" = { filename = "ci-info-npm-3.7.1-fd86862c3f-72d93d5101.zip"; sha512 = "72d93d5101ea1c186511277fbd8d06ae8a6e028cc2fb94361e92bf735b39c5ebd192e8d15a66ff8c4e3ed569f87c2f844e96f90e141b2de5c649f77ec34ff601"; };
@@ -1921,6 +1921,7 @@ cacheEntries = {
19211921
"npmlog@npm:6.0.2" = { filename = "npmlog-npm-6.0.2-e0e69455c7-ae238cd264.zip"; sha512 = "ae238cd264a1c3f22091cdd9e2b106f684297d3c184f1146984ecbe18aaa86343953f26b9520dedd1b1372bc0316905b736c1932d778dbeb1fcf5a1001390e2a"; };
19221922
"npmlog@npm:7.0.1" = { filename = "npmlog-npm-7.0.1-a0f355f530-caabeb1f55.zip"; sha512 = "caabeb1f557c1094ad7ed3275b968b83ccbaefc133f17366ebb9fe8eb44e1aace28c31419d6244bfc0422aede1202875d555fe6661978bf04386f6cf617f43a4"; };
19231923
"nth-check@npm:2.1.1" = { filename = "nth-check-npm-2.1.1-f97afc8169-5afc3dafcd.zip"; sha512 = "5afc3dafcd1573b08877ca8e6148c52abd565f1d06b1eb08caf982e3fa289a82f2cae697ffb55b5021e146d60443f1590a5d6b944844e944714a5b549675bcd3"; };
1924+
"null-loader@npm:4.0.1" = { filename = "null-loader-npm-4.0.1-02276c1f77-eeb4c4dd2f.zip"; sha512 = "eeb4c4dd2f8f41e46f5665e4500359109e95ec1028a178a60e0161984906572da7dd87644bcc3cb29f0125d77e2b2508fb4f3813cfb1c6604a15865beb4b987b"; };
19241925
"number-is-nan@npm:1.0.1" = { filename = "number-is-nan-npm-1.0.1-845325a0fe-13656bc9aa.zip"; sha512 = "13656bc9aa771b96cef209ffca31c31a03b507ca6862ba7c3f638a283560620d723d52e626d57892c7fff475f4c36ac07f0600f14544692ff595abff214b9ffb"; };
19251926
"nwmatcher@npm:1.4.4" = { filename = "nwmatcher-npm-1.4.4-946d12e747-ab086276db.zip"; sha512 = "ab086276db7e93756a4e9704dab29bac06e3a58f8b7074735afbd3df1d428c802a71310e362ea596e9654bd344670070075e496e559ba2534d4c1a35f0be04c3"; };
19261927
"nwsapi@npm:2.2.2" = { filename = "nwsapi-npm-2.2.2-b77040326c-4376910629.zip"; sha512 = "43769106292bc95f776756ca2f3513dab7b4d506a97c67baec32406447841a35f65f29c1f95ab5d42785210fd41668beed33ca16fa058780be43b101ad73e205"; };

yarn.lock

+24-11
Original file line numberDiff line numberDiff line change
@@ -2525,7 +2525,7 @@ __metadata:
25252525
buffer: ^6.0.3
25262526
bunyan: ^1.8.15
25272527
cardano-wallet-js: ^1.4.0
2528-
chromedriver: ^107.0.0
2528+
chromedriver: ^110.0.0
25292529
copy-webpack-plugin: ^10.2.4
25302530
delay: ^5.0.0
25312531
dotenv: ^16.0.1
@@ -2542,6 +2542,7 @@ __metadata:
25422542
madge: ^5.0.1
25432543
mock-browser: ^0.92.14
25442544
npm-run-all: ^4.1.5
2545+
null-loader: ^4.0.1
25452546
optionator: ^0.9.1
25462547
pg: ^8.7.3
25472548
readable-stream: ^3.6.0
@@ -8511,14 +8512,14 @@ __metadata:
85118512
languageName: node
85128513
linkType: hard
85138514

8514-
"axios@npm:^1.1.3":
8515-
version: 1.2.0
8516-
resolution: "axios@npm:1.2.0"
8515+
"axios@npm:^1.2.1":
8516+
version: 1.3.4
8517+
resolution: "axios@npm:1.3.4"
85178518
dependencies:
85188519
follow-redirects: ^1.15.0
85198520
form-data: ^4.0.0
85208521
proxy-from-env: ^1.1.0
8521-
checksum: f08ce214e957dfde45b837f8d3c7861424608fb7df32faa638835e338782a9f4c0b05074e92e0e8dcca3a1e6250112fbbe1b15a6b21104da633d84745bbb79cc
8522+
checksum: 7440edefcf8498bc3cdf39de00443e8101f249972c83b739c6e880d9d669fea9486372dbe8739e88b3bf8bb1ad15f6106693f206f078f4516fe8fd47b1c3093c
85228523
languageName: node
85238524
linkType: hard
85248525

@@ -9816,20 +9817,20 @@ __metadata:
98169817
languageName: node
98179818
linkType: hard
98189819

9819-
"chromedriver@npm:^107.0.0":
9820-
version: 107.0.3
9821-
resolution: "chromedriver@npm:107.0.3"
9820+
"chromedriver@npm:^110.0.0":
9821+
version: 110.0.0
9822+
resolution: "chromedriver@npm:110.0.0"
98229823
dependencies:
98239824
"@testim/chrome-version": ^1.1.3
9824-
axios: ^1.1.3
9825+
axios: ^1.2.1
98259826
compare-versions: ^5.0.1
98269827
extract-zip: ^2.0.1
98279828
https-proxy-agent: ^5.0.1
98289829
proxy-from-env: ^1.1.0
98299830
tcp-port-used: ^1.0.1
98309831
bin:
98319832
chromedriver: bin/chromedriver
9832-
checksum: e8f3f8cc5e5f8fd2c6a22cd37b5350835c9300812f7e6ae1d9eba1d83fa6f25f10de66e376dae6b8530a1b084f09652f59056ea40c77ae2e378a0fec467e36b0
9833+
checksum: 52c51f21ef523865af6496736e92689bf8a16d477653cb096ff22ad3bbf16495935b6f42f860a3cdea3123e2d8a4084688acc07a06da4924b7c0e2d2bc646ae4
98339834
languageName: node
98349835
linkType: hard
98359836

@@ -19158,6 +19159,18 @@ __metadata:
1915819159
languageName: node
1915919160
linkType: hard
1916019161

19162+
"null-loader@npm:^4.0.1":
19163+
version: 4.0.1
19164+
resolution: "null-loader@npm:4.0.1"
19165+
dependencies:
19166+
loader-utils: ^2.0.0
19167+
schema-utils: ^3.0.0
19168+
peerDependencies:
19169+
webpack: ^4.0.0 || ^5.0.0
19170+
checksum: eeb4c4dd2f8f41e46f5665e4500359109e95ec1028a178a60e0161984906572da7dd87644bcc3cb29f0125d77e2b2508fb4f3813cfb1c6604a15865beb4b987b
19171+
languageName: node
19172+
linkType: hard
19173+
1916119174
"number-is-nan@npm:^1.0.0":
1916219175
version: 1.0.1
1916319176
resolution: "number-is-nan@npm:1.0.1"
@@ -22001,7 +22014,7 @@ __metadata:
2200122014
languageName: node
2200222015
linkType: hard
2200322016

22004-
"schema-utils@npm:^3.1.0, schema-utils@npm:^3.1.1":
22017+
"schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.0, schema-utils@npm:^3.1.1":
2200522018
version: 3.1.1
2200622019
resolution: "schema-utils@npm:3.1.1"
2200722020
dependencies:

0 commit comments

Comments
 (0)