From fd0ac61254a5ffed504218fe4b0e30dddece4540 Mon Sep 17 00:00:00 2001 From: Jaco Date: Fri, 8 Jul 2022 06:45:51 +0200 Subject: [PATCH] Bump deps (#5042) * Bump deps * Rebump --- .gitignore | 2 ++ deno/check.ts | 18 ------------------ deno/import_map.json | 17 ----------------- deno/setup.ts | 27 --------------------------- package.json | 6 ++---- yarn.lock | 11 ++++++----- 6 files changed, 10 insertions(+), 71 deletions(-) delete mode 100644 deno/check.ts delete mode 100644 deno/import_map.json delete mode 100644 deno/setup.ts diff --git a/.gitignore b/.gitignore index 6e7809d492..3c4e64638a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,8 @@ docs/.vuepress/dist/ docs/substrate/*.md node_modules/ tmp/ +/import_map.json +/mod.ts NOTES.md .DS_Store .env.local diff --git a/deno/check.ts b/deno/check.ts deleted file mode 100644 index 0e5d9165b7..0000000000 --- a/deno/check.ts +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2019-2022 @polkadot/api authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// auto-generated via deno/setup.ts, do not edit - -export * as api from 'https://deno.land/x/polkadot/api/mod.ts'; -export * as apiAugment from 'https://deno.land/x/polkadot/api-augment/mod.ts'; -export * as apiBase from 'https://deno.land/x/polkadot/api-base/mod.ts'; -export * as apiContract from 'https://deno.land/x/polkadot/api-contract/mod.ts'; -export * as apiDerive from 'https://deno.land/x/polkadot/api-derive/mod.ts'; -export * as rpcAugment from 'https://deno.land/x/polkadot/rpc-augment/mod.ts'; -export * as rpcCore from 'https://deno.land/x/polkadot/rpc-core/mod.ts'; -export * as rpcProvider from 'https://deno.land/x/polkadot/rpc-provider/mod.ts'; -export * as types from 'https://deno.land/x/polkadot/types/mod.ts'; -export * as typesAugment from 'https://deno.land/x/polkadot/types-augment/mod.ts'; -export * as typesCodec from 'https://deno.land/x/polkadot/types-codec/mod.ts'; -export * as typesCreate from 'https://deno.land/x/polkadot/types-create/mod.ts'; -export * as typesKnown from 'https://deno.land/x/polkadot/types-known/mod.ts'; diff --git a/deno/import_map.json b/deno/import_map.json deleted file mode 100644 index 8e0655cab2..0000000000 --- a/deno/import_map.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "imports": { - "https://deno.land/x/polkadot/rpc-core/": "../packages/rpc-core/build-deno/", - "https://deno.land/x/polkadot/types-augment/": "../packages/types-augment/build-deno/", - "https://deno.land/x/polkadot/types-create/": "../packages/types-create/build-deno/", - "https://deno.land/x/polkadot/types/": "../packages/types/build-deno/", - "https://deno.land/x/polkadot/api-base/": "../packages/api-base/build-deno/", - "https://deno.land/x/polkadot/types-known/": "../packages/types-known/build-deno/", - "https://deno.land/x/polkadot/rpc-provider/": "../packages/rpc-provider/build-deno/", - "https://deno.land/x/polkadot/api-augment/": "../packages/api-augment/build-deno/", - "https://deno.land/x/polkadot/api/": "../packages/api/build-deno/", - "https://deno.land/x/polkadot/rpc-augment/": "../packages/rpc-augment/build-deno/", - "https://deno.land/x/polkadot/types-codec/": "../packages/types-codec/build-deno/", - "https://deno.land/x/polkadot/api-contract/": "../packages/api-contract/build-deno/", - "https://deno.land/x/polkadot/api-derive/": "../packages/api-derive/build-deno/" - } -} diff --git a/deno/setup.ts b/deno/setup.ts deleted file mode 100644 index 505b187726..0000000000 --- a/deno/setup.ts +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2017-2022 @polkadot/api authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -/* eslint-disable sort-keys */ - -import { stringCamelCase } from 'https://deno.land/x/polkadot/util/mod.ts'; - -const exports: string[] = []; -const imports: Record = {}; - -for await (const entry of Deno.readDir('packages')) { - if (entry.isDirectory) { - try { - await Deno.readTextFile(`packages/${entry.name}/src/mod.ts`); - - exports.push(`export * as ${stringCamelCase(entry.name)} from 'https://deno.land/x/polkadot/${entry.name}/mod.ts';`); - - imports[`https://deno.land/x/polkadot/${entry.name}/`] = `../packages/${entry.name}/build-deno/`; - } catch { - // ignore - } - } -} - -await Deno.writeTextFile('deno/check.ts', `// Copyright 2017-${new Date().getFullYear()} @polkadot/api authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\n// auto-generated via deno/setup.ts, do not edit\n\n${exports.sort().join('\n')}\n`); - -await Deno.writeTextFile('deno/import_map.json', `${JSON.stringify({ imports }, null, 2)}\n`); diff --git a/package.json b/package.json index 8e8cfb97de..35adab2ba9 100644 --- a/package.json +++ b/package.json @@ -23,9 +23,7 @@ "build:rollup": "polkadot-exec-rollup --config", "chain:info": "polkadot-types-chain-info", "clean": "polkadot-dev-clean-build", - "deno": "yarn build && yarn deno:setup && yarn deno:check", - "deno:check": "deno check --import-map=deno/import_map.json deno/check.ts", - "deno:setup": "deno run --import-map=deno/import_map.json --allow-read --allow-write deno/setup.ts", + "deno": "yarn polkadot-dev-deno-map && yarn build && deno check --import-map=import_map.json mod.ts", "lint": "polkadot-dev-run-lint", "postinstall": "polkadot-dev-yarn-only", "test": "NODE_OPTIONS=--experimental-vm-modules polkadot-dev-run-test --coverage --forceExit --runInBand --testPathIgnorePatterns e2e", @@ -36,7 +34,7 @@ "@babel/core": "^7.18.6", "@babel/register": "^7.18.6", "@babel/runtime": "^7.18.6", - "@polkadot/dev": "^0.67.58", + "@polkadot/dev": "^0.67.63", "@polkadot/typegen": "workspace:packages/typegen", "@types/jest": "^28.1.4", "copyfiles": "^2.4.1" diff --git a/yarn.lock b/yarn.lock index c1679ebeba..a4afa5b6e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2044,9 +2044,9 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/dev@npm:^0.67.58": - version: 0.67.58 - resolution: "@polkadot/dev@npm:0.67.58" +"@polkadot/dev@npm:^0.67.63": + version: 0.67.63 + resolution: "@polkadot/dev@npm:0.67.63" dependencies: "@babel/cli": ^7.18.6 "@babel/core": ^7.18.6 @@ -2122,6 +2122,7 @@ __metadata: polkadot-dev-clean-build: scripts/polkadot-dev-clean-build.mjs polkadot-dev-contrib: scripts/polkadot-dev-contrib.mjs polkadot-dev-copy-to: scripts/polkadot-dev-copy-to.mjs + polkadot-dev-deno-map: scripts/polkadot-dev-deno-map.mjs polkadot-dev-run-lint: scripts/polkadot-dev-run-lint.mjs polkadot-dev-run-prettier: scripts/polkadot-dev-run-prettier.mjs polkadot-dev-run-test: scripts/polkadot-dev-run-test.mjs @@ -2134,7 +2135,7 @@ __metadata: polkadot-exec-rollup: scripts/polkadot-exec-rollup.mjs polkadot-exec-tsc: scripts/polkadot-exec-tsc.mjs polkadot-exec-webpack: scripts/polkadot-exec-webpack.mjs - checksum: b7f45bb635cdf8734ec9c8410a489a8d8b9667f944a0816d4fb3f0f7bcde0881b74742072df312e990fa59610439a7d52021e215b42879d04338fd1e457497d7 + checksum: dcd126122c2bc793930e9974dfd0fae035e1a8b97bd6df4a3cfc82bee5ec76a328570401b0b81dd1d2db7459c08a50b8169b1814934fca677d8b25b699097cc4 languageName: node linkType: hard @@ -9205,7 +9206,7 @@ resolve@^2.0.0-next.3: "@babel/core": ^7.18.6 "@babel/register": ^7.18.6 "@babel/runtime": ^7.18.6 - "@polkadot/dev": ^0.67.58 + "@polkadot/dev": ^0.67.63 "@polkadot/typegen": "workspace:packages/typegen" "@types/jest": ^28.1.4 copyfiles: ^2.4.1