From f43cc704942db4b6c27dd34540bb123fa6da5f0a Mon Sep 17 00:00:00 2001 From: Will Temple Date: Wed, 12 Jan 2022 12:48:19 -0500 Subject: [PATCH] Removed configs that opt-out of browser bundles --- sdk/eventhub/event-processor-host/package.json | 9 ++++----- sdk/eventhub/event-processor-host/rollup.config.js | 3 --- .../monitor-opentelemetry-exporter/package.json | 3 +-- .../monitor-opentelemetry-exporter/rollup.config.js | 3 --- sdk/storage/storage-blob-changefeed/package.json | 13 ++----------- .../storage-blob-changefeed/rollup.config.js | 9 --------- 6 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 sdk/eventhub/event-processor-host/rollup.config.js delete mode 100644 sdk/monitor/monitor-opentelemetry-exporter/rollup.config.js delete mode 100644 sdk/storage/storage-blob-changefeed/rollup.config.js diff --git a/sdk/eventhub/event-processor-host/package.json b/sdk/eventhub/event-processor-host/package.json index 7ace2d75fb98..825b2ac762b8 100644 --- a/sdk/eventhub/event-processor-host/package.json +++ b/sdk/eventhub/event-processor-host/package.json @@ -32,11 +32,11 @@ ], "scripts": { "audit": "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit", - "build:browser": "tsc -p . && cross-env ONLY_BROWSER=true rollup -c 2>&1", - "build:node": "tsc -p . && cross-env ONLY_NODE=true rollup -c 2>&1", + "build:browser": "npm run build", + "build:node": "npm run build", "build:samples": "dev-tool samples prep && cd dist-samples && tsc", - "build:test": "tsc -p . && cross-env ONLY_NODE=true rollup -c 2>&1", - "build": "npm run clean && tsc -p . && rollup -c 2>&1 && api-extractor run --local", + "build:test": "npm run build", + "build": "npm run clean && tsc -p . && dev-tool run bundle --browser-test=false && api-extractor run --local", "check-format": "prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"", "clean": "rimraf dist dist-* typings *.tgz *.log", "execute:samples": "echo skipped", @@ -108,7 +108,6 @@ "nyc": "^15.0.0", "prettier": "^2.5.1", "rimraf": "^3.0.0", - "rollup": "^2.0.0", "ts-node": "^10.0.0", "typescript": "~4.2.0", "ws": "^8.2.0" diff --git a/sdk/eventhub/event-processor-host/rollup.config.js b/sdk/eventhub/event-processor-host/rollup.config.js deleted file mode 100644 index 96d051412a13..000000000000 --- a/sdk/eventhub/event-processor-host/rollup.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import { makeConfig } from "@azure/dev-tool/shared-config/rollup"; - -export default makeConfig(require("./package.json"), { disableBrowserBundle: true }); diff --git a/sdk/monitor/monitor-opentelemetry-exporter/package.json b/sdk/monitor/monitor-opentelemetry-exporter/package.json index 479c4cf05345..a34a5a38c771 100644 --- a/sdk/monitor/monitor-opentelemetry-exporter/package.json +++ b/sdk/monitor/monitor-opentelemetry-exporter/package.json @@ -11,7 +11,7 @@ "clean": "rimraf dist-esm types dist", "build:browser": "echo skipped", "build:test": "echo skipped", - "build:node": "tsc -p . && rollup -c 2>&1", + "build:node": "tsc -p . && dev-tool run bundle --browser-test=false", "build": "npm run build:node && npm run build:browser && api-extractor run --local", "check-format": "prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"", "extract-api": "tsc -p . && api-extractor run --local", @@ -100,7 +100,6 @@ "nyc": "^15.0.0", "prettier": "^2.5.1", "rimraf": "^3.0.0", - "rollup": "^2.0.0", "sinon": "^9.0.2", "ts-node": "^10.0.0", "typescript": "~4.2.0" diff --git a/sdk/monitor/monitor-opentelemetry-exporter/rollup.config.js b/sdk/monitor/monitor-opentelemetry-exporter/rollup.config.js deleted file mode 100644 index 96d051412a13..000000000000 --- a/sdk/monitor/monitor-opentelemetry-exporter/rollup.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import { makeConfig } from "@azure/dev-tool/shared-config/rollup"; - -export default makeConfig(require("./package.json"), { disableBrowserBundle: true }); diff --git a/sdk/storage/storage-blob-changefeed/package.json b/sdk/storage/storage-blob-changefeed/package.json index 757a379b38bd..5a9681760d9b 100644 --- a/sdk/storage/storage-blob-changefeed/package.json +++ b/sdk/storage/storage-blob-changefeed/package.json @@ -28,9 +28,9 @@ "build:es6": "tsc -p tsconfig.json", "build:samples": "cross-env ONLY_NODE=true npm run build && npm run build:prep-samples", "build:prep-samples": "dev-tool samples prep && cd dist-samples && tsc", - "build:test": "npm run build:es6 && rollup -c 2>&1", + "build:test": "npm run build:es6 && dev-tool run bundle --browser-test=false", "build:types": "downlevel-dts typings/latest typings/3.1", - "build": "npm run clean && npm run build:es6 && rollup -c 2>&1 && api-extractor run --local && npm run build:types", + "build": "npm run clean && npm run build:es6 && dev-tool run bundle --browser-test=false && api-extractor run --local && npm run build:types", "check-format": "prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"", "clean": "rimraf dist dist-* typings temp statistics.html coverage coverage-browser .nyc_output *.tgz *.log test*.xml TEST*.xml", "clean:samples": "rimraf samples/javascript/node_modules samples/typescript/node_modules samples/typescript/dist samples/typescript/package-lock.json samples/javascript/package-lock.json", @@ -107,8 +107,6 @@ "@azure/test-utils": "^1.0.0", "@azure-tools/test-recorder": "^1.0.0", "@microsoft/api-extractor": "^7.18.11", - "@rollup/plugin-multi-entry": "^3.0.0", - "@rollup/plugin-replace": "^2.2.0", "@types/chai": "^4.1.6", "@types/mocha": "^7.0.2", "@types/node": "^12.0.0", @@ -140,13 +138,6 @@ "prettier": "^2.5.1", "puppeteer": "^10.2.0", "rimraf": "^3.0.0", - "rollup": "^2.0.0", - "@rollup/plugin-commonjs": "^21.0.1", - "@rollup/plugin-node-resolve": "^8.0.0", - "rollup-plugin-shim": "^1.0.0", - "rollup-plugin-sourcemaps": "^0.4.2", - "rollup-plugin-terser": "^5.1.1", - "rollup-plugin-visualizer": "^4.0.4", "source-map-support": "^0.5.9", "ts-node": "^10.0.0", "typescript": "~4.2.0", diff --git a/sdk/storage/storage-blob-changefeed/rollup.config.js b/sdk/storage/storage-blob-changefeed/rollup.config.js deleted file mode 100644 index 6b495856f8a1..000000000000 --- a/sdk/storage/storage-blob-changefeed/rollup.config.js +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -import { makeConfig } from "@azure/dev-tool/shared-config/rollup"; - -export default makeConfig(require("./package.json"), { - // Disable this until we are ready to run rollup for the browser. - disableBrowserBundle: true, -});