Skip to content

Commit

Permalink
migrate web-pubsub (Azure#19297)
Browse files Browse the repository at this point in the history
We've been migrating packages over to the single shared rollup config that dev-tool defines. This PR just migrates over two more 
packages that are easy to move over:
- @azure/web-pubsub
- @azure-tools/testing-recorder-new

Resolves Azure#17811 
Resolves Azure#17809
  • Loading branch information
maorleger authored Dec 14, 2021
1 parent 49189e9 commit 4e6b5b8
Show file tree
Hide file tree
Showing 13 changed files with 16 additions and 293 deletions.
11 changes: 2 additions & 9 deletions sdk/test-utils/testing-recorder-new/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"build:node": "tsc -p . && cross-env ONLY_NODE=true rollup -c 2>&1",
"build:samples": "echo Skipped.",
"build:test": "tsc -p .",
"build": "npm run clean && tsc -p . && rollup -c rollup.test.config.js 2>&1",
"build": "npm run clean && tsc -p . && rollup -c 2>&1",
"check-format": "prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
"clean": "rimraf dist dist-esm test-dist types *.tgz",
"extract-api": "echo skipped",
Expand Down Expand Up @@ -56,6 +56,7 @@
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/test-utils/recorder/",
"sideEffects": false,
"private": true,
"dependencies": {},
"devDependencies": {
"@azure/core-util": "^1.0.0-beta.1",
"@azure/identity": "^2.0.1",
Expand All @@ -65,10 +66,6 @@
"@azure/storage-queue": "^12.6.0",
"@azure/dev-tool": "^1.0.0",
"@azure/eslint-plugin-azure-sdk": "^3.0.0",
"@rollup/plugin-commonjs": "11.0.2",
"@rollup/plugin-multi-entry": "^3.0.0",
"@rollup/plugin-node-resolve": "^8.0.0",
"@rollup/plugin-replace": "^2.2.0",
"@types/fs-extra": "^8.0.0",
"@types/chai": "^4.1.6",
"@types/md5": "^2.2.0",
Expand Down Expand Up @@ -102,10 +99,6 @@
"prettier": "^1.16.4",
"rimraf": "^3.0.0",
"rollup": "^1.16.3",
"rollup-plugin-shim": "^1.0.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-terser": "^5.1.1",
"rollup-plugin-visualizer": "^4.0.4",
"typescript": "~4.2.0",
"xhr-mock": "^2.4.1",
"uuid": "^8.3.0",
Expand Down
118 changes: 0 additions & 118 deletions sdk/test-utils/testing-recorder-new/rollup.base.config.js

This file was deleted.

18 changes: 2 additions & 16 deletions sdk/test-utils/testing-recorder-new/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
import { makeConfig } from "@azure/dev-tool/shared-config/rollup";

import * as base from "./rollup.base.config";

const inputs = [];

if (!process.env.ONLY_BROWSER) {
inputs.push(base.nodeConfig());
}

// Disable this until we are ready to run rollup for the browser.
if (!process.env.ONLY_NODE) {
inputs.push(base.browserConfig());
}

export default inputs;
export default makeConfig(require("./package.json"));
6 changes: 0 additions & 6 deletions sdk/test-utils/testing-recorder-new/rollup.test.config.js

This file was deleted.

13 changes: 2 additions & 11 deletions sdk/web-pubsub/web-pubsub-express/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"build:browser": "echo \"Browser is not supported.\" && exit 0",
"build:node": "tsc -p . && cross-env ONLY_NODE=true rollup -c 2>&1",
"build:samples": "echo Obsolete.",
"build:test": "tsc -p . && rollup -c rollup.test.config.js 2>&1",
"build:test": "tsc -p . && rollup -c 2>&1",
"build": "npm run clean && tsc -p . && rollup -c 2>&1 && 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}\"",
Expand All @@ -28,7 +28,7 @@
"test:node": "npm run build:test && npm run unit-test:node && npm run integration-test:node",
"test": "npm run build:test && npm run unit-test && npm run integration-test",
"unit-test:browser": "echo \"Browser is not supported.\" && exit 0",
"unit-test:node": "mocha --reporter ../../../common/tools/mocha-multi-reporter.js dist-test/index.node.js",
"unit-test:node": "mocha -r esm --require ts-node/register --reporter ../../../common/tools/mocha-multi-reporter.js --full-trace \"test/{,!(browser)/**/}*.spec.ts\"",
"unit-test": "npm run unit-test:node && npm run unit-test:browser"
},
"files": [
Expand Down Expand Up @@ -64,11 +64,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": "11.0.2",
"@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/express": "^4.16.0",
"@types/express-serve-static-core": "^4.17.19",
Expand Down Expand Up @@ -101,10 +96,6 @@
"puppeteer": "^10.2.0",
"rimraf": "^3.0.0",
"rollup": "^1.16.3",
"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",
"source-map-support": "^0.5.9",
"typescript": "~4.2.0"
Expand Down
56 changes: 0 additions & 56 deletions sdk/web-pubsub/web-pubsub-express/rollup.base.config.js

This file was deleted.

4 changes: 2 additions & 2 deletions sdk/web-pubsub/web-pubsub-express/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import * as base from "./rollup.base.config";
import { makeConfig } from "@azure/dev-tool/shared-config/rollup";

export default [base.nodeConfig()];
export default makeConfig(require("./package.json"));
3 changes: 0 additions & 3 deletions sdk/web-pubsub/web-pubsub-express/rollup.test.config.js

This file was deleted.

13 changes: 2 additions & 11 deletions sdk/web-pubsub/web-pubsub/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"build:browser": "echo \"Browser is not supported.\" && exit 0",
"build:node": "tsc -p . && cross-env ONLY_NODE=true rollup -c 2>&1",
"build:samples": "echo Obsolete.",
"build:test": "tsc -p . && rollup -c rollup.test.config.js 2>&1",
"build:test": "tsc -p . && rollup -c 2>&1",
"build": "npm run clean && tsc -p . && rollup -c 2>&1 && 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}\"",
Expand All @@ -28,7 +28,7 @@
"test:node": "npm run build:test && npm run unit-test:node && npm run integration-test:node",
"test": "npm run build:test && npm run unit-test && npm run integration-test",
"unit-test:browser": "echo \"Browser is not supported.\" && exit 0",
"unit-test:node": "mocha --exit --reporter ../../../common/tools/mocha-multi-reporter.js dist-test/index.node.js",
"unit-test:node": "mocha --exit -r esm --require ts-node/register --reporter ../../../common/tools/mocha-multi-reporter.js --full-trace \"test/{,!(browser)/**/}*.spec.ts\"",
"unit-test": "npm run unit-test:node && npm run unit-test:browser"
},
"files": [
Expand Down Expand Up @@ -84,11 +84,6 @@
"@azure/identity": "^2.0.1",
"@azure-tools/test-recorder": "^1.0.0",
"@microsoft/api-extractor": "^7.18.11",
"@rollup/plugin-commonjs": "11.0.2",
"@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/jsonwebtoken": "~8.5.0",
"@types/mocha": "^7.0.2",
Expand Down Expand Up @@ -120,10 +115,6 @@
"puppeteer": "^10.2.0",
"rimraf": "^3.0.0",
"rollup": "^1.16.3",
"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",
"source-map-support": "^0.5.9",
"typescript": "~4.2.0",
Expand Down
56 changes: 0 additions & 56 deletions sdk/web-pubsub/web-pubsub/rollup.base.config.js

This file was deleted.

4 changes: 2 additions & 2 deletions sdk/web-pubsub/web-pubsub/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import * as base from "./rollup.base.config";
import { makeConfig } from "@azure/dev-tool/shared-config/rollup";

export default [base.nodeConfig()];
export default makeConfig(require("./package.json"));
Loading

0 comments on commit 4e6b5b8

Please sign in to comment.