Skip to content

Commit ecaacb7

Browse files
committed
Remove dedupe from rollup config
- Update transitive dependency resolve to 1.12.0 - Fixes issue with symlink resolution which required dedupe workaround - browserify/resolve#196 - Move buffer to full dependency of service-bus - Packages required for browser bundles should be full dependencies - Improves customer experience when generating bundles from our packages - Add dependencies buffer and process to event-hubs - Required to generate browser bundle - Fixes Azure#3326
1 parent dea10ac commit ecaacb7

File tree

6 files changed

+16
-23
lines changed

6 files changed

+16
-23
lines changed

common/config/rush/common-versions.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
*/
1818
// "some-library": "1.2.3"
1919

20-
// [email protected] causes a build break in storage-blob and storage-file related
21-
// to the rollup-plugin-commonjs namedExports of "events"
22-
"resolve": "1.11.1",
23-
2420
// This is required to allow for backward compatibility with Service Bus Track 1
2521
// TODO: Remove this once Service Bus is updated to use current depenedencies as part of Track 2
2622
"rhea-promise": "^0.1.15"

common/config/rush/pnpm-lock.yaml

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/eventhub/event-hubs/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,11 @@
6666
"@azure/core-amqp": "1.0.0-preview.3",
6767
"@azure/core-asynciterator-polyfill": "1.0.0-preview.1",
6868
"async-lock": "^1.1.3",
69+
"buffer": "^5.2.1",
6970
"debug": "^3.1.0",
7071
"is-buffer": "^2.0.3",
7172
"jssha": "^2.3.1",
73+
"process": "^0.11.10",
7274
"rhea-promise": "^1.0.0",
7375
"tslib": "^1.9.3",
7476
"uuid": "^3.3.2"

sdk/eventhub/event-hubs/rollup.base.config.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,7 @@ export function browserConfig(test = false) {
130130

131131
nodeResolve({
132132
mainFields: ["module", "browser"],
133-
preferBuiltins: false,
134-
// Following packages are de-duped in order to get module resolution to work with npm + rollup
135-
// This will be in place until we have a solution for issue
136-
// https://github.com/Azure/azure-sdk-for-js/issues/3326
137-
dedupe: ["buffer", "events", "util", "process", "assert"]
133+
preferBuiltins: false
138134
}),
139135

140136
cjs({

sdk/servicebus/service-bus/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
"@azure/ms-rest-nodeauth": "^0.9.2",
7070
"@types/is-buffer": "^2.0.0",
7171
"@types/long": "^4.0.0",
72+
"buffer": "^5.2.1",
7273
"debug": "^3.1.0",
7374
"is-buffer": "^2.0.3",
7475
"long": "^4.0.0",
@@ -91,7 +92,6 @@
9192
"@typescript-eslint/eslint-plugin": "^1.11.0",
9293
"@typescript-eslint/parser": "^1.11.0",
9394
"assert": "^1.4.1",
94-
"buffer": "^5.2.1",
9595
"chai": "^4.2.0",
9696
"chai-as-promised": "^7.1.1",
9797
"cross-env": "^5.2.0",

sdk/servicebus/service-bus/rollup.base.config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,7 @@ export function browserConfig({ test = false, production = false } = {}) {
139139

140140
nodeResolve({
141141
mainFields: ["module", "browser"],
142-
preferBuiltins: false,
143-
dedupe: ["buffer"]
142+
preferBuiltins: false
144143
}),
145144
cjs({
146145
namedExports: { events: ["EventEmitter"], long: ["ZERO"] }

0 commit comments

Comments
 (0)