diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d3ca1f7b..f104c3d9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,8 +9,8 @@ project adheres to [Semantic Versioning](http://semver.org/). ================== ### Changed ### Added -* Added ESM support. ### Fixed +* Fixed ESM exports. 2.9.1 ================== diff --git a/index.js b/index.js index 4d11d9a81..0cb14a1ed 100644 --- a/index.js +++ b/index.js @@ -55,40 +55,38 @@ function deregisterAllFonts () { return Canvas._deregisterAllFonts() } -module.exports = { - Canvas, - Context2d: CanvasRenderingContext2D, // Legacy/compat export - CanvasRenderingContext2D, - CanvasGradient: bindings.CanvasGradient, - CanvasPattern, - Image, - ImageData: bindings.ImageData, - PNGStream, - PDFStream, - JPEGStream, - DOMMatrix, - DOMPoint, +exports.Canvas = Canvas +exports.Context2d = CanvasRenderingContext2D // Legacy/compat export +exports.CanvasRenderingContext2D = CanvasRenderingContext2D +exports.CanvasGradient = bindings.CanvasGradient +exports.CanvasPattern = CanvasPattern +exports.Image = Image +exports.ImageData = bindings.ImageData +exports.PNGStream = PNGStream +exports.PDFStream = PDFStream +exports.JPEGStream = JPEGStream +exports.DOMMatrix = DOMMatrix +exports.DOMPoint = DOMPoint - registerFont, - deregisterAllFonts, - parseFont, +exports.registerFont = registerFont +exports.deregisterAllFonts = deregisterAllFonts +exports.parseFont = parseFont - createCanvas, - createImageData, - loadImage, +exports.createCanvas = createCanvas +exports.createImageData = createImageData +exports.loadImage = loadImage - backends: bindings.Backends, +exports.backends = bindings.Backends - /** Library version. */ - version: packageJson.version, - /** Cairo version. */ - cairoVersion: bindings.cairoVersion, - /** jpeglib version. */ - jpegVersion: bindings.jpegVersion, - /** gif_lib version. */ - gifVersion: bindings.gifVersion ? bindings.gifVersion.replace(/[^.\d]/g, '') : undefined, - /** freetype version. */ - freetypeVersion: bindings.freetypeVersion, - /** rsvg version. */ - rsvgVersion: bindings.rsvgVersion -} +/** Library version. */ +exports.version = packageJson.version +/** Cairo version. */ +exports.cairoVersion = bindings.cairoVersion +/** jpeglib version. */ +exports.jpegVersion = bindings.jpegVersion +/** gif_lib version. */ +exports.gifVersion = bindings.gifVersion ? bindings.gifVersion.replace(/[^.\d]/g, '') : undefined +/** freetype version. */ +exports.freetypeVersion = bindings.freetypeVersion +/** rsvg version. */ +exports.rsvgVersion = bindings.rsvgVersion diff --git a/index.mjs b/index.mjs deleted file mode 100644 index 158149f6c..000000000 --- a/index.mjs +++ /dev/null @@ -1,28 +0,0 @@ -import mod from './index.js' - -export default mod; -export const { - Canvas, - Context2d, - CanvasRenderingContext2D, - CanvasGradient, - CanvasPattern, - Image, - ImageData, - PNGStream, - DOMMatrix, - DOMPoint, - registerFont, - deregisterAllFonts, - parseFont, - createCanvas, - createImageData, - loadImage, - backends, - version, - cairoVersion, - jpegVersion, - gifVersion, - freetypeVersion, - rsvgVersion -} = mod; diff --git a/package.json b/package.json index 69d7b4a03..5f382675e 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,6 @@ "version": "2.9.1", "author": "TJ Holowaychuk ", "main": "index.js", - "module": "index.mjs", "browser": "browser.js", "contributors": [ "Nathan Rajlich ",