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.

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

refactor: [#4684] Replace browserify with tsup #4774

Merged
merged 6 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 0 additions & 29 deletions libraries/adaptive-expressions-ie11/babel.config.js

This file was deleted.

23 changes: 3 additions & 20 deletions libraries/adaptive-expressions-ie11/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,11 @@
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"dependencies": {
"adaptive-expressions": "4.1.6",
"clean-webpack-plugin": "^4.0.0",
"core-js": "^3.38.1",
"eslint-plugin-only-warn": "^1.1.0",
"terser-webpack-plugin": "^5.3.10"
},
"devDependencies": {
"@babel/core": "^7.25.2",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.24.7",
"@babel/plugin-transform-runtime": "^7.25.4",
"@babel/preset-env": "^7.25.4",
"@babel/preset-typescript": "^7.24.7",
"@babel/runtime": "^7.25.4",
"babel-loader": "^9.1.3",
"ts-loader": "^9.5.1",
"typescript": "~4.7",
"webpack": "^5.94.0",
"webpack-cli": "^5.1.4"
"adaptive-expressions": "4.1.6"
},
"scripts": {
"build": "webpack",
"build": "npm-run-all clean build:browser",
"build:browser": "tsup --config ../../tsup/browser.config.ts --define.outfile dist/index.js --dts",
"clean": "rimraf dist",
"lint": "eslint ."
},
Expand Down
1 change: 0 additions & 1 deletion libraries/adaptive-expressions-ie11/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"extends": "../adaptive-expressions/tsconfig.json",
"compilerOptions": {
"target": "es5",
"outDir": "dist",
"rootDir": "./src"
},
Expand Down
55 changes: 0 additions & 55 deletions libraries/adaptive-expressions-ie11/webpack.config.js

This file was deleted.

27 changes: 0 additions & 27 deletions libraries/adaptive-expressions/babel.config.js

This file was deleted.

7 changes: 4 additions & 3 deletions libraries/adaptive-expressions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,12 @@
"typescript": "~4.7"
},
"scripts": {
"build": "npm-run-all build:src build:tests build:browser",
"build:src": "tsc -b",
"build:tests": "tsc -p tests/tsconfig.json",
"build": "npm-run-all build:src build:tests",
"browserify": "browserify lib/browser.js -s AEL --debug -p esmify -t [ babelify --extensions .js,.mjs --global ] | exorcist lib/browser.js.map | sponge lib/browser.js",
"postbuild": "rimraf --glob lib/browser.* && shx cp lib/index.js lib/browser.js && yarn browserify",
"build:browser": "npm-run-all build:browser:clean build:browser:run",
"build:browser:clean": "rimraf --glob lib/browser.*",
"build:browser:run": "tsup --config ../../tsup/browser.config.ts",
"clean": "rimraf lib tsconfig.tsbuildinfo",
"depcheck": "depcheck --config ../../.depcheckrc --ignores sinon,@types/xmldom",
"build-docs": "typedoc --theme markdown --entryPoint adaptive-expressions --excludePrivate --includeDeclarations --ignoreCompilerErrors --module amd --out ..\\..\\doc\\adaptive-expressions .\\lib\\index.d.ts --hideGenerator --name \"Bot Builder SDK - Expression\" --readme none",
Expand Down
1 change: 0 additions & 1 deletion libraries/botframework-connector/esbuild.inject.js

This file was deleted.

16 changes: 5 additions & 11 deletions libraries/botframework-connector/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,37 +37,31 @@
"botframework-schema": "4.1.6",
"buffer": "^6.0.3",
"cross-fetch": "^4.0.0",
"crypto-browserify": "^3.12.0",
"eslint-plugin-only-warn": "^1.1.0",
"https-browserify": "^1.0.0",
"https-proxy-agent": "^7.0.5",
"jsonwebtoken": "^9.0.2",
"node-fetch": "^2.7.0",
"openssl-wrapper": "^0.3.4",
"rsa-pem-from-mod-exp": "^0.8.6",
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"zod": "^3.23.8"
},
"devDependencies": {
"@types/node": "18.19.47",
"botbuilder-test-utils": "0.0.0",
"dotenv": "^16.4.5",
"esbuild-plugin-polyfill-node": "^0.3.0",
"nock": "^13.5.5",
"should": "^13.2.3",
"tsup": "^8.2.4"
"should": "^13.2.3"
},
"scripts": {
"build": "tsc -b",
"build:tsup": "npm-run-all build:tsup:clean build:tsup:run",
"build:tsup:clean": "rimraf --glob lib/browser.*",
"build:tsup:run": "tsup",
"build:browser": "npm-run-all build:browser:clean build:browser:run",
"build:browser:clean": "rimraf --glob lib/browser.*",
"build:browser:run": "tsup --config ../../tsup/browser.config.ts",
"build:downlevel-dts": "downlevel-dts lib _ts3.4/lib --checksum",
"clean": "rimraf _ts3.4 lib tsconfig.tsbuildinfo",
"depcheck": "depcheck --config ../../.depcheckrc --ignores azure,sinon,browserify-fs,buffer,crypto-browserify,https-browserify,stream-browserify,stream-http",
"lint": "eslint .",
"postbuild": "npm-run-all -p build:tsup build:downlevel-dts",
"postbuild": "npm-run-all -p build:browser build:downlevel-dts",
"test": "yarn build && yarn test:mocha",
"test:mocha": "nyc mocha tests --recursive"
},
Expand Down
51 changes: 0 additions & 51 deletions libraries/botframework-connector/tsup.config.ts

This file was deleted.

10 changes: 5 additions & 5 deletions libraries/botframework-streaming/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@
"chai": "^4.5.0"
},
"scripts": {
"build": "npm-run-all -p build:lib build:es5",
"build:es5": "npm-run-all build:es5:tsc build:es5:browserify",
"build:es5:browserify": "browserify -s BFSE --debug es5/index-browser.js | exorcist lib/index-browser.js.map > lib/index-browser.js",
"build:es5:tsc": "tsc -p tsconfig-es5.json",
"build": "npm-run-all -p build:lib build:browser",
"build:browser": "npm-run-all build:browser:clean build:browser:run",
"build:browser:clean": "rimraf --glob lib/index-browser.*",
"build:browser:run": "tsup --config ../../tsup/browser.config.ts --define.entry src/index-browser.ts --define.outfile lib/index-browser.js --dts",
"build:lib": "tsc -p tsconfig.json",
"build:rollup": "yarn clean && yarn build && api-extractor run --verbose --local",
"clean": "rimraf _ts3.4 es5 lib",
"clean": "rimraf _ts3.4 lib",
"depcheck": "depcheck --config ../../.depcheckrc",
"lint": "eslint .",
"postbuild": "downlevel-dts lib _ts3.4/lib --checksum",
Expand Down
11 changes: 0 additions & 11 deletions libraries/botframework-streaming/tsconfig-es5.json

This file was deleted.

2 changes: 1 addition & 1 deletion libraries/botframework-streaming/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"extends": "../../tsconfig.json",
"compilerOptions": {
"composite": false,
"lib": ["es2015"],
"lib": ["es2015", "dom"],
"outDir": "lib",
"rootDir": "src"
},
Expand Down
17 changes: 8 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,13 @@
"resolutions": {
"@microsoft/recognizers-text-number": "~1.3.1",
"@types/ramda": "0.26.0",
"babel-traverse": "npm:@babel/[email protected]",
"lodash.pick": "file:overrides/lodash.pick",
"**/nightwatch/ejs": "^3.1.10",
"**/nightwatch/semver": "^7.5.2",
"**/botbuilder-dialogs-adaptive-runtime-integration-restify/restify/send": "^0.19.0",
"**/restify/find-my-way": "^8.2.2"
},
"resolutionComments": {
"babel-traverse": "Keep version pinned at '7.24.7'(different than other @babel/traverse), so it doesn't collide. Remove the resolution and override project when replacing browserify, so it removes esmify which has this dependency.",
"lodash.pick": "Remove the resolution and override project when supporting Node >=18. Because we can't update nightwatch due to jsdom requires node >= 18. https://github.com/lodash/lodash/issues/5809#issuecomment-1910560681",
"**/nightwatch/ejs": "Remove the resolution when supporting Node >=18. Because we can't update nightwatch due to jsdom requires node >= 18. https://github.com/lodash/lodash/issues/5809#issuecomment-1910560681",
"**/nightwatch/semver": "Remove the resolution when nightwatch is updated to a latest version",
Expand All @@ -71,9 +69,10 @@
"@types/node": "18.19.47",
"@types/sinon": "^17.0.3",
"applicationinsights": "^2.9.6",
"babelify": "^10.0.0",
"browserify": "^17.0.0",
"crypto-browserify": "^3.12.0",
"depcheck": "^1.4.7",
"esbuild-plugin-polyfill-node": "^0.3.0",
"https-browserify": "^1.0.0",
"eslint": "^9.12.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.31.0",
Expand All @@ -82,22 +81,22 @@
"eslint-plugin-mocha": "^10.5.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-security": "^3.0.1",
"esmify": "^2.1.1",
"exorcist": "^2.0.0",
"mocha": "^10.7.3",
"mocha-junit-reporter": "^2.2.1",
"mocha": "^10.7.3",
"npm-run-all": "^4.1.5",
"nyc": "^17.0.0",
"prettier": "^3.3.3",
"rimraf": "^5.0.10",
"shx": "^0.3.4",
"sinon": "^19.0.2",
"source-map-support": "^0.5.21",
"sponge": "^0.1.0",
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"ts-node": "^10.9.2",
"typedoc": "^0.26.7",
"tsup": "^8.2.4",
"typedoc-plugin-external-module-name": "^4.0.6",
"typedoc-plugin-markdown": "^4.2.7",
"typedoc": "^0.26.7",
"typescript": "~4.7",
"typescript-eslint": "^8.11.0",
"webpack-dev-server": "^5.1.0",
Expand Down
1 change: 0 additions & 1 deletion testing/browser-functional/browser-echo-bot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"@babel/preset-typescript": "^7.24.7",
"@babel/runtime": "^7.25.6",
"babel-loader": "^9.2.1",
"browserify": "^17.0.0",
"clean-webpack-plugin": "^4.0.0",
"copy-webpack-plugin": "^12.0.2",
"crypto-browserify": "^3.12.0",
Expand Down
Loading
Loading