Skip to content

Commit

Permalink
Update deprecated plugin-node-resolve (#6856)
Browse files Browse the repository at this point in the history
  • Loading branch information
KarishmaGhiya authored Jan 9, 2020
1 parent 4b0264e commit 32611f8
Show file tree
Hide file tree
Showing 56 changed files with 142 additions and 96 deletions.
98 changes: 74 additions & 24 deletions common/config/rush/pnpm-lock.yaml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions documentation/Bundling.md
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ Now we need to configure Rollup to take the above code and turn it into a bundle

```js
// rollup.config.js
import resolve from "rollup-plugin-node-resolve";
import resolve from "@rollup/plugin-node-resolve";
import cjs from "rollup-plugin-commonjs";
import json from "@rollup/plugin-json";
import shim from "rollup-plugin-shim";
Expand Down Expand Up @@ -287,7 +287,7 @@ Now we need to configure Rollup to take the above code and turn it into a bundle

```js
// rollup.config.js
import resolve from "rollup-plugin-node-resolve";
import resolve from "@rollup/plugin-node-resolve";
import cjs from "rollup-plugin-commonjs";
import json from "@rollup/plugin-json";
import shim from "rollup-plugin-shim";
Expand Down
2 changes: 1 addition & 1 deletion samples/Bundling/rollup/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@azure/storage-blob": "^12.0.0",
"@rollup/plugin-json": "^4.0.0",
"rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-node-resolve": "^5.2.0",
"@rollup/plugin-node-resolve": "^7.0.0",
"rollup-plugin-shim": "^1.0.0"
},
"dependencies": {}
Expand Down
12 changes: 6 additions & 6 deletions samples/Bundling/rollup/js/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import resolve from "rollup-plugin-node-resolve";
import resolve from "@rollup/plugin-node-resolve";
import cjs from "rollup-plugin-commonjs";
import json from "@rollup/plugin-json";
import shim from "rollup-plugin-shim";
Expand All @@ -12,16 +12,16 @@ export default {
},
plugins: [
shim({
fs: `
fs: `
export function stat() { }
export function createReadStream() { }
export function createWriteStream() { }
`,
os: `
os: `
export const type = 1;
export const release = 1;
`,
util: `
util: `
export function promisify() { }
`
}),
Expand All @@ -31,9 +31,9 @@ export default {
}),
cjs({
namedExports: {
events: ["EventEmitter"],
events: ["EventEmitter"]
}
}),
json()
]
};
};
2 changes: 1 addition & 1 deletion samples/Bundling/rollup/ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@azure/storage-blob": "^12.0.0",
"@rollup/plugin-json": "^4.0.0",
"rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-node-resolve": "^5.2.0",
"@rollup/plugin-node-resolve": "^7.0.0",
"rollup-plugin-shim": "^1.0.0",
"rollup-plugin-typescript2": "^0.24.3",
"typescript": "^3.6.4"
Expand Down
12 changes: 6 additions & 6 deletions samples/Bundling/rollup/ts/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import resolve from "rollup-plugin-node-resolve";
import resolve from "@rollup/plugin-node-resolve";
import cjs from "rollup-plugin-commonjs";
import json from "@rollup/plugin-json";
import shim from "rollup-plugin-shim";
Expand All @@ -13,16 +13,16 @@ export default {
},
plugins: [
shim({
fs: `
fs: `
export function stat() { }
export function createReadStream() { }
export function createWriteStream() { }
`,
os: `
os: `
export const type = 1;
export const release = 1;
`,
util: `
util: `
export function promisify() { }
`
}),
Expand All @@ -32,10 +32,10 @@ export default {
}),
cjs({
namedExports: {
events: ["EventEmitter"],
events: ["EventEmitter"]
}
}),
json(),
typescript()
]
};
};
2 changes: 1 addition & 1 deletion sdk/appconfiguration/app-configuration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"rimraf": "^3.0.0",
"rollup": "^1.16.3",
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-node-resolve": "^5.0.2",
"@rollup/plugin-node-resolve": "^7.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-terser": "^5.1.1",
"sinon": "^7.1.0",
Expand Down
7 changes: 2 additions & 5 deletions sdk/appconfiguration/app-configuration/rollup.base.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import nodeResolve from "rollup-plugin-node-resolve";
import nodeResolve from "@rollup/plugin-node-resolve";
import multiEntry from "@rollup/plugin-multi-entry";
import cjs from "rollup-plugin-commonjs";
import replace from "@rollup/plugin-replace";
Expand Down Expand Up @@ -43,10 +43,7 @@ export function nodeConfig(test = false) {
// mark assert packages we use as external
baseConfig.external.push("assert");

baseConfig.external.push(
...Object.keys(pkg.dependencies),
...Object.keys(pkg.devDependencies)
);
baseConfig.external.push(...Object.keys(pkg.dependencies), ...Object.keys(pkg.devDependencies));

// Disable tree-shaking of test code. In rollup-plugin-node-resolve@5.0.0, rollup started respecting
// the "sideEffects" field in package.json. Since our package.json sets "sideEffects=false", this also
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"devDependencies": {
"typescript": "^3.5.3",
"rollup": "^1.18.0",
"rollup-plugin-node-resolve": "^5.2.0",
"@rollup/plugin-node-resolve": "^5.2.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"uglify-js": "^3.6.0"
},
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/abort-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"rimraf": "^3.0.0",
"rollup": "^1.16.3",
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-node-resolve": "^5.0.2",
"@rollup/plugin-node-resolve": "^7.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-terser": "^5.1.1",
"ts-node": "^8.3.0",
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/abort-controller/rollup.base.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

import nodeResolve from "rollup-plugin-node-resolve";
import nodeResolve from "@rollup/plugin-node-resolve";
import multiEntry from "@rollup/plugin-multi-entry";
import cjs from "rollup-plugin-commonjs";
import replace from "@rollup/plugin-replace";
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/core-amqp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-inject": "^3.0.0",
"rollup-plugin-node-globals": "^1.4.0",
"rollup-plugin-node-resolve": "^5.0.2",
"@rollup/plugin-node-resolve": "^7.0.0",
"rollup-plugin-shim": "^1.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-terser": "^5.1.1",
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/core-amqp/rollup.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// @ts-check

import nodeResolve from "rollup-plugin-node-resolve";
import nodeResolve from "@rollup/plugin-node-resolve";
import multiEntry from "@rollup/plugin-multi-entry";
import cjs from "rollup-plugin-commonjs";
import replace from "@rollup/plugin-replace";
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/core-arm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"nyc": "^14.0.0",
"rimraf": "^3.0.0",
"rollup": "^1.16.3",
"rollup-plugin-node-resolve": "^5.0.2",
"@rollup/plugin-node-resolve": "^7.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-visualizer": "^3.1.1",
"shx": "^0.3.2",
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/core-arm/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import nodeResolve from "rollup-plugin-node-resolve";
import nodeResolve from "@rollup/plugin-node-resolve";
import visualizer from "rollup-plugin-visualizer";
import sourcemaps from "rollup-plugin-sourcemaps";

Expand Down
2 changes: 1 addition & 1 deletion sdk/core/core-auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"rimraf": "^3.0.0",
"rollup": "^1.16.3",
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-node-resolve": "^5.0.2",
"@rollup/plugin-node-resolve": "^7.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-terser": "^5.1.1",
"rollup-plugin-visualizer": "^3.1.1",
Expand Down
4 changes: 2 additions & 2 deletions sdk/core/core-auth/rollup.base.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import nodeResolve from "rollup-plugin-node-resolve";
import nodeResolve from "@rollup/plugin-node-resolve";
import multiEntry from "@rollup/plugin-multi-entry";
import cjs from "rollup-plugin-commonjs";
import replace from "@rollup/plugin-replace";
Expand Down Expand Up @@ -77,7 +77,7 @@ export function browserConfig(test = false) {
}
}),
nodeResolve({
mainFields: ['module', 'browser'],
mainFields: ["module", "browser"],
preferBuiltins: false
}),
cjs({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
declare module "rollup-plugin-node-resolve" {
declare module "@rollup/plugin-node-resolve" {
const nodeResolve(options: { [_: string]: any }) => void;
export default nodeResolve;
}
2 changes: 1 addition & 1 deletion sdk/core/core-http/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
"rimraf": "^3.0.0",
"rollup": "^1.16.3",
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-node-resolve": "^5.0.2",
"@rollup/plugin-node-resolve": "^7.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-visualizer": "^3.1.1",
"shx": "^0.3.2",
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/core-http/rollup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import commonjs from "rollup-plugin-commonjs";
import json from "@rollup/plugin-json";
import nodeResolve from "rollup-plugin-node-resolve";
import nodeResolve from "@rollup/plugin-node-resolve";
import sourcemaps from "rollup-plugin-sourcemaps";
import visualizer from "rollup-plugin-visualizer";

Expand Down
2 changes: 1 addition & 1 deletion sdk/core/core-lro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"rimraf": "^3.0.0",
"rollup": "^1.16.3",
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-node-resolve": "^5.0.2",
"@rollup/plugin-node-resolve": "^7.0.0",
"rollup-plugin-shim": "^1.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-terser": "^5.1.1",
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/core-lro/rollup.base.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

import nodeResolve from "rollup-plugin-node-resolve";
import nodeResolve from "@rollup/plugin-node-resolve";
import multiEntry from "@rollup/plugin-multi-entry";
import cjs from "rollup-plugin-commonjs";
import replace from "@rollup/plugin-replace";
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/core-tracing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"rimraf": "^3.0.0",
"rollup": "^1.16.3",
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-node-resolve": "^5.0.2",
"@rollup/plugin-node-resolve": "^7.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-terser": "^5.1.1",
"rollup-plugin-visualizer": "^3.1.1",
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/core-tracing/rollup.base.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import nodeResolve from "rollup-plugin-node-resolve";
import nodeResolve from "@rollup/plugin-node-resolve";
import multiEntry from "@rollup/plugin-multi-entry";
import cjs from "rollup-plugin-commonjs";
import replace from "@rollup/plugin-replace";
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/logger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
"rimraf": "^3.0.0",
"rollup": "^1.16.3",
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-node-resolve": "^5.0.2",
"@rollup/plugin-node-resolve": "^7.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-terser": "^5.1.1",
"sinon": "^7.1.0",
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/logger/rollup.base.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

import nodeResolve from "rollup-plugin-node-resolve";
import nodeResolve from "@rollup/plugin-node-resolve";
import path from "path";
import multiEntry from "@rollup/plugin-multi-entry";
import cjs from "rollup-plugin-commonjs";
Expand Down
2 changes: 1 addition & 1 deletion sdk/eventhub/event-hubs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"rollup": "^1.16.3",
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-inject": "^3.0.0",
"rollup-plugin-node-resolve": "^5.0.2",
"@rollup/plugin-node-resolve": "^7.0.0",
"rollup-plugin-shim": "^1.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-terser": "^5.1.1",
Expand Down
2 changes: 1 addition & 1 deletion sdk/eventhub/event-hubs/rollup.base.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

import nodeResolve from "rollup-plugin-node-resolve";
import nodeResolve from "@rollup/plugin-node-resolve";
import multiEntry from "@rollup/plugin-multi-entry";
import cjs from "rollup-plugin-commonjs";
import json from "@rollup/plugin-json";
Expand Down
2 changes: 1 addition & 1 deletion sdk/eventhub/event-processor-host/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"rimraf": "^3.0.0",
"rollup": "^1.16.3",
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-node-resolve": "^5.0.2",
"@rollup/plugin-node-resolve": "^7.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-uglify": "^6.0.0",
"ts-node": "^8.3.0",
Expand Down
2 changes: 1 addition & 1 deletion sdk/eventhub/event-processor-host/rollup.base.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

import nodeResolve from "rollup-plugin-node-resolve";
import nodeResolve from "@rollup/plugin-node-resolve";
import multiEntry from "@rollup/plugin-multi-entry";
import cjs from "rollup-plugin-commonjs";
import json from "@rollup/plugin-json";
Expand Down
2 changes: 1 addition & 1 deletion sdk/eventhub/eventhubs-checkpointstore-blob/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"rollup": "^1.16.3",
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-inject": "^3.0.0",
"rollup-plugin-node-resolve": "^5.0.2",
"@rollup/plugin-node-resolve": "^7.0.0",
"rollup-plugin-shim": "^1.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-terser": "^5.1.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

import nodeResolve from "rollup-plugin-node-resolve";
import nodeResolve from "@rollup/plugin-node-resolve";
import multiEntry from "@rollup/plugin-multi-entry";
import cjs from "rollup-plugin-commonjs";
import json from "@rollup/plugin-json";
Expand Down
2 changes: 1 addition & 1 deletion sdk/identity/identity/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
"rimraf": "^3.0.0",
"rollup": "^1.16.3",
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-node-resolve": "^5.0.2",
"@rollup/plugin-node-resolve": "^7.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-terser": "^5.1.1",
"rollup-plugin-visualizer": "^3.1.1",
Expand Down
2 changes: 1 addition & 1 deletion sdk/identity/identity/rollup.base.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import nodeResolve from "rollup-plugin-node-resolve";
import nodeResolve from "@rollup/plugin-node-resolve";
import multiEntry from "@rollup/plugin-multi-entry";
import cjs from "rollup-plugin-commonjs";
import replace from "@rollup/plugin-replace";
Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/keyvault-certificates/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
"rimraf": "^3.0.0",
"rollup": "^1.16.3",
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-node-resolve": "^5.0.2",
"@rollup/plugin-node-resolve": "^7.0.0",
"rollup-plugin-shim": "^1.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-terser": "^5.1.1",
Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/keyvault-certificates/rollup.base.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

import nodeResolve from "rollup-plugin-node-resolve";
import nodeResolve from "@rollup/plugin-node-resolve";
import multiEntry from "@rollup/plugin-multi-entry";
import cjs from "rollup-plugin-commonjs";
import replace from "@rollup/plugin-replace";
Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/keyvault-keys/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
"rimraf": "^3.0.0",
"rollup": "^1.16.3",
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-node-resolve": "^5.0.2",
"@rollup/plugin-node-resolve": "^7.0.0",
"rollup-plugin-shim": "^1.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-terser": "^5.1.1",
Expand Down
Loading

0 comments on commit 32611f8

Please sign in to comment.