diff --git a/package.json b/package.json index 53602437d..9411bdc58 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ }, "devDependencies": { "@babel/core": "^7.16.7", - "@polkadot/dev": "^0.65.11", + "@polkadot/dev": "^0.65.12", "@types/jest": "^27.4.0" }, "resolutions": { diff --git a/packages/hw-ledger-transports/src/cjs/dirname.d.ts b/packages/hw-ledger-transports/src/cjs/dirname.d.ts deleted file mode 100644 index 9903c5faf..000000000 --- a/packages/hw-ledger-transports/src/cjs/dirname.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/hw-ledger-transports authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -declare const __dirname: string | undefined; - -export default __dirname; diff --git a/packages/hw-ledger-transports/src/cjs/dirname.js b/packages/hw-ledger-transports/src/cjs/dirname.js deleted file mode 100644 index ccdd7de71..000000000 --- a/packages/hw-ledger-transports/src/cjs/dirname.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/hw-ledger-transports authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -module.exports = typeof __dirname === 'string' - ? __dirname.replace('/cjs', '') - : undefined; diff --git a/packages/hw-ledger-transports/src/cjs/package.json b/packages/hw-ledger-transports/src/cjs/package.json deleted file mode 100644 index 96431b98c..000000000 --- a/packages/hw-ledger-transports/src/cjs/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type":"commonjs" -} \ No newline at end of file diff --git a/packages/hw-ledger-transports/src/detectPackage.ts b/packages/hw-ledger-transports/src/detectPackage.ts index 2e353cc3e..3ae2e6524 100644 --- a/packages/hw-ledger-transports/src/detectPackage.ts +++ b/packages/hw-ledger-transports/src/detectPackage.ts @@ -5,8 +5,7 @@ import { detectPackage } from '@polkadot/util'; -import dirname from './cjs/dirname'; import others from './detectOther'; import { packageInfo } from './packageInfo'; -detectPackage(packageInfo, dirname, others); +detectPackage(packageInfo, packageInfo.path, others); diff --git a/packages/hw-ledger-transports/src/packageInfo.ts b/packages/hw-ledger-transports/src/packageInfo.ts index 3a9b378ec..11927d954 100644 --- a/packages/hw-ledger-transports/src/packageInfo.ts +++ b/packages/hw-ledger-transports/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/hw-ledger-transports', version: '8.2.3-23' }; +export const packageInfo = { name: '@polkadot/hw-ledger-transports', path: 'auto', type: 'auto', version: '8.2.3-23' }; diff --git a/packages/hw-ledger/src/cjs/dirname.d.ts b/packages/hw-ledger/src/cjs/dirname.d.ts deleted file mode 100644 index c914c2ba0..000000000 --- a/packages/hw-ledger/src/cjs/dirname.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/hw-ledger authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -declare const __dirname: string | undefined; - -export default __dirname; diff --git a/packages/hw-ledger/src/cjs/dirname.js b/packages/hw-ledger/src/cjs/dirname.js deleted file mode 100644 index 6c41aebc7..000000000 --- a/packages/hw-ledger/src/cjs/dirname.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/hw-ledger authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -module.exports = typeof __dirname === 'string' - ? __dirname.replace('/cjs', '') - : undefined; diff --git a/packages/hw-ledger/src/cjs/package.json b/packages/hw-ledger/src/cjs/package.json deleted file mode 100644 index 96431b98c..000000000 --- a/packages/hw-ledger/src/cjs/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type":"commonjs" -} \ No newline at end of file diff --git a/packages/hw-ledger/src/detectPackage.ts b/packages/hw-ledger/src/detectPackage.ts index 05960c76d..ed108c987 100644 --- a/packages/hw-ledger/src/detectPackage.ts +++ b/packages/hw-ledger/src/detectPackage.ts @@ -5,8 +5,7 @@ import { detectPackage } from '@polkadot/util'; -import dirname from './cjs/dirname'; import others from './detectOther'; import { packageInfo } from './packageInfo'; -detectPackage(packageInfo, dirname, others); +detectPackage(packageInfo, packageInfo.path, others); diff --git a/packages/hw-ledger/src/packageInfo.ts b/packages/hw-ledger/src/packageInfo.ts index de233a75b..8f6901610 100644 --- a/packages/hw-ledger/src/packageInfo.ts +++ b/packages/hw-ledger/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/hw-ledger', version: '8.2.3-23' }; +export const packageInfo = { name: '@polkadot/hw-ledger', path: 'auto', type: 'auto', version: '8.2.3-23' }; diff --git a/packages/keyring/src/cjs/dirname.d.ts b/packages/keyring/src/cjs/dirname.d.ts deleted file mode 100644 index 4b5bf2a3a..000000000 --- a/packages/keyring/src/cjs/dirname.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/keyring authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -declare const __dirname: string | undefined; - -export default __dirname; diff --git a/packages/keyring/src/cjs/dirname.js b/packages/keyring/src/cjs/dirname.js deleted file mode 100644 index a67c88888..000000000 --- a/packages/keyring/src/cjs/dirname.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/keyring authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -module.exports = typeof __dirname === 'string' - ? __dirname.replace('/cjs', '') - : undefined; diff --git a/packages/keyring/src/cjs/package.json b/packages/keyring/src/cjs/package.json deleted file mode 100644 index 96431b98c..000000000 --- a/packages/keyring/src/cjs/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type":"commonjs" -} \ No newline at end of file diff --git a/packages/keyring/src/detectPackage.ts b/packages/keyring/src/detectPackage.ts index b3223b5ad..d364d709f 100644 --- a/packages/keyring/src/detectPackage.ts +++ b/packages/keyring/src/detectPackage.ts @@ -5,8 +5,7 @@ import { detectPackage } from '@polkadot/util'; -import dirname from './cjs/dirname'; import others from './detectOther'; import { packageInfo } from './packageInfo'; -detectPackage(packageInfo, dirname, others); +detectPackage(packageInfo, packageInfo.path, others); diff --git a/packages/keyring/src/packageInfo.ts b/packages/keyring/src/packageInfo.ts index c6786b9a5..1911e97bd 100644 --- a/packages/keyring/src/packageInfo.ts +++ b/packages/keyring/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/keyring', version: '8.2.3-23' }; +export const packageInfo = { name: '@polkadot/keyring', path: 'auto', type: 'auto', version: '8.2.3-23' }; diff --git a/packages/networks/src/cjs/dirname.d.ts b/packages/networks/src/cjs/dirname.d.ts deleted file mode 100644 index 1c9f19130..000000000 --- a/packages/networks/src/cjs/dirname.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/networks authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -declare const __dirname: string | undefined; - -export default __dirname; diff --git a/packages/networks/src/cjs/dirname.js b/packages/networks/src/cjs/dirname.js deleted file mode 100644 index e38564cde..000000000 --- a/packages/networks/src/cjs/dirname.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/networks authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -module.exports = typeof __dirname === 'string' - ? __dirname.replace('/cjs', '') - : undefined; diff --git a/packages/networks/src/cjs/package.json b/packages/networks/src/cjs/package.json deleted file mode 100644 index 96431b98c..000000000 --- a/packages/networks/src/cjs/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type":"commonjs" -} \ No newline at end of file diff --git a/packages/networks/src/detectPackage.ts b/packages/networks/src/detectPackage.ts index 37ee1d273..2e979d96f 100644 --- a/packages/networks/src/detectPackage.ts +++ b/packages/networks/src/detectPackage.ts @@ -5,8 +5,7 @@ import { detectPackage } from '@polkadot/util'; -import dirname from './cjs/dirname'; import others from './detectOther'; import { packageInfo } from './packageInfo'; -detectPackage(packageInfo, dirname, others); +detectPackage(packageInfo, packageInfo.path, others); diff --git a/packages/networks/src/packageInfo.ts b/packages/networks/src/packageInfo.ts index db1d98581..13289059e 100644 --- a/packages/networks/src/packageInfo.ts +++ b/packages/networks/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/networks', version: '8.2.3-23' }; +export const packageInfo = { name: '@polkadot/networks', path: 'auto', type: 'auto', version: '8.2.3-23' }; diff --git a/packages/util-crypto/src/cjs/dirname.d.ts b/packages/util-crypto/src/cjs/dirname.d.ts deleted file mode 100644 index e50e12dcc..000000000 --- a/packages/util-crypto/src/cjs/dirname.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/util-crypto authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -declare const __dirname: string | undefined; - -export default __dirname; diff --git a/packages/util-crypto/src/cjs/dirname.js b/packages/util-crypto/src/cjs/dirname.js deleted file mode 100644 index 82e4fb55c..000000000 --- a/packages/util-crypto/src/cjs/dirname.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/util-crypto authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -module.exports = typeof __dirname === 'string' - ? __dirname.replace('/cjs', '') - : undefined; diff --git a/packages/util-crypto/src/cjs/package.json b/packages/util-crypto/src/cjs/package.json deleted file mode 100644 index 96431b98c..000000000 --- a/packages/util-crypto/src/cjs/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type":"commonjs" -} \ No newline at end of file diff --git a/packages/util-crypto/src/detectPackage.ts b/packages/util-crypto/src/detectPackage.ts index 6777085cc..4d7496971 100644 --- a/packages/util-crypto/src/detectPackage.ts +++ b/packages/util-crypto/src/detectPackage.ts @@ -5,8 +5,7 @@ import { detectPackage } from '@polkadot/util'; -import dirname from './cjs/dirname'; import others from './detectOther'; import { packageInfo } from './packageInfo'; -detectPackage(packageInfo, dirname, others); +detectPackage(packageInfo, packageInfo.path, others); diff --git a/packages/util-crypto/src/packageInfo.ts b/packages/util-crypto/src/packageInfo.ts index d1e14537e..dcb72197e 100644 --- a/packages/util-crypto/src/packageInfo.ts +++ b/packages/util-crypto/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/util-crypto', version: '8.2.3-23' }; +export const packageInfo = { name: '@polkadot/util-crypto', path: 'auto', type: 'auto', version: '8.2.3-23' }; diff --git a/packages/util/src/cjs/dirname.d.ts b/packages/util/src/cjs/dirname.d.ts deleted file mode 100644 index 24f17e5a7..000000000 --- a/packages/util/src/cjs/dirname.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/util authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -declare const __dirname: string | undefined; - -export default __dirname; diff --git a/packages/util/src/cjs/dirname.js b/packages/util/src/cjs/dirname.js deleted file mode 100644 index 7290cfc4c..000000000 --- a/packages/util/src/cjs/dirname.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2022 @polkadot/util authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Do not edit, auto-generated by @polkadot/dev - -module.exports = typeof __dirname === 'string' - ? __dirname.replace('/cjs', '') - : undefined; diff --git a/packages/util/src/cjs/package.json b/packages/util/src/cjs/package.json deleted file mode 100644 index 96431b98c..000000000 --- a/packages/util/src/cjs/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type":"commonjs" -} \ No newline at end of file diff --git a/packages/util/src/detectPackage.ts b/packages/util/src/detectPackage.ts index 3a89d5ae5..9ee661b9b 100644 --- a/packages/util/src/detectPackage.ts +++ b/packages/util/src/detectPackage.ts @@ -3,7 +3,7 @@ // For esm, this should be import.meta.url or to get the same behavior as __dirname, we can use // -// new URL(import.meta.url).pathname) +// new URL(import.meta.url).pathname // // The issue is the WP4 has "some" issues with import.meta.url. So because of bundlers, we can't have // nice things... In this case it is even worse since import.meta.url won't even make it compile, so @@ -16,9 +16,8 @@ // // With the above we additionally need a .d.ts to just export the packageInfo -import __dirname from './cjs/dirname'; import others from './detectOther'; import { packageInfo } from './packageInfo'; import { detectPackage } from './versionDetect'; -detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, others); +detectPackage(packageInfo, packageInfo.path, others); diff --git a/packages/util/src/packageInfo.ts b/packages/util/src/packageInfo.ts index 976e2b755..7a836540b 100644 --- a/packages/util/src/packageInfo.ts +++ b/packages/util/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/util', version: '8.2.3-23' }; +export const packageInfo = { name: '@polkadot/util', path: 'auto', type: 'auto', version: '8.2.3-23' }; diff --git a/packages/x-bigint/src/packageInfo.ts b/packages/x-bigint/src/packageInfo.ts index 3fe72dd4a..fe428648f 100644 --- a/packages/x-bigint/src/packageInfo.ts +++ b/packages/x-bigint/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/x-bigint', version: '8.2.3-23' }; +export const packageInfo = { name: '@polkadot/x-bigint', path: 'auto', type: 'auto', version: '8.2.3-23' }; diff --git a/packages/x-bundle/src/packageInfo.ts b/packages/x-bundle/src/packageInfo.ts index 7495d7572..7222380f4 100644 --- a/packages/x-bundle/src/packageInfo.ts +++ b/packages/x-bundle/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/x-bundle', version: '8.2.3-23' }; +export const packageInfo = { name: '@polkadot/x-bundle', path: 'auto', type: 'auto', version: '8.2.3-23' }; diff --git a/packages/x-fetch/src/packageInfo.ts b/packages/x-fetch/src/packageInfo.ts index 6950f69de..993e9be28 100644 --- a/packages/x-fetch/src/packageInfo.ts +++ b/packages/x-fetch/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/x-fetch', version: '8.2.3-23' }; +export const packageInfo = { name: '@polkadot/x-fetch', path: 'auto', type: 'auto', version: '8.2.3-23' }; diff --git a/packages/x-global/src/packageInfo.ts b/packages/x-global/src/packageInfo.ts index 165d9b77c..ab6c46ffc 100644 --- a/packages/x-global/src/packageInfo.ts +++ b/packages/x-global/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/x-global', version: '8.2.3-23' }; +export const packageInfo = { name: '@polkadot/x-global', path: 'auto', type: 'auto', version: '8.2.3-23' }; diff --git a/packages/x-randomvalues/src/packageInfo.ts b/packages/x-randomvalues/src/packageInfo.ts index e3f5cfb27..508f5cf09 100644 --- a/packages/x-randomvalues/src/packageInfo.ts +++ b/packages/x-randomvalues/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/x-randomvalues', version: '8.2.3-23' }; +export const packageInfo = { name: '@polkadot/x-randomvalues', path: 'auto', type: 'auto', version: '8.2.3-23' }; diff --git a/packages/x-textdecoder/src/packageInfo.ts b/packages/x-textdecoder/src/packageInfo.ts index 0cb49960b..7ba83fb24 100644 --- a/packages/x-textdecoder/src/packageInfo.ts +++ b/packages/x-textdecoder/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/x-textdecoder', version: '8.2.3-23' }; +export const packageInfo = { name: '@polkadot/x-textdecoder', path: 'auto', type: 'auto', version: '8.2.3-23' }; diff --git a/packages/x-textencoder/src/packageInfo.ts b/packages/x-textencoder/src/packageInfo.ts index 74dc99b62..ade77be78 100644 --- a/packages/x-textencoder/src/packageInfo.ts +++ b/packages/x-textencoder/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/x-textencoder', version: '8.2.3-23' }; +export const packageInfo = { name: '@polkadot/x-textencoder', path: 'auto', type: 'auto', version: '8.2.3-23' }; diff --git a/packages/x-ws/src/packageInfo.ts b/packages/x-ws/src/packageInfo.ts index 4e906de2d..6991d6599 100644 --- a/packages/x-ws/src/packageInfo.ts +++ b/packages/x-ws/src/packageInfo.ts @@ -3,4 +3,4 @@ // Do not edit, auto-generated by @polkadot/dev -export const packageInfo = { name: '@polkadot/x-ws', version: '8.2.3-23' }; +export const packageInfo = { name: '@polkadot/x-ws', path: 'auto', type: 'auto', version: '8.2.3-23' }; diff --git a/yarn.lock b/yarn.lock index 5064097f6..046e30d73 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1958,9 +1958,9 @@ __metadata: languageName: node linkType: hard -"@polkadot/dev@npm:^0.65.11": - version: 0.65.11 - resolution: "@polkadot/dev@npm:0.65.11" +"@polkadot/dev@npm:^0.65.12": + version: 0.65.12 + resolution: "@polkadot/dev@npm:0.65.12" dependencies: "@babel/cli": ^7.16.7 "@babel/core": ^7.16.7 @@ -2046,7 +2046,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: fff61419134166317047d50f30761596fba9b0fdffeae0e544edac09f4a49388ed969586dc2a121d83bcfcfdaa8a56111206f5fe7a745ef2be223d14b31eb9fa + checksum: 8cb36b8057af0bb07d519fc6dcb69a41eb167e62ce01c15041631c3cfeeac76b5c9060ab607e258f00ba6b8a35ca0d204db33671cf54c858f05beda2c5668909 languageName: node linkType: hard @@ -9175,7 +9175,7 @@ resolve@^2.0.0-next.3: resolution: "root-workspace-0b6124@workspace:." dependencies: "@babel/core": ^7.16.7 - "@polkadot/dev": ^0.65.11 + "@polkadot/dev": ^0.65.12 "@types/jest": ^27.4.0 languageName: unknown linkType: soft