Skip to content

Commit

Permalink
browserify botframework-streaming
Browse files Browse the repository at this point in the history
Fixes #2311
  • Loading branch information
Josh Gummersall committed Oct 22, 2020
1 parent b685c12 commit 797b2a4
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 40 deletions.
5 changes: 3 additions & 2 deletions libraries/botframework-connector/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"mocha": "^6.2.3",
"nock": "^11.9.1",
"nyc": "^15.1.0",
"rimraf": "^3.0.2",
"should": "^13.2.3",
"shx": "^0.3.2",
"source-map-support": "^0.5.3",
Expand All @@ -49,8 +50,8 @@
},
"scripts": {
"build": "tsc",
"postbuild": "shx cp lib/index.js lib/browser.js | browserify --debug lib/browser.js | exorcist lib/browser.map.js | sponge lib/browser.js",
"clean": "erase /q /s .\\lib",
"postbuild": "shx cp lib/index.js lib/browser.js | browserify -s BFC --debug lib/browser.js | exorcist lib/browser.js.map | sponge lib/browser.js",
"clean": "rimraf q s lib",
"set-version": "npm version --allow-same-version ${Version}",
"test": "tsc && nyc mocha tests/ --timeout 60000 --inspect"
},
Expand Down
8 changes: 4 additions & 4 deletions libraries/botframework-streaming/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/browser
/lib
/node_modules
es5
lib
node_modules
*.js.map
/coverage/**
coverage/**
17 changes: 12 additions & 5 deletions libraries/botframework-streaming/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"url": "https://github.com/microsoft/botbuilder-js.git"
},
"main": "lib/index.js",
"browser": "browser/index-browser.js",
"browser": "lib/index-browser.js",
"typings": "lib/index.d.ts",
"dependencies": {
"@types/ws": "^6.0.3",
Expand All @@ -31,24 +31,31 @@
"@microsoft/api-extractor": "^7.7.12",
"@types/chai": "^4.1.7",
"@types/node": "^10.17.27",
"browserify": "16.5.2",
"chai": "^4.2.0",
"exorcist": "^1.0.1",
"mocha": "^6.2.3",
"npm-run-all": "^4.1.5",
"nyc": "^15.1.0",
"rimraf": "^3.0.2",
"sinon": "^7.5.0",
"sponge": "^0.1.0",
"ts-node": "^4.1.0",
"typescript": "3.5.3"
},
"scripts": {
"build": "tsc -p tsconfig.json && tsc -p tsconfig-browser.json",
"build": "npm-run-all -p build:lib build:es5",
"build:lib": "tsc -p tsconfig.json",
"build:es5": "tsc -p tsconfig-es5.json",
"postbuild": "browserify -s BFSE --debug es5/index-browser.js | exorcist lib/index-browser.js.map | sponge lib/index-browser.js",
"build:rollup": "npm run clean && npm run build && api-extractor run --verbose --local",
"clean": "rmdir /q /s lib browser",
"clean": "rimraf q s lib es5",
"set-version": "npm version --allow-same-version ${Version}",
"test": "npm run build && nyc mocha tests/",
"test:compat": "api-extractor run --verbose"
},
"files": [
"lib",
"src",
"browser"
"src"
]
}
23 changes: 0 additions & 23 deletions libraries/botframework-streaming/tsconfig-browser.json

This file was deleted.

7 changes: 7 additions & 0 deletions libraries/botframework-streaming/tsconfig-es5.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"target": "es5",
"outDir": "es5"
}
}
9 changes: 3 additions & 6 deletions libraries/botframework-streaming/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"target": "es6",
"lib": ["es2015"],
"lib": ["es2015", "dom"],
"module": "commonjs",
"declaration": true,
"declarationMap": true,
Expand All @@ -10,10 +10,7 @@
"rootDir": "./src",
"types" : ["node"]
},
"exclude": [
"**/*browser*.ts",
"browser",
"lib",
"node_modules"
"include": [
"src/**/*"
]
}

0 comments on commit 797b2a4

Please sign in to comment.