diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index e46b065c76..dd61ab9903 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: jacogr/action-merge@d2d64b4545acd93b0a9575177d3d215ae3f92029 with: - checks: build:code,build:i18n,build:electron,lint,test + checks: pr (build:code),pr (build:i18n),pr (build:electron),pr (lint),pr (test) labels: -auto strategy: squash token: ${{ secrets.GH_PAT_BOT }} diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml index 6326bda31f..be20c3e708 100644 --- a/.github/workflows/push-master.yml +++ b/.github/workflows/push-master.yml @@ -11,7 +11,6 @@ jobs: strategy: matrix: step: ['build:release:www'] - name: ${{ matrix.step }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -39,7 +38,6 @@ jobs: # only run on "CI skip", i.e. when the actual version has been bumped to release/stable docker: if: "startsWith(github.event.head_commit.message, '[CI Skip] release/stable')" - name: docker runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -59,7 +57,6 @@ jobs: matrix: os: [macos-latest, ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} - name: ${{ matrix.os }} steps: - uses: actions/checkout@v3 with: diff --git a/package.json b/package.json index 153fe87243..efe8df2f89 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@babel/runtime": "^7.21.0", "@crustio/crust-pin": "^1.0.0", "@pinata/sdk": "^1.2.1", - "@polkadot/dev": "^0.69.23", + "@polkadot/dev": "^0.69.25", "@types/chart.js": "^2.9.37", "@types/file-saver": "^2.0.5", "@types/react-beautiful-dnd": "^13.1.3", @@ -92,7 +92,7 @@ "react-dom": "^18.2.0", "react-is": "^18.2.0", "source-map-explorer": "^2.5.3", - "styled-components": "^5.3.6" + "styled-components": "^5.3.8" }, "resolutions": { "@polkadot/api": "^9.14.2", diff --git a/packages/apps-electron/package.json b/packages/apps-electron/package.json index 91fabe2519..7f920d78d9 100644 --- a/packages/apps-electron/package.json +++ b/packages/apps-electron/package.json @@ -14,7 +14,7 @@ "dependencies": { "@babel/core": "^7.21.0", "@babel/polyfill": "^7.12.1", - "@polkadot/dev": "^0.69.23", + "@polkadot/dev": "^0.69.25", "@polkadot/react-components": "^0.124.2-109-x", "electron-log": "^5.0.0-beta.16", "electron-updater": "^5.3.0" diff --git a/packages/apps/package.json b/packages/apps/package.json index 1acd2a7903..6f7dcf3159 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -18,7 +18,7 @@ "@babel/runtime": "^7.21.0", "@polkadot/apps-config": "^0.124.2-109-x", "@polkadot/apps-routing": "^0.124.2-109-x", - "@polkadot/dev": "^0.69.23", + "@polkadot/dev": "^0.69.25", "@polkadot/react-api": "^0.124.2-109-x", "@polkadot/react-components": "^0.124.2-109-x", "@polkadot/react-hooks": "^0.124.2-109-x", diff --git a/yarn.lock b/yarn.lock index db07c292d4..580a335e57 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3068,7 +3068,7 @@ __metadata: dependencies: "@babel/core": ^7.21.0 "@babel/polyfill": ^7.12.1 - "@polkadot/dev": ^0.69.23 + "@polkadot/dev": ^0.69.25 "@polkadot/react-components": ^0.124.2-109-x "@types/react-dom": ^18.0.11 "@types/tmp": ^0.2.3 @@ -3101,7 +3101,7 @@ __metadata: "@babel/runtime": ^7.21.0 "@polkadot/apps-config": ^0.124.2-109-x "@polkadot/apps-routing": ^0.124.2-109-x - "@polkadot/dev": ^0.69.23 + "@polkadot/dev": ^0.69.25 "@polkadot/react-api": ^0.124.2-109-x "@polkadot/react-components": ^0.124.2-109-x "@polkadot/react-hooks": ^0.124.2-109-x @@ -3129,9 +3129,9 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/dev@npm:^0.69.23": - version: 0.69.23 - resolution: "@polkadot/dev@npm:0.69.23" +"@polkadot/dev@npm:^0.69.25": + version: 0.69.25 + resolution: "@polkadot/dev@npm:0.69.25" dependencies: "@babel/cli": ^7.21.0 "@babel/core": ^7.21.0 @@ -3164,7 +3164,6 @@ __metadata: "@typescript-eslint/eslint-plugin": ^5.54.0 "@typescript-eslint/parser": ^5.54.0 "@vue/component-compiler-utils": ^3.3.0 - babel-plugin-module-extension-resolver: ^1.0.0 babel-plugin-module-resolver: ^5.0.0 babel-plugin-styled-components: ^2.0.7 browserslist: ^4.21.5 @@ -3186,8 +3185,7 @@ __metadata: gh-release: ^7.0.2 jsdom: ^21.1.0 madge: ^6.0.0 - prettier: ^2.8.4 - rollup: ^3.17.3 + rollup: ^3.18.0 rollup-plugin-cleanup: ^3.2.1 tap-parser: ^12.0.1 typescript: ^4.9.5 @@ -3209,25 +3207,19 @@ __metadata: polkadot-dev-copy-dir: scripts/polkadot-dev-copy-dir.mjs polkadot-dev-copy-to: scripts/polkadot-dev-copy-to.mjs polkadot-dev-deno-map: scripts/polkadot-dev-deno-map.mjs - polkadot-dev-run-esbuild: scripts/polkadot-dev-run-esbuild.mjs polkadot-dev-run-lint: scripts/polkadot-dev-run-lint.mjs polkadot-dev-run-node-ts: scripts/polkadot-dev-run-node-ts.mjs - polkadot-dev-run-prettier: scripts/polkadot-dev-run-prettier.mjs - polkadot-dev-run-swc: scripts/polkadot-dev-run-swc.mjs polkadot-dev-run-test: scripts/polkadot-dev-run-test.mjs polkadot-dev-version: scripts/polkadot-dev-version.mjs polkadot-dev-yarn-only: scripts/polkadot-dev-yarn-only.mjs - polkadot-exec-esbuild: scripts/polkadot-exec-esbuild.mjs polkadot-exec-eslint: scripts/polkadot-exec-eslint.mjs polkadot-exec-ghpages: scripts/polkadot-exec-ghpages.mjs polkadot-exec-ghrelease: scripts/polkadot-exec-ghrelease.mjs polkadot-exec-node-test: scripts/polkadot-exec-node-test.mjs - polkadot-exec-prettier: scripts/polkadot-exec-prettier.mjs polkadot-exec-rollup: scripts/polkadot-exec-rollup.mjs - polkadot-exec-swc: scripts/polkadot-exec-swc.mjs polkadot-exec-tsc: scripts/polkadot-exec-tsc.mjs polkadot-exec-webpack: scripts/polkadot-exec-webpack.mjs - checksum: e927bb3b236002e264b5822cf3bd9d37f2e5105270185cf42c05428efe598bece657d3174b1ccc3867257a48181a5c8f29f6b58d7c65286a1a35f8c5df1a78d9 + checksum: 80579467976cc5f124e0a5c04c4c142f541523485eb00d8838c82f9a48d0c14c8e5ce3fe139d02ed52af8013bdb2eb35cd06534962a4e80a46a1374bc46be8d1 languageName: node linkType: hard @@ -6412,13 +6404,6 @@ __metadata: languageName: node linkType: hard -"babel-plugin-module-extension-resolver@npm:^1.0.0": - version: 1.0.0 - resolution: "babel-plugin-module-extension-resolver@npm:1.0.0" - checksum: ade0426653bad6d395ee27ffef26b962635d070c78dd9b3a18a631dd9bf8009d76eb0bd26166ad4ab2fb178fb3d439da8d085f973038a122ee42851781570aa4 - languageName: node - linkType: hard - "babel-plugin-module-resolver@npm:^5.0.0": version: 5.0.0 resolution: "babel-plugin-module-resolver@npm:5.0.0" @@ -15792,7 +15777,7 @@ fsevents@~2.3.2: "@babel/runtime": ^7.21.0 "@crustio/crust-pin": ^1.0.0 "@pinata/sdk": ^1.2.1 - "@polkadot/dev": ^0.69.23 + "@polkadot/dev": ^0.69.25 "@types/chart.js": ^2.9.37 "@types/file-saver": ^2.0.5 "@types/react-beautiful-dnd": ^13.1.3 @@ -15813,7 +15798,7 @@ fsevents@~2.3.2: react-dom: ^18.2.0 react-is: ^18.2.0 source-map-explorer: ^2.5.3 - styled-components: ^5.3.6 + styled-components: ^5.3.8 languageName: unknown linkType: soft @@ -16037,7 +16022,7 @@ fsevents@~2.3.2: languageName: node linkType: hard -"prettier@npm:^1.18.2 || ^2.0.0, prettier@npm:^2.8.4": +"prettier@npm:^1.18.2 || ^2.0.0": version: 2.8.4 resolution: "prettier@npm:2.8.4" bin: @@ -17332,9 +17317,9 @@ fsevents@~2.3.2: languageName: node linkType: hard -"rollup@npm:^3.17.3": - version: 3.17.3 - resolution: "rollup@npm:3.17.3" +"rollup@npm:^3.18.0": + version: 3.18.0 + resolution: "rollup@npm:3.18.0" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -17342,7 +17327,7 @@ fsevents@~2.3.2: optional: true bin: rollup: dist/bin/rollup - checksum: afce20a6ef4a613e5803eff7fb17a3efe740e326257b43f48bdbe10783f3eae79587d7e455234bc68f3c3154a50f2c29c85d4d2a42cdebcc17a5abeaeb04e0ed + checksum: 0bcd1abb1cc383abdd09b5594de862ecb2f946e950954bb472a370289bdc4499aea8d04477be55ce205450d973d38ad255f0dc6926162500a251d73bf0e60e6f languageName: node linkType: hard