diff --git a/common/config/rush/common-versions.json b/common/config/rush/common-versions.json index 36f00bf46a0b..f78c6c7d9057 100644 --- a/common/config/rush/common-versions.json +++ b/common/config/rush/common-versions.json @@ -17,10 +17,6 @@ */ // "some-library": "1.2.3" - // resolve@1.12.0 causes a build break in storage-blob and storage-file related - // to the rollup-plugin-commonjs namedExports of "events" - "resolve": "1.11.1", - // This is required to allow for backward compatibility with Service Bus Track 1 // TODO: Remove this once Service Bus is updated to use current depenedencies as part of Track 2 "rhea-promise": "^0.1.15" diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index d8a034f96c83..119f5b7af91d 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -143,7 +143,6 @@ dependencies: qs: 6.7.0 query-string: 5.1.1 requirejs: 2.3.6 - resolve: 1.11.1 rhea: 1.0.8 rhea-promise: 0.1.15 rimraf: 2.6.3 @@ -5633,7 +5632,7 @@ packages: is-plain-object: 2.0.4 object.map: 1.0.1 rechoir: 0.6.2 - resolve: 1.11.1 + resolve: 1.12.0 dev: false engines: node: '>= 0.8' @@ -5881,7 +5880,7 @@ packages: dependencies: findup-sync: 2.0.0 micromatch: 3.1.10 - resolve: 1.11.1 + resolve: 1.12.0 stack-trace: 0.0.10 dev: false engines: @@ -6421,7 +6420,7 @@ packages: /normalize-package-data/2.5.0: dependencies: hosted-git-info: 2.8.2 - resolve: 1.11.1 + resolve: 1.12.0 semver: 5.7.0 validate-npm-package-license: 3.0.4 dev: false @@ -7402,7 +7401,7 @@ packages: integrity: sha512-XXdSXZrQuvqoETj50+JAitxz1UPdt5dupjT6T5nVB+WvjMv2XKYj+s7hPeAVCXvmJrL36O4YYyWlIC3an2ePiQ== /rechoir/0.6.2: dependencies: - resolve: 1.11.1 + resolve: 1.12.0 dev: false engines: node: '>= 0.10' @@ -7656,12 +7655,12 @@ packages: dev: false resolution: integrity: sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= - /resolve/1.11.1: + /resolve/1.12.0: dependencies: path-parse: 1.0.6 dev: false resolution: - integrity: sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw== + integrity: sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w== /resolve/1.8.1: dependencies: path-parse: 1.0.6 @@ -7734,7 +7733,7 @@ packages: estree-walker: 0.6.1 is-reference: 1.1.3 magic-string: 0.25.3 - resolve: 1.11.1 + resolve: 1.12.0 rollup: 1.19.3 rollup-pluginutils: 2.8.1 dev: false @@ -7778,7 +7777,7 @@ packages: '@types/resolve': 0.0.8 builtin-modules: 3.1.0 is-module: 1.0.0 - resolve: 1.11.1 + resolve: 1.12.0 rollup: 1.19.3 rollup-pluginutils: 2.8.1 dev: false @@ -10036,6 +10035,7 @@ packages: '@typescript-eslint/parser': 1.13.0_eslint@5.16.0 assert: 1.5.0 async-lock: 1.2.2 + buffer: 5.2.1 chai: 4.2.0 chai-as-promised: 7.1.1_chai@4.2.0 chai-string: 1.5.0_chai@4.2.0 @@ -10067,6 +10067,7 @@ packages: mocha-multi: 1.1.0_mocha@5.2.0 nyc: 14.1.1 prettier: 1.18.2 + process: 0.11.10 puppeteer: 1.19.0 rhea-promise: 1.0.0 rimraf: 2.6.3 @@ -10089,7 +10090,7 @@ packages: dev: false name: '@rush-temp/event-hubs' resolution: - integrity: sha512-lsWNEhZXWRnqoeZ10m0BNxvrSNJmfKd57KYdEMcO0TGsS7vY0uENhIy3OHASuDN7/Tvi4OLLNaPxLeW8iicq+w== + integrity: sha512-Twj5EmP7npdlRoh1VdXgIbGaE/xuQfqK06NAUpMwdhDXL6/cK59cOLmxnGSf+8lqiDCFnaV/BHFwwwQHlMSPag== tarball: 'file:projects/event-hubs.tgz' version: 0.0.0 'file:projects/event-processor-host.tgz': @@ -10878,7 +10879,6 @@ specifiers: qs: 6.7.0 query-string: ^5.0.0 requirejs: ^2.3.5 - resolve: 1.11.1 rhea: ^1.0.4 rhea-promise: ^0.1.15 rimraf: ^2.6.2 diff --git a/sdk/eventhub/event-hubs/package.json b/sdk/eventhub/event-hubs/package.json index 32eb41b5b905..6873224611b2 100644 --- a/sdk/eventhub/event-hubs/package.json +++ b/sdk/eventhub/event-hubs/package.json @@ -66,9 +66,11 @@ "@azure/core-amqp": "1.0.0-preview.3", "@azure/core-asynciterator-polyfill": "1.0.0-preview.1", "async-lock": "^1.1.3", + "buffer": "^5.2.1", "debug": "^3.1.0", "is-buffer": "^2.0.3", "jssha": "^2.3.1", + "process": "^0.11.10", "rhea-promise": "^1.0.0", "tslib": "^1.9.3", "uuid": "^3.3.2" diff --git a/sdk/eventhub/event-hubs/rollup.base.config.js b/sdk/eventhub/event-hubs/rollup.base.config.js index badc66e7ced7..200497b2d803 100644 --- a/sdk/eventhub/event-hubs/rollup.base.config.js +++ b/sdk/eventhub/event-hubs/rollup.base.config.js @@ -130,11 +130,7 @@ export function browserConfig(test = false) { nodeResolve({ mainFields: ["module", "browser"], - preferBuiltins: false, - // Following packages are de-duped in order to get module resolution to work with npm + rollup - // This will be in place until we have a solution for issue - // https://github.com/Azure/azure-sdk-for-js/issues/3326 - dedupe: ["buffer", "events", "util", "process", "assert"] + preferBuiltins: false }), cjs({ diff --git a/sdk/servicebus/service-bus/package.json b/sdk/servicebus/service-bus/package.json index f7b274557896..81d4e14f6780 100644 --- a/sdk/servicebus/service-bus/package.json +++ b/sdk/servicebus/service-bus/package.json @@ -69,6 +69,7 @@ "@azure/ms-rest-nodeauth": "^0.9.2", "@types/is-buffer": "^2.0.0", "@types/long": "^4.0.0", + "buffer": "^5.2.1", "debug": "^3.1.0", "is-buffer": "^2.0.3", "long": "^4.0.0", @@ -91,7 +92,6 @@ "@typescript-eslint/eslint-plugin": "^1.11.0", "@typescript-eslint/parser": "^1.11.0", "assert": "^1.4.1", - "buffer": "^5.2.1", "chai": "^4.2.0", "chai-as-promised": "^7.1.1", "cross-env": "^5.2.0", diff --git a/sdk/servicebus/service-bus/rollup.base.config.js b/sdk/servicebus/service-bus/rollup.base.config.js index 5478242e01cb..8e868ed17ad0 100644 --- a/sdk/servicebus/service-bus/rollup.base.config.js +++ b/sdk/servicebus/service-bus/rollup.base.config.js @@ -139,8 +139,7 @@ export function browserConfig({ test = false, production = false } = {}) { nodeResolve({ mainFields: ["module", "browser"], - preferBuiltins: false, - dedupe: ["buffer"] + preferBuiltins: false }), cjs({ namedExports: { events: ["EventEmitter"], long: ["ZERO"] }