From 29564220f70bdacb694088abaecfc5d65bacab89 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Thu, 1 Aug 2019 15:22:28 -0700 Subject: [PATCH] Remove trailing slash from namedExports - Was required due to rollup/rollup-plugin-commonjs#394 - Fixed in rollup-plugin-commonjs@1.10.1 --- sdk/core/abort-controller/rollup.base.config.js | 7 ++----- sdk/core/core-amqp/rollup.base.config.js | 5 +---- sdk/eventhub/event-hubs/rollup.base.config.js | 5 +---- sdk/eventhub/event-processor-host/rollup.base.config.js | 5 +---- sdk/identity/identity/rollup.base.config.js | 5 +---- sdk/keyvault/keyvault-keys/rollup.base.config.js | 5 +---- sdk/keyvault/keyvault-secrets/rollup.base.config.js | 5 +---- sdk/servicebus/service-bus/rollup.base.config.js | 5 +---- sdk/storage/storage-blob/rollup.base.config.js | 7 ++----- sdk/storage/storage-file/rollup.base.config.js | 7 ++----- sdk/storage/storage-queue/rollup.base.config.js | 5 +---- sdk/template/template/rollup.base.config.js | 5 +---- 12 files changed, 15 insertions(+), 51 deletions(-) diff --git a/sdk/core/abort-controller/rollup.base.config.js b/sdk/core/abort-controller/rollup.base.config.js index ade53aa28af3..b93549333644 100644 --- a/sdk/core/abort-controller/rollup.base.config.js +++ b/sdk/core/abort-controller/rollup.base.config.js @@ -94,12 +94,9 @@ export function browserConfig(test = false) { preferBuiltins: false }), cjs({ - // When "rollup-plugin-commonjs@10.0.0" is used with "resolve@1.11.1", named exports of - // modules with built-in names must have a trailing slash. - // https://github.com/rollup/rollup-plugin-commonjs/issues/394 namedExports: { - "events/": ["EventEmitter"], - "assert/": ["ok", "deepEqual", "equal", "fail", "deepStrictEqual", "notDeepEqual"] + events: ["EventEmitter"], + assert: ["ok", "deepEqual", "equal", "fail", "deepStrictEqual", "notDeepEqual"] } }) ] diff --git a/sdk/core/core-amqp/rollup.base.config.js b/sdk/core/core-amqp/rollup.base.config.js index 3ad1745b702c..d0a00b4e5724 100644 --- a/sdk/core/core-amqp/rollup.base.config.js +++ b/sdk/core/core-amqp/rollup.base.config.js @@ -130,12 +130,9 @@ export function browserConfig(test = false) { }), cjs({ - // When "rollup-plugin-commonjs@10.0.0" is used with "resolve@1.11.1", named exports of - // modules with built-in names must have a trailing slash. - // https://github.com/rollup/rollup-plugin-commonjs/issues/394 namedExports: { chai: ["should"], - "assert/": ["equal", "deepEqual", "notEqual"] + assert: ["equal", "deepEqual", "notEqual"] } }), diff --git a/sdk/eventhub/event-hubs/rollup.base.config.js b/sdk/eventhub/event-hubs/rollup.base.config.js index 833571a7f4f0..badc66e7ced7 100644 --- a/sdk/eventhub/event-hubs/rollup.base.config.js +++ b/sdk/eventhub/event-hubs/rollup.base.config.js @@ -138,11 +138,8 @@ export function browserConfig(test = false) { }), cjs({ - // When "rollup-plugin-commonjs@10.0.0" is used with "resolve@1.11.1", named exports of - // modules with built-in names must have a trailing slash. - // https://github.com/rollup/rollup-plugin-commonjs/issues/394 namedExports: { - "events/": ["EventEmitter"] + events: ["EventEmitter"] } }), diff --git a/sdk/eventhub/event-processor-host/rollup.base.config.js b/sdk/eventhub/event-processor-host/rollup.base.config.js index ae1ce6365061..11f26f65ff84 100644 --- a/sdk/eventhub/event-processor-host/rollup.base.config.js +++ b/sdk/eventhub/event-processor-host/rollup.base.config.js @@ -106,10 +106,7 @@ export function browserConfig(test = false) { preferBuiltins: false }), cjs({ - // When "rollup-plugin-commonjs@10.0.0" is used with "resolve@1.11.1", named exports of - // modules with built-in names must have a trailing slash. - // https://github.com/rollup/rollup-plugin-commonjs/issues/394 - namedExports: { "events/": ["EventEmitter"] } + namedExports: { events: ["EventEmitter"] } }), json() ] diff --git a/sdk/identity/identity/rollup.base.config.js b/sdk/identity/identity/rollup.base.config.js index 1043dffd82a2..9b3385529d52 100644 --- a/sdk/identity/identity/rollup.base.config.js +++ b/sdk/identity/identity/rollup.base.config.js @@ -82,10 +82,7 @@ export function browserConfig(test = false, production = false) { preferBuiltins: false }), cjs({ - // When "rollup-plugin-commonjs@10.0.0" is used with "resolve@1.11.1", named exports of - // modules with built-in names must have a trailing slash. - // https://github.com/rollup/rollup-plugin-commonjs/issues/394 - namedExports: { "events/": ["EventEmitter"] } + namedExports: { events: ["EventEmitter"] } }), viz({ filename: "browser/browser-stats.html", sourcemap: false }) ] diff --git a/sdk/keyvault/keyvault-keys/rollup.base.config.js b/sdk/keyvault/keyvault-keys/rollup.base.config.js index 5ca9ff0c2341..dc0cc44608d8 100644 --- a/sdk/keyvault/keyvault-keys/rollup.base.config.js +++ b/sdk/keyvault/keyvault-keys/rollup.base.config.js @@ -118,10 +118,7 @@ export function browserConfig(test = false) { }), cjs({ namedExports: { - // When "rollup-plugin-commonjs@10.0.0" is used with "resolve@1.11.1", named exports of - // modules with built-in names must have a trailing slash. - // https://github.com/rollup/rollup-plugin-commonjs/issues/394 - "assert/": ["ok", "equal", "strictEqual"] + assert: ["ok", "equal", "strictEqual"] } }) ] diff --git a/sdk/keyvault/keyvault-secrets/rollup.base.config.js b/sdk/keyvault/keyvault-secrets/rollup.base.config.js index eb335d175962..5a930ab62039 100644 --- a/sdk/keyvault/keyvault-secrets/rollup.base.config.js +++ b/sdk/keyvault/keyvault-secrets/rollup.base.config.js @@ -118,10 +118,7 @@ export function browserConfig(test = false) { }), cjs({ namedExports: { - // When "rollup-plugin-commonjs@10.0.0" is used with "resolve@1.11.1", named exports of - // modules with built-in names must have a trailing slash. - // https://github.com/rollup/rollup-plugin-commonjs/issues/394 - "assert/": ["ok", "equal", "strictEqual"] + assert: ["ok", "equal", "strictEqual"] } }) ] diff --git a/sdk/servicebus/service-bus/rollup.base.config.js b/sdk/servicebus/service-bus/rollup.base.config.js index b5be1ddfca88..5478242e01cb 100644 --- a/sdk/servicebus/service-bus/rollup.base.config.js +++ b/sdk/servicebus/service-bus/rollup.base.config.js @@ -143,10 +143,7 @@ export function browserConfig({ test = false, production = false } = {}) { dedupe: ["buffer"] }), cjs({ - // When "rollup-plugin-commonjs@10.0.0" is used with "resolve@1.11.1", named exports of - // modules with built-in names must have a trailing slash. - // https://github.com/rollup/rollup-plugin-commonjs/issues/394 - namedExports: { "events/": ["EventEmitter"], long: ["ZERO"] } + namedExports: { events: ["EventEmitter"], long: ["ZERO"] } }), // rhea and rhea-promise use the Buffer global which requires diff --git a/sdk/storage/storage-blob/rollup.base.config.js b/sdk/storage/storage-blob/rollup.base.config.js index 1e22b17b89b0..d1abcee25577 100644 --- a/sdk/storage/storage-blob/rollup.base.config.js +++ b/sdk/storage/storage-blob/rollup.base.config.js @@ -108,12 +108,9 @@ export function browserConfig(test = false, production = false) { preferBuiltins: false }), cjs({ - // When "rollup-plugin-commonjs@10.0.0" is used with "resolve@1.11.1", named exports of - // modules with built-in names must have a trailing slash. - // https://github.com/rollup/rollup-plugin-commonjs/issues/394 namedExports: { - "events/": ["EventEmitter"], - "assert/": ["ok", "deepEqual", "equal", "fail", "deepStrictEqual", "notDeepEqual"] + events: ["EventEmitter"], + assert: ["ok", "deepEqual", "equal", "fail", "deepStrictEqual", "notDeepEqual"] } }) ] diff --git a/sdk/storage/storage-file/rollup.base.config.js b/sdk/storage/storage-file/rollup.base.config.js index 588416f23e6c..b6c44a3cbe69 100644 --- a/sdk/storage/storage-file/rollup.base.config.js +++ b/sdk/storage/storage-file/rollup.base.config.js @@ -108,12 +108,9 @@ export function browserConfig(test = false, production = false) { preferBuiltins: false }), cjs({ - // When "rollup-plugin-commonjs@10.0.0" is used with "resolve@1.11.1", named exports of - // modules with built-in names must have a trailing slash. - // https://github.com/rollup/rollup-plugin-commonjs/issues/394 namedExports: { - "events/": ["EventEmitter"], - "assert/": [ + events: ["EventEmitter"], + assert: [ "ok", "deepEqual", "equal", diff --git a/sdk/storage/storage-queue/rollup.base.config.js b/sdk/storage/storage-queue/rollup.base.config.js index 7039f0022802..e38e287ad4bf 100644 --- a/sdk/storage/storage-queue/rollup.base.config.js +++ b/sdk/storage/storage-queue/rollup.base.config.js @@ -108,10 +108,7 @@ export function browserConfig(test = false, production = false) { }), cjs({ namedExports: { - // When "rollup-plugin-commonjs@10.0.0" is used with "resolve@1.11.1", named exports of - // modules with built-in names must have a trailing slash. - // https://github.com/rollup/rollup-plugin-commonjs/issues/394 - "assert/": ["ok", "deepEqual", "equal", "fail", "deepStrictEqual"] + assert: ["ok", "deepEqual", "equal", "fail", "deepStrictEqual"] } }) ] diff --git a/sdk/template/template/rollup.base.config.js b/sdk/template/template/rollup.base.config.js index 067d58d3a9c5..7a8da9bda99a 100644 --- a/sdk/template/template/rollup.base.config.js +++ b/sdk/template/template/rollup.base.config.js @@ -82,10 +82,7 @@ export function browserConfig(test = false, production = false) { preferBuiltins: false }), cjs({ - // When "rollup-plugin-commonjs@10.0.0" is used with "resolve@1.11.1", named exports of - // modules with built-in names must have a trailing slash. - // https://github.com/rollup/rollup-plugin-commonjs/issues/394 - namedExports: { "events/": ["EventEmitter"] } + namedExports: { events: ["EventEmitter"] } }), viz({ filename: "browser/browser-stats.html", sourcemap: false }) ]