Skip to content

Commit

Permalink
browser folder moved to dist-browser (#7349)
Browse files Browse the repository at this point in the history
  • Loading branch information
sadasant authored Feb 13, 2020
1 parent 1077865 commit 16fdb6e
Show file tree
Hide file tree
Showing 37 changed files with 48 additions and 102 deletions.
8 changes: 1 addition & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,4 @@ sdk/cosmosdb/cosmos/lib
swagger/*.json

# library-specific ignores
sdk/keyvault/*/src/**/*.js

# skipping browser tests while also ignoring the browser folders where the browser bundles are
/**/browser/*.js
/**/browser/*.js.map
/**/browser/*.html
!/test/browser/*.spec.ts
sdk/keyvault/*/src/**/*.js
2 changes: 1 addition & 1 deletion sdk/core/abort-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"build:test": "rollup -c rollup.test.config.js 2>&1",
"build": "npm run build:es6 && npm run build:nodebrowser",
"check-format": "prettier --list-different --config ../../.prettierrc.json \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
"clean": "rimraf dist dist-esm dist-test types temp browser/*.js* browser/*.zip statistics.html coverage coverage-browser .nyc_output *.tgz *.log test*.xml TEST*.xml",
"clean": "rimraf dist dist-esm dist-test types temp dist-browser/*.js* dist-browser/*.zip statistics.html coverage coverage-browser .nyc_output *.tgz *.log test*.xml TEST*.xml",
"execute:samples": "echo skipped",
"extract-api": "tsc -p . && api-extractor run --local",
"format": "prettier --write --config ../../.prettierrc.json \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/abort-controller/rollup.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export function browserConfig(test = false) {
input: input,
external: ["ms-rest-js"],
output: {
file: "browser/index.js",
file: "dist-browser/index.js",
format: "umd",
name: "Aborter",
sourcemap: true,
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/core-amqp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"build:test": "tsc -p . && rollup -c rollup.test.config.js 2>&1",
"build": "tsc -p . && rollup -c 2>&1",
"check-format": "prettier --list-different --config ../../.prettierrc.json \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
"clean": "rimraf dist dist-esm typings temp browser/*.js* browser/*.zip statistics.html coverage coverage-browser test-browser .nyc_output *.tgz *.log test*.xml TEST*.xml",
"clean": "rimraf dist dist-esm typings temp dist-browser/*.js* dist-browser/*.zip statistics.html coverage coverage-browser test-browser .nyc_output *.tgz *.log test*.xml TEST*.xml",
"execute:samples": "echo skipped",
"format": "prettier --write --config ../../.prettierrc.json \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
"integration-test:browser": "echo skipped",
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/core-amqp/rollup.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export function browserConfig(test = false) {
const baseConfig = {
input: input,
output: {
file: "browser/index.js",
file: "dist-browser/index.js",
format: "umd",
name: "Azure.AMQPCommon",
sourcemap: true
Expand Down
4 changes: 2 additions & 2 deletions sdk/core/core-auth/rollup.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export function browserConfig(test = false) {
const baseConfig = {
input: input,
output: {
file: "browser/core-auth.js",
file: "dist-browser/core-auth.js",
format: "umd",
name: "Azure.Core.Auth",
sourcemap: true
Expand All @@ -83,7 +83,7 @@ export function browserConfig(test = false) {
cjs({
namedExports: { events: ["EventEmitter"] }
}),
viz({ filename: "browser/browser-stats.html", sourcemap: false })
viz({ filename: "dist-browser/browser-stats.html", sourcemap: false })
]
};

Expand Down
2 changes: 1 addition & 1 deletion sdk/core/core-http/rollup.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export function browserConfig(test = false, production = false) {
"@opentelemetry/types": ["CanonicalCode", "SpanKind", "TraceFlags"]
}
}),
viz({ filename: "browser/browser-stats.html", sourcemap: false })
viz({ filename: "dist-browser/browser-stats.html", sourcemap: false })
]
};

Expand Down
4 changes: 2 additions & 2 deletions sdk/core/core-tracing/rollup.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export function browserConfig(test = false) {
const baseConfig = {
input: input,
output: {
file: "browser/core-tracing.js",
file: "dist-browser/core-tracing.js",
format: "umd",
name: "Azure.Core.Tracing",
sourcemap: true
Expand All @@ -86,7 +86,7 @@ export function browserConfig(test = false) {
assert: ["ok", "fail", "equal", "deepEqual", "deepStrictEqual", "strictEqual"]
}
}),
viz({ filename: "browser/browser-stats.html", sourcemap: false })
viz({ filename: "dist-browser/browser-stats.html", sourcemap: false })
]
};

Expand Down
4 changes: 2 additions & 2 deletions sdk/core/logger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"main": "./dist/index.js",
"module": "./dist-esm/src/logger.js",
"browser": {
"./dist/index.js": "./browser/logger.js",
"./dist/index.js": "./dist-browser/logger.js",
"./dist-esm/src/log.js": "./dist-esm/src/log.browser.js",
"process": false
},
Expand All @@ -17,7 +17,7 @@
"build:test": "rollup -c rollup.test.config.js 2>&1",
"build": "npm run build:es6 && npm run build:nodebrowser && npm run extract-api",
"check-format": "prettier --list-different --config ../../.prettierrc.json \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
"clean": "rimraf dist dist-esm dist-test types temp browser/*.js* browser/*.zip statistics.html coverage coverage-browser .nyc_output *.tgz *.log test*.xml TEST*.xml",
"clean": "rimraf dist dist-esm dist-test types temp dist-browser/*.js* dist-browser/*.zip statistics.html coverage coverage-browser .nyc_output *.tgz *.log test*.xml TEST*.xml",
"execute:samples": "echo skipped",
"extract-api": "tsc -p . && api-extractor run --local",
"format": "prettier --write --config ../../.prettierrc.json \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/logger/rollup.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export function browserConfig(test = false) {
input: input,
external: ["ms-rest-js"],
output: {
file: "browser/logger.js",
file: "dist-browser/logger.js",
format: "umd",
name: "Azure.Logger",
sourcemap: true
Expand Down
2 changes: 1 addition & 1 deletion sdk/eventhub/event-hubs/rollup.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export function browserConfig(test = false) {
input: input,
external: ["ms-rest-js"],
output: {
file: "browser/event-hubs.js",
file: "dist-browser/event-hubs.js",
format: "umd",
name: "Azure.Messaging.EventHubs",
sourcemap: true,
Expand Down
2 changes: 1 addition & 1 deletion sdk/eventhub/eventhubs-checkpointstore-blob/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"module": "dist-esm/src/index.js",
"types": "./typings/eventhubs-checkpointstore-blob.d.ts",
"browser": {
"./dist/index.js": "./browser/index.js"
"./dist/index.js": "./dist-browser/index.js"
},
"engine": {
"node": ">=8.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export function browserConfig(test = false) {
input: input,
external: ["ms-rest-js"],
output: {
file: "browser/eventhubs-checkpointstore-blob.js",
file: "dist-browser/eventhubs-checkpointstore-blob.js",
format: "umd",
name: "Azure.Messaging.EventHubs.CheckpointStore.Blob",
sourcemap: true,
Expand Down
2 changes: 1 addition & 1 deletion sdk/identity/identity/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"build:test": "tsc -p . && rollup -c rollup.test.config.js 2>&1",
"build": "npm run extract-api && tsc -p . && rollup -c 2>&1",
"check-format": "prettier --list-different --config ../../.prettierrc.json \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
"clean": "rimraf dist dist-esm browser test-dist test-browser typings *.tgz *.log",
"clean": "rimraf dist dist-esm dist-browser test-dist test-browser typings *.tgz *.log",
"execute:samples": "echo skipped",
"extract-api": "tsc -p . && api-extractor run --local",
"format": "prettier --write --config ../../.prettierrc.json \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
Expand Down
4 changes: 2 additions & 2 deletions sdk/identity/identity/rollup.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export function browserConfig(test = false) {
const baseConfig = {
input: input,
output: {
file: "browser/identity.js",
file: "dist-browser/identity.js",
format: "umd",
name: "Azure.Identity",
sourcemap: true
Expand All @@ -87,7 +87,7 @@ export function browserConfig(test = false) {
"@opentelemetry/types": ["CanonicalCode", "SpanKind", "TraceFlags"]
}
}),
viz({ filename: "browser/browser-stats.html", sourcemap: false })
viz({ filename: "dist-browser/browser-stats.html", sourcemap: false })
]
};

Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/keyvault-certificates/rollup.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export function browserConfig(test = false) {
const baseConfig = {
input: "dist-esm/src/index.js",
output: {
file: "browser/azure-keyvault-certificates.js",
file: "dist-browser/azure-keyvault-certificates.js",
banner: banner,
format: "umd",
name: "azurekeyvaultcertificates",
Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/keyvault-keys/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"build:test": "npm run build:es6 && rollup -c rollup.test.config.js 2>&1",
"build": "npm run extract-api && npm run build:es6 && npm run build:nodebrowser",
"check-format": "prettier --list-different --config ../../.prettierrc.json \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
"clean": "rimraf dist dist-esm dist-test types *.tgz *.log browser statistics.html coverage && rimraf src/**/*.js && rimraf test/**/*.js",
"clean": "rimraf dist dist-esm dist-test types *.tgz *.log dist-browser statistics.html coverage && rimraf src/**/*.js && rimraf test/**/*.js",
"execute:js-samples": "node ../../../common/scripts/run-samples.js samples/javascript/",
"execute:ts-samples": "node ../../../common/scripts/run-samples.js samples/typescript/dist/samples/typescript/src/",
"execute:samples": "npm run build:samples && npm run execute:js-samples && npm run execute:ts-samples",
Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/keyvault-keys/rollup.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export function browserConfig(test = false) {
const baseConfig = {
input: "dist-esm/src/index.js",
output: {
file: "browser/azure-keyvault-keys.js",
file: "dist-browser/azure-keyvault-keys.js",
banner: banner,
format: "umd",
name: "azurekeyvaultkeys",
Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/keyvault-secrets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"build:test": "npm run build:es6 && rollup -c rollup.test.config.js 2>&1",
"build": "npm run extract-api && npm run build:es6 && npm run build:nodebrowser",
"check-format": "prettier --list-different --config ../../.prettierrc.json \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
"clean": "rimraf dist dist-esm dist-test types *.tgz *.log browser statistics.html coverage && rimraf src/**/*.js && rimraf test/**/*.js",
"clean": "rimraf dist dist-esm dist-test types *.tgz *.log dist-browser statistics.html coverage && rimraf src/**/*.js && rimraf test/**/*.js",
"execute:js-samples": "node ../../../common/scripts/run-samples.js samples/javascript/",
"execute:ts-samples": "node ../../../common/scripts/run-samples.js samples/typescript/dist/samples/typescript/src/",
"execute:samples": "npm run build:samples && npm run execute:js-samples && npm run execute:ts-samples",
Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/keyvault-secrets/rollup.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export function browserConfig(test = false) {
const baseConfig = {
input: "dist-esm/src/index.js",
output: {
file: "browser/azure-keyvault-secrets.js",
file: "dist-browser/azure-keyvault-secrets.js",
banner: banner,
format: "umd",
name: "azurekeyvaultsecrets",
Expand Down
48 changes: 0 additions & 48 deletions sdk/servicebus/service-bus/browser/ThirdPartyNotices.txt

This file was deleted.

4 changes: 2 additions & 2 deletions sdk/servicebus/service-bus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"main": "./dist/index.js",
"module": "dist-esm/src/index.js",
"browser": {
"./dist/index.js": "./browser/service-bus.js",
"./dist/index.js": "./dist-browser/service-bus.js",
"./dist-esm/src/util/crypto.js": "./dist-esm/src/util/crypto.browser.js",
"./dist-esm/src/util/parseUrl.js": "./dist-esm/src/util/parseUrl.browser.js",
"buffer": "buffer",
Expand All @@ -31,9 +31,9 @@
},
"files": [
"dist/",
"dist-browser/",
"dist-esm/src/",
"src/",
"browser/",
"typings/service-bus.d.ts",
"tsconfig.json"
],
Expand Down
2 changes: 1 addition & 1 deletion sdk/servicebus/service-bus/rollup.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export function browserConfig(test = false) {
input: input,
external: [],
output: {
file: "browser/service-bus.js",
file: "dist-browser/service-bus.js",
format: "umd",
name: "Azure.Messaging.ServiceBus",
sourcemap: true
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/storage-blob/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"build:types": "downlevel-dts typings/latest typings/3.1",
"build": "npm run build:es6 && npm run build:nodebrowser && api-extractor run --local",
"check-format": "prettier --list-different --config ../../.prettierrc.json \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
"clean": "rimraf dist dist-esm dist-test typings temp browser/*.js* browser/*.zip statistics.html coverage coverage-browser .nyc_output *.tgz *.log test*.xml TEST*.xml",
"clean": "rimraf dist dist-esm dist-test typings temp dist-browser/*.js* dist-browser/*.zip 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",
"extract-api": "tsc -p . && api-extractor run --local",
"execute:js-samples": "node ../../../common/scripts/run-samples.js samples/javascript/",
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/storage-blob/rollup.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export function browserConfig(test = false) {
const baseConfig = {
input: "dist-esm/src/index.browser.js",
output: {
file: "browser/azure-storage-blob.js",
file: "dist-browser/azure-storage-blob.js",
banner: banner,
format: "umd",
name: "azblob",
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/storage-file-datalake/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"build:types": "downlevel-dts typings/latest typings/3.1",
"build": "npm run build:es6 && npm run build:nodebrowser && api-extractor run --local",
"check-format": "prettier --list-different --config ../../.prettierrc.json \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
"clean": "rimraf dist dist-esm dist-test typings temp browser/*.js* browser/*.zip statistics.html coverage coverage-browser .nyc_output *.tgz *.log test*.xml TEST*.xml",
"clean": "rimraf dist dist-esm dist-test typings temp dist-browser/*.js* dist-browser/*.zip statistics.html coverage coverage-browser .nyc_output *.tgz *.log test*.xml TEST*.xml",
"extract-api": "tsc -p . && api-extractor run --local",
"execute:samples": "echo skipped until samples automation ready",
"format": "prettier --write --config ../../.prettierrc.json \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/storage-file-datalake/rollup.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export function browserConfig(test = false) {
const baseConfig = {
input: "dist-esm/src/index.browser.js",
output: {
file: "browser/azure-storage-file-datalake.js",
file: "dist-browser/azure-storage-file-datalake.js",
banner: banner,
format: "umd",
name: "azdatalake",
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/storage-file-share/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"build:types": "downlevel-dts typings/latest typings/3.1",
"build": "npm run build:es6 && npm run build:nodebrowser && api-extractor run --local",
"check-format": "prettier --list-different --config ../../.prettierrc.json \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
"clean": "rimraf dist dist-esm dist-test typings temp browser/*.js* browser/*.zip statistics.html coverage coverage-browser .nyc_output *.tgz *.log test*.xml TEST*.xml",
"clean": "rimraf dist dist-esm dist-test typings temp dist-browser/*.js* dist-browser/*.zip 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",
"extract-api": "tsc -p . && api-extractor run --local",
"execute:js-samples": "node ../../../common/scripts/run-samples.js samples/javascript/",
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/storage-file-share/rollup.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export function browserConfig(test = false) {
const baseConfig = {
input: "dist-esm/src/index.browser.js",
output: {
file: "browser/azure-storage-file-share.js",
file: "dist-browser/azure-storage-file-share.js",
banner: banner,
format: "umd",
name: "azfile",
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/storage-queue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"build:types": "downlevel-dts typings/latest typings/3.1",
"build": "npm run build:es6 && npm run build:nodebrowser && api-extractor run --local",
"check-format": "prettier --list-different --config ../../.prettierrc.json \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
"clean": "rimraf dist dist-esm dist-test typings temp browser/*.js* browser/*.zip statistics.html coverage coverage-browser .nyc_output *.tgz *.log test*.xml TEST*.xml",
"clean": "rimraf dist dist-esm dist-test typings temp dist-browser/*.js* dist-browser/*.zip 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",
"extract-api": "tsc -p . && api-extractor run --local",
"execute:js-samples": "node ../../../common/scripts/run-samples.js samples/javascript/",
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/storage-queue/rollup.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export function browserConfig(test = false) {
const baseConfig = {
input: "dist-esm/src/index.browser.js",
output: {
file: "browser/azure-storage-queue.js",
file: "dist-browser/azure-storage-queue.js",
banner: banner,
format: "umd",
name: "azqueue",
Expand Down
4 changes: 2 additions & 2 deletions sdk/template/template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"module": "dist-esm/src/index.js",
"browser": {
"stream": "./node_modules/stream-browserify/index.js",
"./dist/index.js": "./browser/index.js",
"./dist/index.js": "./dist-browser/index.js",
"./dist-esm/src/print.js": "./dist-esm/src/print.browser.js"
},
"types": "types/azure-template.d.ts",
Expand Down Expand Up @@ -38,8 +38,8 @@
"unit-test": "npm run unit-test:node && npm run unit-test:browser"
},
"files": [
"browser/*.js*",
"dist/",
"dist-browser/*.js*",
"dist-esm/src/",
"src/",
"types/azure-template.d.ts"
Expand Down
Loading

0 comments on commit 16fdb6e

Please sign in to comment.