Skip to content

Commit

Permalink
Migrate more packages to shared rollup script
Browse files Browse the repository at this point in the history
  • Loading branch information
witemple-msft committed Jan 13, 2022
1 parent 0c4d89c commit 11cee51
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 111 deletions.
6 changes: 3 additions & 3 deletions sdk/appconfiguration/app-configuration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,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:node": "tsc -p . && cross-env ONLY_NODE=true rollup -c 2>&1",
"build:browser": "tsc -p . && cross-env ONLY_BROWSER=true rollup -c 2>&1",
"build:node": "tsc -p . && dev-tool run bundle --browser-test=false",
"build:browser": "tsc -p . && dev-tool run bundle --browser-test=false",
"build:test": "tsc -p . && rollup -c rollup.test.config.js 2>&1",
"build:samples": "echo Obsolete.",
"build": "npm run clean && tsc -p . && rollup -c 2>&1 && api-extractor run --local",
"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\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
"clean": "rimraf dist dist-* types *.tgz *.log",
"coverage": "nyc --reporter=lcov --exclude-after-remap=false mocha -t 120000 dist-test/index.js --reporter ../../../common/tools/mocha-multi-reporter.js",
Expand Down
18 changes: 4 additions & 14 deletions sdk/communication/communication-chat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
"types": "types/communication-chat.d.ts",
"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": "tsc -p . && dev-tool run bundle",
"build:node": "tsc -p . && dev-tool run bundle",
"build:samples": "echo Obsolete.",
"build:test": "tsc -p . && rollup -c rollup.test.config.js 2>&1",
"build": "npm run clean && tsc -p . && rollup -c 2>&1 && api-extractor run --local",
"build:test": "tsc -p . && dev-tool run bundle",
"build": "npm run clean && tsc -p . && dev-tool run bundle && api-extractor run --local",
"check-format": "prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
"clean": "rimraf dist dist-* temp types *.tgz *.log",
"execute:samples": "dev-tool samples run samples-dev",
Expand Down Expand Up @@ -82,11 +82,6 @@
"@azure/eslint-plugin-azure-sdk": "^3.0.0",
"@azure-tools/test-recorder": "^1.0.0",
"@microsoft/api-extractor": "^7.18.11",
"@rollup/plugin-commonjs": "^21.0.1",
"@rollup/plugin-json": "^4.0.0",
"@rollup/plugin-multi-entry": "^3.0.0",
"@rollup/plugin-node-resolve": "^8.0.0",
"@rollup/plugin-replace": "^2.2.0",
"@types/chai": "^4.1.6",
"@types/mocha": "^7.0.2",
"@types/node": "^12.0.0",
Expand Down Expand Up @@ -115,11 +110,6 @@
"nyc": "^15.0.0",
"prettier": "^2.5.1",
"rimraf": "^3.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-shim": "^1.0.0",
"rollup-plugin-terser": "^5.1.1",
"rollup-plugin-visualizer": "^4.0.4",
"rollup": "^2.0.0",
"sinon": "^9.0.2",
"typescript": "~4.2.0",
"util": "^0.12.1"
Expand Down
17 changes: 4 additions & 13 deletions sdk/communication/communication-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,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": "tsc -p . && dev-tool run bundle",
"build:node": "tsc -p . && dev-tool run bundle",
"build:samples": "echo Skipped.",
"build:test": "tsc -p . && rollup -c 2>&1",
"build": "npm run clean && tsc -p . && rollup -c 2>&1 && api-extractor run --local",
"build:test": "tsc -p . && dev-tool run bundle",
"build": "npm run clean && tsc -p . && dev-tool run bundle && 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-* temp types *.tgz *.log",
"execute:samples": "echo skipped",
Expand Down Expand Up @@ -73,11 +73,6 @@
"@azure/eslint-plugin-azure-sdk": "^3.0.0",
"@azure/dev-tool": "^1.0.0",
"@microsoft/api-extractor": "^7.18.11",
"@rollup/plugin-commonjs": "^21.0.1",
"@rollup/plugin-json": "^4.0.0",
"@rollup/plugin-multi-entry": "^3.0.0",
"@rollup/plugin-node-resolve": "^8.0.0",
"@rollup/plugin-replace": "^2.2.0",
"@types/chai-as-promised": "^7.1.0",
"@types/chai": "^4.1.6",
"@types/jwt-decode": "~2.2.1",
Expand Down Expand Up @@ -105,10 +100,6 @@
"nyc": "^15.0.0",
"prettier": "^2.5.1",
"rimraf": "^3.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-terser": "^5.1.1",
"rollup-plugin-visualizer": "^4.0.4",
"rollup": "^2.0.0",
"sinon": "^9.0.2",
"typescript": "~4.2.0",
"util": "^0.12.1"
Expand Down
18 changes: 4 additions & 14 deletions sdk/communication/communication-identity/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
"types": "types/communication-identity.d.ts",
"scripts": {
"audit": "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit",
"build": "npm run clean && tsc -p . && rollup -c 2>&1 && api-extractor run --local",
"build": "npm run clean && tsc -p . && dev-tool run bundle && api-extractor run --local",
"build:clean": "rush update --recheck && rush rebuild && npm run build",
"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": "tsc -p . && dev-tool run bundle",
"build:node": "tsc -p . && dev-tool run bundle",
"build:samples": "echo Obsolete.",
"build:test": "tsc -p . && rollup -c 2>&1",
"build:test": "tsc -p . && dev-tool run bundle",
"check-format": "prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
"clean": "rimraf dist dist-* temp types *.tgz *.log",
"execute:samples": "dev-tool samples run samples-dev",
Expand Down Expand Up @@ -89,11 +89,6 @@
"@azure-tools/test-recorder": "^1.0.0",
"@azure/identity": "^2.0.1",
"@microsoft/api-extractor": "^7.18.11",
"@rollup/plugin-commonjs": "^21.0.1",
"@rollup/plugin-json": "^4.0.0",
"@rollup/plugin-multi-entry": "^3.0.0",
"@rollup/plugin-node-resolve": "^8.0.0",
"@rollup/plugin-replace": "^2.2.0",
"@types/chai": "^4.1.6",
"@types/mocha": "^7.0.2",
"@types/sinon": "^9.0.4",
Expand Down Expand Up @@ -121,11 +116,6 @@
"nyc": "^15.0.0",
"prettier": "^2.5.1",
"rimraf": "^3.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-terser": "^5.1.1",
"rollup-plugin-visualizer": "^4.0.4",
"rollup-plugin-shim": "^1.0.0",
"rollup": "^2.0.0",
"sinon": "^9.0.2",
"typescript": "~4.2.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"types": "types/communication-network-traversal.d.ts",
"scripts": {
"audit": "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit",
"build": "npm run clean && tsc -p . && rollup -c 2>&1 && api-extractor run --local",
"build": "npm run clean && tsc -p . && dev-tool run bundle --browser-test=false && api-extractor run --local",
"build:clean": "rush update --recheck && rush rebuild && npm run build",
"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": "tsc -p . && dev-tool run bundle --browser-test=false",
"build:node": "tsc -p . && dev-tool run bundle --browser-test=false",
"build:samples": "echo Obsolete.",
"build:test": "tsc -p . && rollup -c rollup.test.config.js 2>&1",
"check-format": "prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import multiEntry from "@rollup/plugin-multi-entry";
import replace from "@rollup/plugin-replace";
import sourcemaps from "rollup-plugin-sourcemaps";
import shim from "rollup-plugin-shim";
import { makeBrowserTestConfig, openTelemetryCommonJs } from "@azure/dev-tool/shared-config/rollup";
import { makeBrowserTestConfig } from "@azure/dev-tool/shared-config/rollup";

function makeBrowserTestConfigPatch() {
const config = { ...makeBrowserTestConfig(require("./package.json")) };
Expand All @@ -34,13 +34,7 @@ function makeBrowserTestConfigPatch() {
preferBuiltins: false,
}),
json(),
cjs({
namedExports: {
chai: ["assert"],
events: ["EventEmitter"],
...openTelemetryCommonJs(),
},
}),
cjs(),
];

return config;
Expand Down
19 changes: 5 additions & 14 deletions sdk/communication/communication-phone-numbers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
"types": "types/communication-phone-numbers.d.ts",
"scripts": {
"audit": "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit",
"build": "npm run clean && tsc -p . && rollup -c 2>&1 && api-extractor run --local",
"build": "npm run clean && tsc -p . && npm run bundle && api-extractor run --local",
"build:clean": "rush update --recheck && rush rebuild && npm run build",
"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": "tsc -p . && npm run bundle",
"build:node": "tsc -p . && ",
"build:samples": "echo Obsolete.",
"build:test": "tsc -p . && rollup -c 2>&1",
"build:test": "tsc -p . && npm run bundle",
"bundle": "dev-tool run bundle --browser-test=false",
"check-format": "prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
"clean": "rimraf dist dist-* types *.tgz *.log",
"execute:samples": "dev-tool samples run samples-dev",
Expand Down Expand Up @@ -77,11 +78,6 @@
"@azure-tools/test-recorder": "^1.0.0",
"@azure/identity": "^2.0.1",
"@microsoft/api-extractor": "^7.18.11",
"@rollup/plugin-commonjs": "^21.0.1",
"@rollup/plugin-json": "^4.0.0",
"@rollup/plugin-multi-entry": "^3.0.0",
"@rollup/plugin-node-resolve": "^8.0.0",
"@rollup/plugin-replace": "^2.2.0",
"@types/chai": "^4.1.6",
"@types/mocha": "^7.0.2",
"@types/sinon": "^9.0.4",
Expand Down Expand Up @@ -109,11 +105,6 @@
"nyc": "^15.0.0",
"prettier": "^2.5.1",
"rimraf": "^3.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-terser": "^5.1.1",
"rollup-plugin-visualizer": "^4.0.4",
"rollup-plugin-shim": "^1.0.0",
"rollup": "^2.0.0",
"sinon": "^9.0.2",
"typescript": "~4.2.0"
},
Expand Down
18 changes: 4 additions & 14 deletions sdk/communication/communication-short-codes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
"types": "types/communication-short-codes.d.ts",
"scripts": {
"audit": "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit",
"build": "npm run clean && tsc -p . && rollup -c 2>&1 && api-extractor run --local",
"build": "npm run clean && tsc -p . && dev-tool run bundle && api-extractor run --local",
"build:autorest": "autorest --typescript --version=3.0.6267 --v3 ./swagger/README.md && rushx format",
"build:clean": "rush update --recheck && rush rebuild && npm run build",
"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": "tsc -p . && dev-tool run bundle",
"build:node": "tsc -p . && dev-tool run bundle",
"build:samples": "dev-tool samples publish --force",
"build:test": "tsc -p . && rollup -c 2>&1",
"build:test": "tsc -p . && dev-tool run bundle",
"check-format": "prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
"clean": "rimraf dist dist-* types *.tgz *.log",
"execute:samples": "dev-tool samples run samples-dev",
Expand Down Expand Up @@ -77,11 +77,6 @@
"@azure/identity": "^2.0.1",
"@azure/test-utils": "^1.0.0",
"@microsoft/api-extractor": "^7.18.11",
"@rollup/plugin-commonjs": "^21.0.1",
"@rollup/plugin-json": "^4.0.0",
"@rollup/plugin-multi-entry": "^3.0.0",
"@rollup/plugin-node-resolve": "^8.0.0",
"@rollup/plugin-replace": "^2.2.0",
"@types/chai": "^4.1.6",
"@types/mocha": "^7.0.2",
"@types/node": "^12.0.0",
Expand Down Expand Up @@ -109,11 +104,6 @@
"nyc": "^15.0.0",
"prettier": "^2.5.1",
"rimraf": "^3.0.0",
"rollup": "^2.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",
"sinon": "^9.0.2",
"typescript": "~4.2.0"
},
Expand Down
18 changes: 4 additions & 14 deletions sdk/communication/communication-sms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
"types": "types/communication-sms.d.ts",
"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": "tsc -p . && dev-tool run bundle",
"build:node": "tsc -p . && dev-tool run bundle",
"build:samples": "dev-tool samples publish --force",
"build:test": "tsc -p . && rollup -c 2>&1",
"build": "npm run clean && tsc -p . && rollup -c 2>&1 && api-extractor run --local",
"build:test": "tsc -p . && dev-tool run bundle",
"build": "npm run clean && tsc -p . && dev-tool run bundle && api-extractor run --local",
"check-format": "prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
"clean": "rimraf dist dist-* temp types *.tgz *.log",
"execute:samples": "dev-tool samples run samples-dev",
Expand Down Expand Up @@ -79,11 +79,6 @@
"@azure/test-utils": "^1.0.0",
"@azure-tools/test-recorder": "^1.0.0",
"@microsoft/api-extractor": "^7.18.11",
"@rollup/plugin-commonjs": "^21.0.1",
"@rollup/plugin-json": "^4.0.0",
"@rollup/plugin-multi-entry": "^3.0.0",
"@rollup/plugin-node-resolve": "^8.0.0",
"@rollup/plugin-replace": "^2.2.0",
"@types/chai": "^4.1.6",
"@types/mocha": "^7.0.2",
"@types/node": "^12.0.0",
Expand All @@ -109,11 +104,6 @@
"nyc": "^15.0.0",
"prettier": "^2.5.1",
"rimraf": "^3.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-terser": "^5.1.1",
"rollup-plugin-visualizer": "^4.0.4",
"rollup-plugin-shim": "^1.0.0",
"rollup": "^2.0.0",
"sinon": "^9.0.2",
"typescript": "~4.2.0",
"util": "^0.12.1"
Expand Down
9 changes: 1 addition & 8 deletions sdk/synapse/synapse-monitoring/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import rollup from "rollup";
import nodeResolve from "rollup-plugin-node-resolve";
import sourcemaps from "rollup-plugin-sourcemaps";
import cjs from "@rollup/plugin-commonjs";
import { openTelemetryCommonJs } from "@azure/dev-tool/shared-config/rollup";


const ignoreKnownWarnings = (warning) => {
Expand Down Expand Up @@ -48,12 +46,7 @@ const config = {
plugins: [
nodeResolve({ module: true }),
sourcemaps(),
cjs({
namedExports: {
assert: ["ok", "deepEqual", "equal", "fail", "deepStrictEqual", "strictEqual"],
...openTelemetryCommonJs()
}
})
cjs()
]
};

Expand Down
6 changes: 3 additions & 3 deletions sdk/web-pubsub/web-pubsub-express/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"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": "echo \"Browser is not supported.\" && exit 0",
"build:node": "tsc -p . && dev-tool run bundle",
"build:node": "tsc -p . && dev-tool run bundle --browser-test=false",
"build:samples": "echo Obsolete.",
"build:test": "tsc -p . && dev-tool run bundle",
"build": "npm run clean && tsc -p . && dev-tool run bundle && api-extractor run --local",
"build:test": "tsc -p . && dev-tool run bundle --browser-test=false",
"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\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
"format": "prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
"clean": "rimraf dist dist-esm test-dist temp types *.tgz *.log",
Expand Down
7 changes: 4 additions & 3 deletions sdk/web-pubsub/web-pubsub/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,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": "echo \"Browser is not supported.\" && exit 0",
"build:node": "tsc -p . && dev-tool run bundle",
"build:node": "tsc -p . && dev-tool run bundle --browser-test=false",
"build:samples": "echo Obsolete.",
"build:test": "tsc -p . && dev-tool run bundle",
"build": "npm run clean && tsc -p . && dev-tool run bundle && api-extractor run --local",
"build:test": "tsc -p . && dev-tool run bundle --browser-test=false",
"build": "npm run clean && tsc -p . && dev-tool run bundle --browser-test=false && api-extractor run --local",
"bundle": "dev-tool run bundle --browser-test=false",
"check-format": "prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
"format": "prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
"clean": "rimraf dist dist-esm test-dist temp types *.tgz *.log",
Expand Down

0 comments on commit 11cee51

Please sign in to comment.