diff --git a/CHANGELOG.md b/CHANGELOG.md index a67f0996..7c191f81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ Changes: - Ensure that only latest metadata is applied (when multiple genesis) - Rename all `*.test.ts` to `*.spec.ts` (cross-repo consistency) +- Ensure package path is availble under ESM & CJS ## 0.42.4 Dec 27, 2021 diff --git a/packages/extension-base/src/cjs/dirname.d.ts b/packages/extension-base/src/cjs/dirname.d.ts new file mode 100644 index 00000000..0214884a --- /dev/null +++ b/packages/extension-base/src/cjs/dirname.d.ts @@ -0,0 +1,6 @@ +// Copyright 2017-2021 @polkadot/extension-chains authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +declare const __dirname: string | undefined; + +export default __dirname; diff --git a/packages/extension-base/src/cjs/dirname.js b/packages/extension-base/src/cjs/dirname.js new file mode 100644 index 00000000..131f72fc --- /dev/null +++ b/packages/extension-base/src/cjs/dirname.js @@ -0,0 +1,6 @@ +// Copyright 2017-2021 @polkadot/extension-chains authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +module.exports = typeof __dirname === 'string' + ? __dirname.replace('/cjs', '') + : undefined; diff --git a/packages/extension-base/src/cjs/package.json b/packages/extension-base/src/cjs/package.json new file mode 100644 index 00000000..5bbefffb --- /dev/null +++ b/packages/extension-base/src/cjs/package.json @@ -0,0 +1,3 @@ +{ + "type": "commonjs" +} diff --git a/packages/extension-base/src/detectPackage.ts b/packages/extension-base/src/detectPackage.ts index 24af38a7..b0277e66 100644 --- a/packages/extension-base/src/detectPackage.ts +++ b/packages/extension-base/src/detectPackage.ts @@ -6,6 +6,7 @@ import { packageInfo as dappInfo } from '@polkadot/extension-dapp/packageInfo'; import { packageInfo as injectInfo } from '@polkadot/extension-inject/packageInfo'; import { detectPackage } from '@polkadot/util'; +import __dirname from './cjs/dirname'; import { packageInfo } from './packageInfo'; detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [chainsInfo, dappInfo, injectInfo]); diff --git a/packages/extension-base/src/index.ts b/packages/extension-base/src/index.ts index 174e9f35..d90eb31c 100644 --- a/packages/extension-base/src/index.ts +++ b/packages/extension-base/src/index.ts @@ -1,6 +1,7 @@ // Copyright 2019-2021 @polkadot/extension-base authors & contributors // SPDX-License-Identifier: Apache-2.0 -import './detectPackage'; +// Since we inject into pages, we skip this +// import './detectPackage'; export * from './bundle'; diff --git a/packages/extension-chains/src/cjs/dirname.d.ts b/packages/extension-chains/src/cjs/dirname.d.ts new file mode 100644 index 00000000..0214884a --- /dev/null +++ b/packages/extension-chains/src/cjs/dirname.d.ts @@ -0,0 +1,6 @@ +// Copyright 2017-2021 @polkadot/extension-chains authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +declare const __dirname: string | undefined; + +export default __dirname; diff --git a/packages/extension-chains/src/cjs/dirname.js b/packages/extension-chains/src/cjs/dirname.js new file mode 100644 index 00000000..131f72fc --- /dev/null +++ b/packages/extension-chains/src/cjs/dirname.js @@ -0,0 +1,6 @@ +// Copyright 2017-2021 @polkadot/extension-chains authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +module.exports = typeof __dirname === 'string' + ? __dirname.replace('/cjs', '') + : undefined; diff --git a/packages/extension-chains/src/cjs/package.json b/packages/extension-chains/src/cjs/package.json new file mode 100644 index 00000000..5bbefffb --- /dev/null +++ b/packages/extension-chains/src/cjs/package.json @@ -0,0 +1,3 @@ +{ + "type": "commonjs" +} diff --git a/packages/extension-chains/src/detectPackage.ts b/packages/extension-chains/src/detectPackage.ts index 303075bd..4c5e9498 100644 --- a/packages/extension-chains/src/detectPackage.ts +++ b/packages/extension-chains/src/detectPackage.ts @@ -4,6 +4,7 @@ import { packageInfo as injectInfo } from '@polkadot/extension-inject/packageInfo'; import { detectPackage } from '@polkadot/util'; +import __dirname from './cjs/dirname'; import { packageInfo } from './packageInfo'; detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [injectInfo]); diff --git a/packages/extension-chains/src/index.ts b/packages/extension-chains/src/index.ts index c32a091a..8d0f87a4 100644 --- a/packages/extension-chains/src/index.ts +++ b/packages/extension-chains/src/index.ts @@ -1,6 +1,7 @@ // Copyright 2019-2021 @polkadot/extension-chains authors & contributors // SPDX-License-Identifier: Apache-2.0 -import './detectPackage'; +// Since we inject into pages, we skip this +// import './detectPackage'; export * from './bundle'; diff --git a/packages/extension-compat-metamask/src/cjs/dirname.d.ts b/packages/extension-compat-metamask/src/cjs/dirname.d.ts new file mode 100644 index 00000000..0214884a --- /dev/null +++ b/packages/extension-compat-metamask/src/cjs/dirname.d.ts @@ -0,0 +1,6 @@ +// Copyright 2017-2021 @polkadot/extension-chains authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +declare const __dirname: string | undefined; + +export default __dirname; diff --git a/packages/extension-compat-metamask/src/cjs/dirname.js b/packages/extension-compat-metamask/src/cjs/dirname.js new file mode 100644 index 00000000..131f72fc --- /dev/null +++ b/packages/extension-compat-metamask/src/cjs/dirname.js @@ -0,0 +1,6 @@ +// Copyright 2017-2021 @polkadot/extension-chains authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +module.exports = typeof __dirname === 'string' + ? __dirname.replace('/cjs', '') + : undefined; diff --git a/packages/extension-compat-metamask/src/cjs/package.json b/packages/extension-compat-metamask/src/cjs/package.json new file mode 100644 index 00000000..5bbefffb --- /dev/null +++ b/packages/extension-compat-metamask/src/cjs/package.json @@ -0,0 +1,3 @@ +{ + "type": "commonjs" +} diff --git a/packages/extension-compat-metamask/src/detectPackage.ts b/packages/extension-compat-metamask/src/detectPackage.ts index 303075bd..4c5e9498 100644 --- a/packages/extension-compat-metamask/src/detectPackage.ts +++ b/packages/extension-compat-metamask/src/detectPackage.ts @@ -4,6 +4,7 @@ import { packageInfo as injectInfo } from '@polkadot/extension-inject/packageInfo'; import { detectPackage } from '@polkadot/util'; +import __dirname from './cjs/dirname'; import { packageInfo } from './packageInfo'; detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [injectInfo]); diff --git a/packages/extension-compat-metamask/src/index.ts b/packages/extension-compat-metamask/src/index.ts index 211fed71..4e92fa56 100644 --- a/packages/extension-compat-metamask/src/index.ts +++ b/packages/extension-compat-metamask/src/index.ts @@ -1,6 +1,7 @@ // Copyright 2019-2020 @polkadot/extension-compat-metamask authors & contributors // SPDX-License-Identifier: Apache-2.0 -import './detectPackage'; +// Since we inject into pages, we skip this +// import './detectPackage'; export * from './bundle'; diff --git a/packages/extension-dapp/src/cjs/dirname.d.ts b/packages/extension-dapp/src/cjs/dirname.d.ts new file mode 100644 index 00000000..047206f9 --- /dev/null +++ b/packages/extension-dapp/src/cjs/dirname.d.ts @@ -0,0 +1,6 @@ +// Copyright 2017-2021 @polkadot/extension-dapp authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +declare const __dirname: string | undefined; + +export default __dirname; diff --git a/packages/extension-dapp/src/cjs/dirname.js b/packages/extension-dapp/src/cjs/dirname.js new file mode 100644 index 00000000..8ffeb144 --- /dev/null +++ b/packages/extension-dapp/src/cjs/dirname.js @@ -0,0 +1,6 @@ +// Copyright 2017-2021 @polkadot/extension-dapp authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +module.exports = typeof __dirname === 'string' + ? __dirname.replace('/cjs', '') + : undefined; diff --git a/packages/extension-dapp/src/cjs/package.json b/packages/extension-dapp/src/cjs/package.json new file mode 100644 index 00000000..5bbefffb --- /dev/null +++ b/packages/extension-dapp/src/cjs/package.json @@ -0,0 +1,3 @@ +{ + "type": "commonjs" +} diff --git a/packages/extension-dapp/src/detectPackage.ts b/packages/extension-dapp/src/detectPackage.ts index 69e8252e..23a1d850 100644 --- a/packages/extension-dapp/src/detectPackage.ts +++ b/packages/extension-dapp/src/detectPackage.ts @@ -4,6 +4,7 @@ import { packageInfo as injectInfo } from '@polkadot/extension-inject/packageInfo'; import { detectPackage } from '@polkadot/util'; +import __dirname from './cjs/dirname'; import { packageInfo } from './packageInfo'; detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [injectInfo]); diff --git a/packages/extension-dapp/src/index.ts b/packages/extension-dapp/src/index.ts index ff3eb27b..2ee26266 100644 --- a/packages/extension-dapp/src/index.ts +++ b/packages/extension-dapp/src/index.ts @@ -1,6 +1,7 @@ // Copyright 2019-2021 @polkadot/extension-dapp authors & contributors // SPDX-License-Identifier: Apache-2.0 -import './detectPackage'; +// Since we inject into pages, we skip this +// import './detectPackage'; export * from './bundle'; diff --git a/packages/extension-inject/src/cjs/dirname.d.ts b/packages/extension-inject/src/cjs/dirname.d.ts new file mode 100644 index 00000000..a380141c --- /dev/null +++ b/packages/extension-inject/src/cjs/dirname.d.ts @@ -0,0 +1,6 @@ +// Copyright 2017-2021 @polkadot/extension-inject authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +declare const __dirname: string | undefined; + +export default __dirname; diff --git a/packages/extension-inject/src/cjs/dirname.js b/packages/extension-inject/src/cjs/dirname.js new file mode 100644 index 00000000..32d4d0be --- /dev/null +++ b/packages/extension-inject/src/cjs/dirname.js @@ -0,0 +1,6 @@ +// Copyright 2017-2021 @polkadot/extension-inject authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +module.exports = typeof __dirname === 'string' + ? __dirname.replace('/cjs', '') + : undefined; diff --git a/packages/extension-inject/src/cjs/package.json b/packages/extension-inject/src/cjs/package.json new file mode 100644 index 00000000..5bbefffb --- /dev/null +++ b/packages/extension-inject/src/cjs/package.json @@ -0,0 +1,3 @@ +{ + "type": "commonjs" +} diff --git a/packages/extension-inject/src/detectPackage.ts b/packages/extension-inject/src/detectPackage.ts index 90ebe696..6776e4e5 100644 --- a/packages/extension-inject/src/detectPackage.ts +++ b/packages/extension-inject/src/detectPackage.ts @@ -3,6 +3,7 @@ import { detectPackage } from '@polkadot/util'; +import __dirname from './cjs/dirname'; import { packageInfo } from './packageInfo'; detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, []); diff --git a/packages/extension-inject/src/index.ts b/packages/extension-inject/src/index.ts index c374751e..c1b7d4d1 100644 --- a/packages/extension-inject/src/index.ts +++ b/packages/extension-inject/src/index.ts @@ -1,6 +1,7 @@ // Copyright 2019-2021 @polkadot/extension-inject authors & contributors // SPDX-License-Identifier: Apache-2.0 -import './detectPackage'; +// Since we inject into pages, we skip this +// import './detectPackage'; export * from './bundle'; diff --git a/packages/extension/src/cjs/dirname.d.ts b/packages/extension/src/cjs/dirname.d.ts new file mode 100644 index 00000000..488c38c6 --- /dev/null +++ b/packages/extension/src/cjs/dirname.d.ts @@ -0,0 +1,6 @@ +// Copyright 2017-2021 @polkadot/extension authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +declare const __dirname: string | undefined; + +export default __dirname; diff --git a/packages/extension/src/cjs/dirname.js b/packages/extension/src/cjs/dirname.js new file mode 100644 index 00000000..fff1d867 --- /dev/null +++ b/packages/extension/src/cjs/dirname.js @@ -0,0 +1,6 @@ +// Copyright 2017-2021 @polkadot/extension authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +module.exports = typeof __dirname === 'string' + ? __dirname.replace('/cjs', '') + : undefined; diff --git a/packages/extension/src/cjs/package.json b/packages/extension/src/cjs/package.json new file mode 100644 index 00000000..5bbefffb --- /dev/null +++ b/packages/extension/src/cjs/package.json @@ -0,0 +1,3 @@ +{ + "type": "commonjs" +} diff --git a/packages/extension/src/detectPackage.ts b/packages/extension/src/detectPackage.ts index 5703d0d5..f05bde57 100644 --- a/packages/extension/src/detectPackage.ts +++ b/packages/extension/src/detectPackage.ts @@ -3,6 +3,7 @@ import { detectPackage } from '@polkadot/util'; +import __dirname from './cjs/dirname'; import { packageInfo } from './packageInfo'; detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, []);