Update packages to playwright test provider, updated browser workflow…

… file
ethereumjs · Jun 21, 2023 · 1e1bdf8 · 1e1bdf8
1 parent 101578e
commit 1e1bdf8
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 20 deletions.
diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml
@@ -40,8 +40,21 @@ jobs:
       - run: cd ../rlp && npm run test:browser
       - run: cd ../util && npm run test:browser
       - run: cd ../common && npm run test:browser
-#     Trie currently hangs (no test execution)
+#     Trie: several tests not passing yet
 #     - run: cd ../trie && npm run test:browser
-#     See vitest.config.browser.ts for exclusions
       - run: cd ../tx && npm run test:browser
-
+#     Block: serveral tests not passing yet
+#     - run: cd ../block && npm run test:browser
+#     No browser tests for devp2p
+#     Blockchain: strange errors, needs another look
+#     - run: cd ../blockchain && npm run test:browser
+#     No browser tests for ethash
+#     EVM: several tests not passing yet
+#     - run: cd ../evm && npm run test:browser
+#     StateManager: selected tests not passing yet
+#     - run: cd ../statemanager && npm run test:browser
+#     Wallet: import failing
+#     - run: cd ../wallet && npm run test:browser
+#     VM: several tests not passing yet
+#     - run: cd ../vm && npm run test:browser
+
diff --git a/packages/block/package.json b/packages/block/package.json
@@ -18,7 +18,6 @@
   "author": "mjbecze (mb@ethdev.com)",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
-  "type": "module",
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
@@ -39,7 +38,7 @@
     "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "test": "npm run test:node && npm run test:browser",
-    "test:browser": "npx vitest run --browser.name=chrome --browser.headless",
+    "test:browser": "npx vitest run --browser.name=webkit --browser.provider=playwright --browser.headless",
     "test:node": "npx vitest run",
     "tsc": "../../config/cli/ts-compile.sh"
   },

diff --git a/packages/blockchain/package.json b/packages/blockchain/package.json
@@ -18,7 +18,6 @@
   "author": "mjbecze <mjbecze@gmail.com>",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
-  "type": "module",
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
@@ -39,7 +38,7 @@
     "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "test": "npm run test:node && npm run test:browser",
-    "test:browser": "npx vitest run --browser.name=chrome --browser.headless",
+    "test:browser": "npx vitest run --browser.name=webkit --browser.provider=playwright --browser.headless",
     "test:node": "npx vitest run",
     "tsc": "../../config/cli/ts-compile.sh"
   },

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -49,7 +49,7 @@
     "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "test": "npm run test:node && npm run test:browser",
-    "test:browser": "npx vitest run --browser.name=chrome --browser.headless",
+    "test:browser": "npx vitest run --browser.name=webkit --browser.provider=playwright --browser.headless",
     "test:node": "npx vitest run",
     "tsc": "../../config/cli/ts-compile.sh"
   },

diff --git a/packages/evm/package.json b/packages/evm/package.json
@@ -21,7 +21,6 @@
   "contributors": [
     "Alex Beregszaszi <alex@rtfs.hu>"
   ],
-  "type": "module",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "exports": {
@@ -47,7 +46,7 @@
     "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "profiling": "0x ./benchmarks/run.js profiling",
-    "test:browser": "npx vitest run --browser.name=chrome --browser.headless",
+    "test:browser": "npx vitest run --browser.name=webkit --browser.provider=playwright --browser.headless",
     "test:node": "npx vitest run",
     "tsc": "../../config/cli/ts-compile.sh"
   },

diff --git a/packages/rlp/package.json b/packages/rlp/package.json
@@ -50,7 +50,7 @@
     "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "test": "npm run test:node && npm run test:browser",
-    "test:browser": "npx vitest run --browser.name=chrome --browser.headless",
+    "test:browser": "npx vitest run --browser.name=webkit --browser.provider=playwright --browser.headless",
     "test:node": "npx vitest run",
     "tsc": "../../config/cli/ts-compile.sh"
   },

diff --git a/packages/statemanager/package.json b/packages/statemanager/package.json
@@ -19,7 +19,6 @@
   "contributors": [
     "g11tech <gajinder@g11.in>"
   ],
-  "type": "module",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "exports": {
@@ -42,7 +41,7 @@
     "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh && npm run test:node",
     "test": "npm run test:node && npm run test:browser",
-    "test:browser": "npx vitest run --browser.name=chrome --browser.headless",
+    "test:browser": "npx vitest run --browser.name=webkit --browser.provider=playwright --browser.headless",
     "test:node": "npx vitest run",
     "tsc": "../../config/cli/ts-compile.sh"
   },

diff --git a/packages/trie/package.json b/packages/trie/package.json
@@ -46,7 +46,7 @@
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "profiling": "tsc --target ES5 benchmarks/random.ts && 0x benchmarks/random.js",
     "test": "npm run test:node && npm run test:browser",
-    "test:browser": "npx vitest run --browser.name=chrome --browser.headless",
+    "test:browser": "npx vitest run --browser.name=webkit --browser.provider=playwright --browser.headless",
     "test:node": "npx vitest run",
     "tsc": "../../config/cli/ts-compile.sh"
   },

diff --git a/packages/tx/package.json b/packages/tx/package.json
@@ -27,7 +27,6 @@
       "hireable": true
     }
   ],
-  "type": "module",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "exports": {
@@ -51,7 +50,7 @@
     "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "test": "npm run test:node && npm run test:browser",
-    "test:browser": "npx vitest run --config=./vitest.config.browser.ts --browser.name=chrome --browser.headless",
+    "test:browser": "npx vitest run --config=./vitest.config.browser.ts --browser.name=webkit --browser.provider=playwright --browser.headless",
     "test:node": "npx vitest run",
     "tsc": "../../config/cli/ts-compile.sh"
   },

diff --git a/packages/util/package.json b/packages/util/package.json
@@ -84,7 +84,7 @@
     "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "test": "npm run test:node && npm run test:browser",
-    "test:browser": "npx vitest run --browser.name=chrome --browser.headless",
+    "test:browser": "npx vitest run --config=./vitest.config.browser.ts --browser.name=webkit --browser.provider=playwright --browser.headless",
     "test:node": "npx vitest run",
     "tsc": "../../config/cli/ts-compile.sh"
   },

diff --git a/packages/util/vitest.config.browser.ts b/packages/util/vitest.config.browser.ts
@@ -0,0 +1,11 @@
+import { configDefaults, defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    exclude: [
+      ...configDefaults.exclude,
+      // access control
+      'test/provider.spec.ts',
+    ],
+  },
+})
diff --git a/packages/vm/package.json b/packages/vm/package.json
@@ -19,6 +19,7 @@
   "contributors": [
     "Alex Beregszaszi <alex@rtfs.hu>"
   ],
+  "type": "commonjs",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "exports": {
@@ -48,7 +49,7 @@
     "profiling": "0x ./benchmarks/run.js profiling",
     "test": "echo \"[INFO] Generic test cmd not used. See package.json for more specific test run cmds.\"",
     "test:API": "npx vitest run ./test/api/",
-    "test:browser": "npx vitest run ./test/api/**/*.spec.ts --browser.name=chrome --browser.headless",
+    "test:browser": "npx vitest run ./test/api/**/*.spec.ts --browser.name=webkit --browser.provider=playwright --browser.headless",
     "test:blockchain": "npm run tester -- --blockchain",
     "test:blockchain:allForks": "echo 'Chainstart Homestead dao TangerineWhistle SpuriousDragon Byzantium Constantinople Petersburg Istanbul MuirGlacier Berlin London ByzantiumToConstantinopleFixAt5 EIP158ToByzantiumAt5 FrontierToHomesteadAt5 HomesteadToDaoAt5 HomesteadToEIP150At5 BerlinToLondonAt5' | xargs -n1 | xargs -I v1 npm run tester -- --blockchain --fork=v1 --verify-test-amount-alltests",
     "test:blockchain:transitionForks": "echo 'ByzantiumToConstantinopleFixAt5 EIP158ToByzantiumAt5 FrontierToHomesteadAt5 HomesteadToDaoAt5 HomesteadToEIP150At5 BerlinToLondonAt5' | xargs -n1 | xargs -I v1 npm run tester -- --blockchain --fork=v1 --verify-test-amount-alltests",

diff --git a/packages/wallet/package.json b/packages/wallet/package.json
@@ -19,7 +19,6 @@
   "author": "Alex Beregszaszi <alex@rtfs.hu>",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
-  "type": "module",
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
@@ -40,7 +39,7 @@
     "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "test": "npm run test:node && npm run test:browser",
-    "test:browser": "vitest run --browser.name=chrome --browser.headless",
+    "test:browser": "vitest run --browser.name=webkit --browser.provider=playwright --browser.headless",
     "test:node": "vitest run",
     "tsc": "../../config/cli/ts-compile.sh"
   },