rollup · Oct 9, 2022 · Oct 10, 2022 · Oct 10, 2022 · Oct 10, 2022 · Oct 10, 2022
diff --git a/packages/inject/CHANGELOG.md b/packages/inject/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @rollup/plugin-inject ChangeLog
 
+## v5.0.1
+
+_2022-10-15_
+
+### Bugfixes
+
+- fix: detect references inside object destructuring [#1241](https://github.com/rollup/plugins/pull/1241)
+
+## v5.0.0
+
+_2022-10-09_
+
+### Breaking Changes
+
+- fix: prepare for Rollup 3 [#1292](https://github.com/rollup/plugins/pull/1292)
+
 ## v4.0.4
 
 _2021-12-28_

diff --git a/packages/inject/package.json b/packages/inject/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-inject",
-  "version": "4.0.4",
+  "version": "5.0.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/inject/src/index.js b/packages/inject/src/index.js
@@ -167,7 +167,7 @@ export default function inject(options) {
 
           // special case – shorthand properties. because node.key === node.value,
           // we can't differentiate once we've descended into the node
-          if (node.type === 'Property' && node.shorthand) {
+          if (node.type === 'Property' && node.shorthand && node.value.type === 'Identifier') {
             const { name } = node.key;
             handleReference(node, name, name);
             this.skip();

diff --git a/packages/inject/test/fixtures/shorthand-assignment/input.js b/packages/inject/test/fixtures/shorthand-assignment/input.js
@@ -0,0 +1,3 @@
+const { Promise = "fallback" } = foo;
+console.log(Promise);
+
diff --git a/packages/inject/test/fixtures/shorthand-func-fallback/input.js b/packages/inject/test/fixtures/shorthand-func-fallback/input.js
@@ -0,0 +1,5 @@
+function foo({bar = Promise}) {
+  console.log(bar);
+}
+foo();
+
diff --git a/packages/inject/test/fixtures/shorthand-func/input.js b/packages/inject/test/fixtures/shorthand-func/input.js
@@ -0,0 +1,5 @@
+function foo({Promise}) {
+  console.log(Promise);
+}
+foo();
+
diff --git a/packages/inject/test/snapshots/test.js.md b/packages/inject/test/snapshots/test.js.md
@@ -103,6 +103,39 @@ Generated by [AVA](https://avajs.dev).
     polyfills.Promise.resolve().then(() => 'it works');␊
     `
 
+## handles shorthand properties (as assignment)
+
+> Snapshot 1
+
+    `const { Promise = "fallback" } = foo;␊
+    console.log(Promise);␊
+    ␊
+    `
+
+## handles shorthand properties in function
+
+> Snapshot 1
+
+    `function foo({Promise}) {␊
+      console.log(Promise);␊
+    }␊
+    foo();␊
+    ␊
+    `
+
+## handles shorthand properties in function (as fallback value)
+
+> Snapshot 1
+
+    `import { Promise as Promise } from 'es6-promise';␊
+    ␊
+    function foo({bar = Promise}) {␊
+      console.log(bar);␊
+    }␊
+    foo();␊
+    ␊
+    `
+
 ## handles redundant keys
 
 > Snapshot 1

diff --git a/packages/inject/test/snapshots/test.js.snap b/packages/inject/test/snapshots/test.js.snap
diff --git a/packages/inject/test/test.js b/packages/inject/test/test.js
@@ -70,6 +70,18 @@ test('handles shorthand properties', (t) => {
   compare(t, 'shorthand', { Promise: ['es6-promise', 'Promise'] });
 });
 
+test('handles shorthand properties (as assignment)', (t) => {
+  compare(t, 'shorthand-assignment', { Promise: ['es6-promise', 'Promise'] });
+});
+
+test('handles shorthand properties in function', (t) => {
+  compare(t, 'shorthand-func', { Promise: ['es6-promise', 'Promise'] });
+});
+
+test('handles shorthand properties in function (as fallback value)', (t) => {
+  compare(t, 'shorthand-func-fallback', { Promise: ['es6-promise', 'Promise'] });
+});
+
 test('handles redundant keys', (t) => {
   compare(t, 'redundant-keys', {
     Buffer: 'Buffer',

diff --git a/packages/json/CHANGELOG.md b/packages/json/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rollup/plugin-json ChangeLog
 
+## v5.0.0
+
+_2022-10-10_
+
+### Breaking Changes
+
+- fix: prepare for Rollup 3 [#1291](https://github.com/rollup/plugins/pull/1291)
+
+### Updates
+
+- chore: update dependencies ([678125b](https://github.com/rollup/plugins/commit/678125b5396bd3e8193c39d7d90e33d3f76cf7d8))
+
 ## v4.1.0
 
 _2020-06-05_

diff --git a/packages/json/README.md b/packages/json/README.md
@@ -13,7 +13,7 @@
 
 ## Requirements
 
-This plugin requires an [LTS](https://github.com/nodejs/Release) Node version (v8.0.0+) and Rollup v1.20.0+.
+This plugin requires an [LTS](https://github.com/nodejs/Release) Node version (v14.0.0+) and Rollup v1.20.0+.
 
 ## Install
 
@@ -46,7 +46,9 @@ With an accompanying file `src/index.js`, the local `package.json` file would no
 
 ```js
 // src/index.js
-import pkg from './package.json';
+import { readFileSync } from 'fs';
+
+const pkg = JSON.parse(readFileSync(new URL('./package.json', import.meta.url), 'utf8'));
 console.log(`running version ${pkg.version}`);
 ```
 

diff --git a/packages/json/package.json b/packages/json/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-json",
-  "version": "4.1.0",
+  "version": "5.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -13,8 +13,16 @@
   "author": "rollup",
   "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",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/es/index.js",
+  "exports": {
+    "types": "./types/index.d.ts",
+    "import": "./dist/es/index.js",
+    "default": "./dist/cjs/index.js"
+  },
+  "engines": {
+    "node": ">=14.0.0"
+  },
   "scripts": {
     "build": "rollup -c",
     "ci:coverage": "nyc pnpm test && nyc report --reporter=text-lcov > coverage.lcov",
@@ -31,6 +39,7 @@
   },
   "files": [
     "dist",
+    "!dist/**/*.map",
     "types",
     "README.md",
     "LICENSE"
@@ -44,22 +53,25 @@
     "modules"
   ],
   "peerDependencies": {
-    "rollup": "^1.20.0 || ^2.0.0"
+    "rollup": "^1.20.0||^2.0.0||^3.0.0"
+  },
+  "peerDependenciesMeta": {
+    "rollup": {
+      "optional": true
+    }
   },
   "dependencies": {
-    "@rollup/pluginutils": "^3.0.8"
+    "@rollup/pluginutils": "^4.2.1"
   },
   "devDependencies": {
     "@rollup/plugin-buble": "^0.21.0",
-    "@rollup/plugin-node-resolve": "^8.4.0",
-    "rollup": "^2.67.3",
-    "source-map-support": "^0.5.19"
+    "@rollup/plugin-node-resolve": "^14.1.0",
+    "rollup": "^3.0.0-7",
+    "source-map-support": "^0.5.21"
   },
-  "types": "types/index.d.ts",
+  "types": "./types/index.d.ts",
   "ava": {
-    "babel": {
-      "compileEnhancements": false
-    },
+    "workerThreads": false,
     "files": [
       "!**/fixtures/**",
       "!**/helpers/**",

diff --git a/packages/json/rollup.config.js b/packages/json/rollup.config.js
diff --git a/packages/json/rollup.config.mjs b/packages/json/rollup.config.mjs
@@ -0,0 +1,13 @@
+import { readFileSync } from 'fs';
+
+import buble from '@rollup/plugin-buble';
+
+import { createConfig } from '../../shared/rollup.config.mjs';
+
+export default {
+  ...createConfig({
+    pkg: JSON.parse(readFileSync(new URL('./package.json', import.meta.url), 'utf8'))
+  }),
+  input: 'src/index.js',
+  plugins: [buble()]
+};
diff --git a/packages/json/test/snapshots/test.js.md b/packages/json/test/snapshots/test.js.md
@@ -2,41 +2,17 @@
 
 The actual snapshot is saved in `test.js.snap`.
 
-Generated by [AVA](https://ava.li).
+Generated by [AVA](https://avajs.dev).
 
-## generates correct code with compact=true
-
-> Snapshot 1
-
-    'export var validKey=true;export var nested={subKey:"ok"};export var array=[1,"2"];export default{validKey:validKey,"invalid-key":1,nested:nested,array:array,"function":"not used","null":null};'
-
-## generates correct code with namedExports=false
-
-> Snapshot 1
-
-    `export default {␊
-    	validKey: true,␊
-    	"invalid-key": 1,␊
-    	nested: {␊
-    		subKey: "ok"␊
-    	},␊
-    	array: [␊
-    		1,␊
-    		"2"␊
-    	],␊
-    	"function": "not used",␊
-    	"null": null␊
-    };`
-
-## generates correct code with preferConst
+## generates properly formatted code
 
 > Snapshot 1
 
-    `export const validKey = true;␊
-    export const nested = {␊
+    `export var validKey = true;␊
+    export var nested = {␊
     	subKey: "ok"␊
     };␊
-    export const array = [␊
+    export var array = [␊
     	1,␊
     	"2"␊
     ];␊
@@ -50,15 +26,15 @@ Generated by [AVA](https://ava.li).
     };␊
     `
 
-## generates properly formatted code
+## generates correct code with preferConst
 
 > Snapshot 1
 
-    `export var validKey = true;␊
-    export var nested = {␊
+    `export const validKey = true;␊
+    export const nested = {␊
     	subKey: "ok"␊
     };␊
-    export var array = [␊
+    export const array = [␊
     	1,␊
     	"2"␊
     ];␊
@@ -93,3 +69,27 @@ Generated by [AVA](https://ava.li).
       "null": null␊
     };␊
     `
+
+## generates correct code with compact=true
+
+> Snapshot 1
+
+    'export var validKey=true;export var nested={subKey:"ok"};export var array=[1,"2"];export default{validKey:validKey,"invalid-key":1,nested:nested,array:array,"function":"not used","null":null};'
+
+## generates correct code with namedExports=false
+
+> Snapshot 1
+
+    `export default {␊
+    	validKey: true,␊
+    	"invalid-key": 1,␊
+    	nested: {␊
+    		subKey: "ok"␊
+    	},␊
+    	array: [␊
+    		1,␊
+    		"2"␊
+    	],␊
+    	"function": "not used",␊
+    	"null": null␊
+    };`
diff --git a/packages/json/test/snapshots/test.js.snap b/packages/json/test/snapshots/test.js.snap
diff --git a/packages/json/test/test.js b/packages/json/test/test.js
@@ -48,7 +48,7 @@ test('generates named exports', async (t) => {
     plugins: [json()]
   });
 
-  const { code, result } = await testBundle(t, bundle, { exports: {} });
+  const { code, result } = await testBundle(t, bundle, { inject: { exports: {} } });
 
   t.is(result.version, '1.33.7');
   t.is(code.indexOf('this-should-be-excluded'), -1, 'should exclude unused properties');

diff --git a/packages/legacy/CHANGELOG.md b/packages/legacy/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @rollup/plugin-legacy ChangeLog
 
+## v3.0.0
+
+_2022-10-10_
+
+### Breaking Changes
+
+- fix: prepare for Rollup 3 [#1290](https://github.com/rollup/plugins/pull/1290)
+
 ## v2.2.0
 
 _2021-07-26_

diff --git a/packages/legacy/README.md b/packages/legacy/README.md
@@ -13,7 +13,7 @@
 
 ## Requirements
 
-This plugin requires an [LTS](https://github.com/nodejs/Release) Node version (v8.0.0+) and Rollup v1.20.0+.
+This plugin requires an [LTS](https://github.com/nodejs/Release) Node version (v14.0.0+) and Rollup v1.20.0+.
 
 ## Install
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		const { Promise = "fallback" } = foo;
		console.log(Promise);