-
Notifications
You must be signed in to change notification settings - Fork 68
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: allow cjs version of packages to export a default value #943
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,25 @@ | ||
// ensure backwards compatibility of commonJs format | ||
const defaultExport = require('../dist/index.js').default; | ||
const implicitDefaultExport = require('../dist/index.js'); | ||
const explicitDefaultExport = require('../dist/index.js').default; | ||
const { AxeBuilder } = require('../dist/index.js'); | ||
const assert = require('assert'); | ||
|
||
assert(typeof defaultExport === 'function', 'default export is not a function'); | ||
assert(typeof AxeBuilder === 'function', 'named export is not a function'); | ||
|
||
assert( | ||
typeof implicitDefaultExport === 'function', | ||
'implicit default export is not a function' | ||
); | ||
assert( | ||
implicitDefaultExport === AxeBuilder, | ||
'implicit default and named export are not the same' | ||
); | ||
|
||
assert( | ||
typeof explicitDefaultExport === 'function', | ||
'explicit default export is not a function' | ||
); | ||
assert( | ||
defaultExport === AxeBuilder, | ||
'default and named export are not the same' | ||
explicitDefaultExport === AxeBuilder, | ||
'explicit default and named export are not the same' | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
import { defineConfig } from 'tsup'; | ||
import { esbuildPluginCJSInterop } from '../../utils/esbuild-plugin-cjs-interop.js'; | ||
|
||
export default defineConfig({ | ||
esbuildPlugins: [esbuildPluginCJSInterop] | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,25 @@ | ||
// ensure backwards compatibility of commonJs format | ||
const defaultExport = require('../dist/index.js').default; | ||
const implicitDefaultExport = require('../dist/index.js'); // support <4.7.3 | ||
const explicitDefaultExport = require('../dist/index.js').default; // support 4.7.3+ | ||
const { AxePuppeteer } = require('../dist/index.js'); | ||
const assert = require('assert'); | ||
|
||
assert(typeof defaultExport === 'function', 'default export is not a function'); | ||
assert(typeof AxePuppeteer === 'function', 'named export is not a function'); | ||
|
||
assert( | ||
typeof implicitDefaultExport === 'function', | ||
'implicit default export is not a function' | ||
); | ||
assert( | ||
implicitDefaultExport === AxePuppeteer, | ||
'implicit default and named export are not the same' | ||
); | ||
|
||
assert( | ||
typeof explicitDefaultExport === 'function', | ||
'explicit default export is not a function' | ||
); | ||
assert( | ||
defaultExport === AxePuppeteer, | ||
'default and named export are not the same' | ||
explicitDefaultExport === AxePuppeteer, | ||
'explicit default and named export are not the same' | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
import { defineConfig } from 'tsup'; | ||
import { esbuildPluginCJSInterop } from '../../utils/esbuild-plugin-cjs-interop.js'; | ||
|
||
export default defineConfig({ | ||
esbuildPlugins: [esbuildPluginCJSInterop] | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
import { defineConfig } from 'tsup'; | ||
import { esbuildPluginCJSInterop } from '../../utils/esbuild-plugin-cjs-interop.js'; | ||
|
||
export default defineConfig({ | ||
esbuildPlugins: [esbuildPluginCJSInterop] | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,18 @@ | ||
// ensure backwards compatibility of commonJs format | ||
const defaultExport = require('../dist/axeReporterEarl.js').default; | ||
const implicitDefaultExport = require('../dist/axeReporterEarl.js'); | ||
const explicitDefaultExport = require('../dist/axeReporterEarl.js').default; | ||
const assert = require('assert'); | ||
|
||
const exportIsFunction = typeof defaultExport === 'function'; | ||
assert(exportIsFunction, 'export is not a function'); | ||
assert( | ||
typeof implicitDefaultExport === 'function', | ||
'implicit default export is not a function' | ||
); | ||
|
||
assert( | ||
typeof explicitDefaultExport === 'function', | ||
'explicit default export is not a function' | ||
); | ||
assert( | ||
explicitDefaultExport === implicitDefaultExport, | ||
'explicit default and named export are not the same' | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
import { defineConfig } from 'tsup'; | ||
import { esbuildPluginCJSInterop } from '../../utils/esbuild-plugin-cjs-interop.js'; | ||
|
||
export default defineConfig({ | ||
esbuildPlugins: [esbuildPluginCJSInterop] | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,25 @@ | ||
// ensure backwards compatibility of commonJs format | ||
const defaultExport = require('../dist/index.js').default; | ||
const implicitDefaultExport = require('../dist/index.js'); | ||
const explicitDefaultExport = require('../dist/index.js').default; | ||
const { AxeBuilder } = require('../dist/index.js'); | ||
const assert = require('assert'); | ||
|
||
assert(typeof defaultExport === 'function', 'default export is not a function'); | ||
assert(typeof AxeBuilder === 'function', 'named export is not a function'); | ||
|
||
assert( | ||
typeof implicitDefaultExport === 'function', | ||
'implicit default export is not a function' | ||
); | ||
assert( | ||
implicitDefaultExport === AxeBuilder, | ||
'implicit default and named export are not the same' | ||
); | ||
|
||
assert( | ||
typeof explicitDefaultExport === 'function', | ||
'explicit default export is not a function' | ||
); | ||
assert( | ||
defaultExport === AxeBuilder, | ||
'default and named export are not the same' | ||
explicitDefaultExport === AxeBuilder, | ||
'explicit default and named export are not the same' | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
import { defineConfig } from 'tsup'; | ||
import { esbuildPluginCJSInterop } from '../../utils/esbuild-plugin-cjs-interop.js'; | ||
|
||
export default defineConfig({ | ||
esbuildPlugins: [esbuildPluginCJSInterop] | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
import { defineConfig } from 'tsup'; | ||
import { esbuildPluginCJSInterop } from '../../utils/esbuild-plugin-cjs-interop.js'; | ||
|
||
export default defineConfig({ | ||
esbuildPlugins: [esbuildPluginCJSInterop] | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
import path from 'path'; | ||
|
||
/** | ||
* "Fixes" the esbuild problem of exporting the CJS default export as `module.exports.default` | ||
* instead of `module.exports`. The plugin appends a block of code to the file that takes the | ||
* `.default` module export and re-exports it as `module.exports`. It then takes all named | ||
* exports and re-exports them as part of the `module.exports` under the same name. This also | ||
* gives the benefit of exporting the `.default` module which allows us to support all 3 export | ||
* styles: the default export, `.default` export, and named exports. | ||
* | ||
* @example | ||
* // file.ts | ||
* export default function myFun() {} | ||
* export const PAGE_STATE = 1 | ||
* | ||
* // index.cjs | ||
* // Run-time. all are valid and work | ||
* const implicitDefaultExport = require('./dist/file.js') | ||
* const explicitDefaultExport = require('./dist/file.js').default | ||
* const { PAGE_STATE as namedExport } = require('./dist/file.js') | ||
*/ | ||
export const esbuildPluginCJSInterop = { | ||
name: 'cjs-interop', | ||
setup(build) { | ||
build.onEnd(result => { | ||
if (build.initialOptions.format === 'cjs') { | ||
result.outputFiles.forEach(file => { | ||
// make sure we're working with a js/cjs file specifically | ||
if (!['.js', '.cjs'].includes(path.extname(file.path))) { | ||
return; | ||
} | ||
|
||
// merge contents with plugin code | ||
const contents = new Uint8Array( | ||
file.contents.length + pluginCode.length | ||
); | ||
contents.set(file.contents); | ||
contents.set(pluginCode, file.contents.length); | ||
file.contents = contents; | ||
}); | ||
} | ||
}); | ||
} | ||
}; | ||
|
||
const pluginCode = new TextEncoder().encode(` | ||
if (module.exports.default) { | ||
var ___default_export = module.exports.default; | ||
var ___export_entries = Object.entries(module.exports); | ||
module.exports = ___default_export; | ||
___export_entries.forEach(([key, value]) => { | ||
if (module.exports[key]) { | ||
throw new Error(\`Export "\${key}" already exists on default export\`); | ||
} | ||
|
||
module.exports[key] = value; | ||
}); | ||
} | ||
`); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there an issue with ESBuild open on this? If not, could you submit one? This feels like it would be a generally useful feature.