diff --git a/packages/json/package.json b/packages/json/package.json index d807352f6..6fb2c3c86 100755 --- a/packages/json/package.json +++ b/packages/json/package.json @@ -11,6 +11,7 @@ "homepage": "https://github.com/rollup/plugins/tree/master/packages/json#readme", "bugs": "https://github.com/rollup/plugins/issues", "main": "dist/index.js", + "module": "dist/index.es.js", "scripts": { "build": "rollup -c", "ci:coverage": "nyc pnpm run test && nyc report --reporter=text-lcov > coverage.lcov", @@ -18,7 +19,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose && pnpm run test:ts", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:json && pnpm run lint:package", - "lint:docs": "prettier --single-quote --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", "lint:js": "eslint --fix --cache src test types --ext .js,.ts", "lint:json": "prettier --write \"test/fixtures/!(garbage)/*.json\"", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", @@ -51,17 +52,20 @@ }, "devDependencies": { "@rollup/plugin-buble": "^0.21.0", - "@rollup/plugin-node-resolve": "^7.0.0", - "source-map-support": "^0.5.16" + "@rollup/plugin-node-resolve": "^8.4.0", + "rollup": "^2.23.0", + "source-map-support": "^0.5.19" }, + "types": "types/index.d.ts", "ava": { + "babel": { + "compileEnhancements": false + }, "files": [ "!**/fixtures/**", "!**/helpers/**", "!**/recipes/**", "!**/types.ts" ] - }, - "module": "dist/index.es.js", - "types": "types/index.d.ts" + } } diff --git a/packages/json/rollup.config.js b/packages/json/rollup.config.js index df207446a..e7b3f0332 100755 --- a/packages/json/rollup.config.js +++ b/packages/json/rollup.config.js @@ -7,7 +7,7 @@ const external = Object.keys(pkg.dependencies); export default { input: 'src/index.js', output: [ - { file: pkg.main, format: 'cjs', sourcemap: true }, + { file: pkg.main, format: 'cjs', sourcemap: true, exports: 'auto' }, { file: pkg.module, format: 'es', sourcemap: true } ], plugins: [buble()], diff --git a/packages/json/test/test.js b/packages/json/test/test.js index 6849d60e9..fab9181bc 100755 --- a/packages/json/test/test.js +++ b/packages/json/test/test.js @@ -3,7 +3,7 @@ const { readFileSync } = require('fs'); const test = require('ava'); const { rollup } = require('rollup'); -const resolve = require('@rollup/plugin-node-resolve'); +const { nodeResolve } = require('@rollup/plugin-node-resolve'); const { testBundle } = require('../../../util/test'); @@ -57,7 +57,7 @@ test('generates named exports', async (t) => { test('resolves extensionless imports in conjunction with the node-resolve plugin', async (t) => { const bundle = await rollup({ input: 'fixtures/extensionless/main.js', - plugins: [resolve({ extensions: ['.js', '.json'] }), json()] + plugins: [nodeResolve({ extensions: ['.js', '.json'] }), json()] }); t.plan(2); return testBundle(t, bundle); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1f3c12872..b135f0c6f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -257,16 +257,18 @@ importers: typescript: ^3.9.7 packages/json: dependencies: - '@rollup/pluginutils': 3.1.0 + '@rollup/pluginutils': 3.1.0_rollup@2.23.0 devDependencies: - '@rollup/plugin-buble': 0.21.3 - '@rollup/plugin-node-resolve': 7.1.1 - source-map-support: 0.5.16 + '@rollup/plugin-buble': 0.21.3_rollup@2.23.0 + '@rollup/plugin-node-resolve': 8.4.0_rollup@2.23.0 + rollup: 2.23.0 + source-map-support: 0.5.19 specifiers: '@rollup/plugin-buble': ^0.21.0 - '@rollup/plugin-node-resolve': ^7.0.0 + '@rollup/plugin-node-resolve': ^8.4.0 '@rollup/pluginutils': ^3.0.8 - source-map-support: ^0.5.16 + rollup: ^2.23.0 + source-map-support: ^0.5.19 packages/legacy: devDependencies: '@rollup/plugin-buble': 0.20.0_rollup@2.23.0 @@ -1580,18 +1582,6 @@ packages: rollup: ^1.20.0 resolution: integrity: sha512-3Qkoa3n+6NjQggLkN5R6ouVL3/jveyqjJjJXxbk04HEig/97YyOwoimWYIOC5vlQ60Z+xLhnAvGd6mM0gFY2wQ== - /@rollup/plugin-buble/0.21.3: - dependencies: - '@rollup/pluginutils': 3.1.0 - '@types/buble': 0.19.2 - buble: 0.20.0 - dev: true - engines: - node: '>= 8.0.0' - peerDependencies: - rollup: ^1.20.0||^2.0.0 - resolution: - integrity: sha512-Iv8cCuFPnMdqV4pcyU+OrfjOfagPArRQ1PyQjx5KgHk3dARedI+8PNTLSMpJts0lQJr8yF2pAU4GxpxCBJ9HYw== /@rollup/plugin-buble/0.21.3_rollup@2.23.0: dependencies: '@rollup/pluginutils': 3.1.0_rollup@2.23.0 @@ -1831,17 +1821,6 @@ packages: rollup: ^1.20.0 resolution: integrity: sha512-rYGeAc4sxcZ+kPG/Tw4/fwJODC3IXHYDH4qusdN/b6aLw5LPUbzpecYbEJh4sVQGPFJxd2dBU4kc1H3oy9/bnw== - /@rollup/pluginutils/3.1.0: - dependencies: - '@types/estree': 0.0.39 - estree-walker: 1.0.1 - picomatch: 2.2.2 - engines: - node: '>= 8.0.0' - peerDependencies: - rollup: ^1.20.0||^2.0.0 - resolution: - integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg== /@rollup/pluginutils/3.1.0_rollup@2.2.0: dependencies: '@types/estree': 0.0.39 @@ -7059,13 +7038,6 @@ packages: node: '>=4' resolution: integrity: sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= - /source-map-support/0.5.16: - dependencies: - buffer-from: 1.1.1 - source-map: 0.6.1 - dev: true - resolution: - integrity: sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ== /source-map-support/0.5.19: dependencies: buffer-from: 1.1.1