diff --git a/package.json b/package.json index 557643cbd0..1027215f2c 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "@babel/runtime": "^7.18.3", "@crustio/crust-pin": "^1.0.0", "@pinata/sdk": "^1.1.26", - "@polkadot/dev": "^0.67.4", + "@polkadot/dev": "^0.67.5", "@types/chart.js": "^2.9.37", "@types/file-saver": "^2.0.5", "@types/jest": "^28.1.2", diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json index 7a02fade03..2a762507b7 100644 --- a/packages/apps-config/package.json +++ b/packages/apps-config/package.json @@ -31,7 +31,6 @@ "@parallel-finance/type-definitions": "1.7.7", "@phala/typedefs": "0.2.30", "@polkadot/api": "^8.9.1", - "@polkadot/api-augment": "^8.9.1", "@polkadot/api-derive": "^8.9.1", "@polkadot/networks": "^9.5.1", "@polkadot/types": "^8.9.1", diff --git a/packages/apps-config/src/api/spec/index.ts b/packages/apps-config/src/api/spec/index.ts index d2551ef024..e16d441c5d 100644 --- a/packages/apps-config/src/api/spec/index.ts +++ b/packages/apps-config/src/api/spec/index.ts @@ -1,10 +1,6 @@ // Copyright 2017-2022 @polkadot/apps-config authors & contributors // SPDX-License-Identifier: Apache-2.0 -// Some packages may include type augmentation, ensure that we get the -// defaults in first so we highlight the issues in the packages themselves -import '@polkadot/api-augment'; - import type { OverrideBundleDefinition } from '@polkadot/types/types'; import acala from './acala'; diff --git a/packages/apps-config/src/api/spec/mangata.ts b/packages/apps-config/src/api/spec/mangata.ts index 9ebb0be7e5..0afbc60d1f 100644 --- a/packages/apps-config/src/api/spec/mangata.ts +++ b/packages/apps-config/src/api/spec/mangata.ts @@ -1,6 +1,8 @@ // Copyright 2017-2022 @polkadot/apps-config authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { typesBundleForPolkadotApps } from '@mangata-finance/types'; +// Since this libary includes augmented definitions, we inmport it via +// a CJS bridge ... which hopefully just short-circuits all of that +import { typesBundleForPolkadotApps } from '../../cjs/mangata.js'; export default typesBundleForPolkadotApps; diff --git a/packages/apps-config/src/cjs/cjs/mangata.js b/packages/apps-config/src/cjs/cjs/mangata.js new file mode 100644 index 0000000000..e581f8cc82 --- /dev/null +++ b/packages/apps-config/src/cjs/cjs/mangata.js @@ -0,0 +1,6 @@ +// Copyright 2017-2022 @polkadot/apps-config authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +const { typesBundleForPolkadotApps } = require('../mangata.js'); + +module.exports = { typesBundleForPolkadotApps }; diff --git a/packages/apps-config/src/cjs/mangata.d.ts b/packages/apps-config/src/cjs/mangata.d.ts new file mode 100644 index 0000000000..968f2a83bd --- /dev/null +++ b/packages/apps-config/src/cjs/mangata.d.ts @@ -0,0 +1,8 @@ +// Copyright 2017-2022 @polkadot/apps-config authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import { OverrideBundleDefinition } from '@polkadot/types/types'; + +declare module './mangata.js' { + export const typesBundleForPolkadotApps: OverrideBundleDefinition; +} diff --git a/packages/apps-config/src/cjs/mangata.js b/packages/apps-config/src/cjs/mangata.js new file mode 100644 index 0000000000..187eb77c81 --- /dev/null +++ b/packages/apps-config/src/cjs/mangata.js @@ -0,0 +1,6 @@ +// Copyright 2017-2022 @polkadot/apps-config authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +const { typesBundleForPolkadotApps } = require('@mangata-finance/types'); + +module.exports = { typesBundleForPolkadotApps }; diff --git a/packages/apps-config/src/cjs/package.json b/packages/apps-config/src/cjs/package.json new file mode 100644 index 0000000000..4f77acae33 --- /dev/null +++ b/packages/apps-config/src/cjs/package.json @@ -0,0 +1,3 @@ +{ + "module": "commonjs" +} diff --git a/packages/apps-electron/package.json b/packages/apps-electron/package.json index fc7a948293..a8ac9d501f 100644 --- a/packages/apps-electron/package.json +++ b/packages/apps-electron/package.json @@ -14,7 +14,7 @@ "dependencies": { "@babel/core": "^7.18.5", "@babel/polyfill": "^7.12.1", - "@polkadot/dev": "^0.67.4", + "@polkadot/dev": "^0.67.5", "@polkadot/react-components": "^0.116.2-43", "electron-log": "^4.4.7", "electron-updater": "^4.6.5" diff --git a/packages/apps/package.json b/packages/apps/package.json index 096d441eb9..cd60afde22 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -18,7 +18,7 @@ "@babel/runtime": "^7.18.3", "@polkadot/apps-config": "^0.116.2-43", "@polkadot/apps-routing": "^0.116.2-43", - "@polkadot/dev": "^0.67.4", + "@polkadot/dev": "^0.67.5", "@polkadot/react-api": "^0.116.2-43", "@polkadot/react-components": "^0.116.2-43", "@polkadot/react-hooks": "^0.116.2-43", diff --git a/packages/page-accounts/package.json b/packages/page-accounts/package.json index b3b18e7ff2..b25f4711cd 100644 --- a/packages/page-accounts/package.json +++ b/packages/page-accounts/package.json @@ -15,7 +15,7 @@ "dependencies": { "@babel/runtime": "^7.18.3", "@polkadot/hw-ledger": "^9.5.1", - "@polkadot/phishing": "^0.14.3", + "@polkadot/phishing": "^0.14.4", "@polkadot/react-components": "^0.116.2-43", "@polkadot/react-hooks": "^0.116.2-43", "@polkadot/util": "^9.5.1", diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json index c6987c5990..7fdc457a70 100644 --- a/tsconfig.eslint.json +++ b/tsconfig.eslint.json @@ -2,7 +2,8 @@ "extends": "./tsconfig.base.json", "exclude": [ "build/**/*", - "**/build/**/*" + "**/build/**/*", + "**/node_modules/**/*" ], "compilerOptions": { "baseUrl": "./packages", diff --git a/yarn.lock b/yarn.lock index c82c5774c0..5aceb3dcd7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2719,7 +2719,7 @@ __metadata: dependencies: "@babel/runtime": ^7.18.3 "@polkadot/hw-ledger": ^9.5.1 - "@polkadot/phishing": ^0.14.3 + "@polkadot/phishing": ^0.14.4 "@polkadot/react-components": ^0.116.2-43 "@polkadot/react-hooks": ^0.116.2-43 "@polkadot/test-support": 0.116.2-43 @@ -3022,7 +3022,6 @@ __metadata: "@parallel-finance/type-definitions": 1.7.7 "@phala/typedefs": 0.2.30 "@polkadot/api": ^8.9.1 - "@polkadot/api-augment": ^8.9.1 "@polkadot/api-derive": ^8.9.1 "@polkadot/networks": ^9.5.1 "@polkadot/types": ^8.9.1 @@ -3050,7 +3049,7 @@ __metadata: dependencies: "@babel/core": ^7.18.5 "@babel/polyfill": ^7.12.1 - "@polkadot/dev": ^0.67.4 + "@polkadot/dev": ^0.67.5 "@polkadot/react-components": ^0.116.2-43 "@types/react-dom": ^18.0.5 "@types/tmp": ^0.2.3 @@ -3084,7 +3083,7 @@ __metadata: "@babel/runtime": ^7.18.3 "@polkadot/apps-config": ^0.116.2-43 "@polkadot/apps-routing": ^0.116.2-43 - "@polkadot/dev": ^0.67.4 + "@polkadot/dev": ^0.67.5 "@polkadot/react-api": ^0.116.2-43 "@polkadot/react-components": ^0.116.2-43 "@polkadot/react-hooks": ^0.116.2-43 @@ -3119,9 +3118,9 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/dev@npm:^0.67.4": - version: 0.67.4 - resolution: "@polkadot/dev@npm:0.67.4" +"@polkadot/dev@npm:^0.67.5": + version: 0.67.5 + resolution: "@polkadot/dev@npm:0.67.5" dependencies: "@babel/cli": ^7.17.10 "@babel/core": ^7.18.5 @@ -3208,7 +3207,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: 456e252db6492fb275d85ef91e57f29bd0a4beaf2d23209986a31abe10f8c2f719199ca86d888f930d229b90edce743831704c7506357590da4cfc28f3b279ec + checksum: 587830384ca6147f0c98e87373bc09be3cfacabe88757eff95085ce85792a677cab38beae270c2f90640864047123e690c80743e8c5354d1bf1599ed8d708571 languageName: node linkType: hard @@ -15853,7 +15852,7 @@ __metadata: "@babel/runtime": ^7.18.3 "@crustio/crust-pin": ^1.0.0 "@pinata/sdk": ^1.1.26 - "@polkadot/dev": ^0.67.4 + "@polkadot/dev": ^0.67.5 "@types/chart.js": ^2.9.37 "@types/file-saver": ^2.0.5 "@types/jest": ^28.1.2