Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Storage-queue,changefeed,avro] Move to shared rollup config #19616

Merged
merged 6 commits into from
Jan 5, 2022
Merged

[Storage-queue,changefeed,avro] Move to shared rollup config #19616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a488a2f
[Storage-Queue] Move to shared rollup config
jeremymeng Jan 4, 2022
cb4167c
doing the same for blob-changefeed and internal-avro
jeremymeng Jan 4, 2022
5489088
Merge remote-tracking branch 'upstream/main' into storage/queue-share…
jeremymeng Jan 4, 2022
fed77e7
browser rollup is not ready so disabling it and copy the original com…
jeremymeng Jan 4, 2022
0322598
Merge remote-tracking branch 'upstream/main' into storage/queue-share…
jeremymeng Jan 5, 2022
0d8ef3e
format
jeremymeng Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions sdk/storage/storage-blob-changefeed/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,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:es6": "tsc -p tsconfig.json",
"build:nodebrowser": "rollup -c 2>&1",
"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 rollup.test.config.js 2>&1",
"build:test": "npm run build:es6 && rollup -c 2>&1",
"build:types": "downlevel-dts typings/latest typings/3.1",
"build": "npm run clean && npm run build:es6 && npm run build:nodebrowser && api-extractor run --local && npm run build:types",
"build": "npm run clean && npm run build:es6 && rollup -c 2>&1 && 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",
Expand All @@ -48,7 +47,7 @@
"test:node": "npm run clean && npm run build:test && npm run unit-test:node",
"test": "npm run clean && npm run build:test && npm run unit-test",
"unit-test:browser": "echo 'browser not supported yet.'",
"unit-test:node": "mocha --require source-map-support/register --reporter ../../../common/tools/mocha-multi-reporter.js --full-trace -t 120000 \"dist-test/index.node.js\"",
"unit-test:node": "mocha -r esm --require ts-node/register --reporter ../../../common/tools/mocha-multi-reporter.js --timeout 1200000 --full-trace \"test/{,!(browser)/**/}*.spec.ts\"",
"unit-test": "npm run unit-test:node && npm run unit-test:browser",
"emulator-tests": "cross-env STORAGE_CONNECTION_STRING=UseDevelopmentStorage=true && npm run test:node"
},
Expand Down
211 changes: 0 additions & 211 deletions sdk/storage/storage-blob-changefeed/rollup.base.config.js
View file
Open in desktop

This file was deleted.

18 changes: 5 additions & 13 deletions sdk/storage/storage-blob-changefeed/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

import * as base from "./rollup.base.config";
import { makeConfig } from "@azure/dev-tool/shared-config/rollup";

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"), {
// Disable this until we are ready to run rollup for the browser.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question, I know it's pre-existing, but Is there an issue tracking this work?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah #11036

disableBrowserBundle: true,
});
9 changes: 0 additions & 9 deletions sdk/storage/storage-blob-changefeed/rollup.test.config.js
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions sdk/storage/storage-blob-changefeed/test/blobchangefeedclient.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ import { Pipeline } from "@azure/storage-blob";
import { SDK_VERSION } from "../src/utils/constants";
import { setSpan, context } from "@azure/core-tracing";

import * as dotenv from "dotenv";
import { Context } from "mocha";
dotenv.config();

const timeoutForLargeFileUploadingTest = 20 * 60 * 1000;

Expand Down
3 changes: 0 additions & 3 deletions sdk/storage/storage-blob-changefeed/test/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

import * as dotenv from "dotenv";
import { SimpleTokenCredential } from "./testutils.common";
import { StorageSharedKeyCredential, BlobServiceClient } from "@azure/storage-blob";
import { BlobChangeFeedClient } from "../../src";
import { TokenCredential } from "@azure/core-http";
import { env } from "@azure-tools/test-recorder";

dotenv.config();

export * from "./testutils.common";

export function getGenericCredential(accountType: string): StorageSharedKeyCredential {
Expand Down
7 changes: 3 additions & 4 deletions sdk/storage/storage-internal-avro/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,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:es6": "tsc -p tsconfig.json",
"build:nodebrowser": "rollup -c 2>&1",
"build:samples": "echo Skipped.",
"build:test": "npm run build:es6 && rollup -c rollup.test.config.js 2>&1",
"build:test": "npm run build:es6 && rollup -c 2>&1",
"build:types": "downlevel-dts types/latest types/3.1",
"build": "npm run clean && npm run build:es6 && npm run build:nodebrowser && api-extractor run --local && npm run build:types",
"build": "npm run clean && npm run build:es6 && rollup -c 2>&1 && 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",
"extract-api": "tsc -p . && api-extractor run --local",
Expand All @@ -58,7 +57,7 @@
"test:node": "npm run clean && npm run build:test && npm run unit-test:node",
"test": "npm run clean && npm run build:test && npm run unit-test",
"unit-test:browser": "karma start --single-run",
"unit-test:node": "mocha --require source-map-support/register --reporter ../../../common/tools/mocha-multi-reporter.js --full-trace -t 120000 \"dist-test/index.node.js\"",
"unit-test:node": "mocha -r esm --require ts-node/register --reporter ../../../common/tools/mocha-multi-reporter.js --timeout 1200000 --full-trace \"test/{,!(browser)/**/}*.spec.ts\"",
"unit-test": "npm run unit-test:node && npm run unit-test:browser",
"docs": "echo Skipped."
},
Expand Down
Loading