Skip to content

Commit da51815

Browse files
authored
Merge pull request #204 from bobfang/update-deps
update dependencies, fix test case
2 parents 5632e4f + 501b9ce commit da51815

File tree

7 files changed

+23496
-11299
lines changed

7 files changed

+23496
-11299
lines changed

Diff for: CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
### v0.39.1
4+
* Update vulnerable dependencies
5+
* Update example dependencies (removed vulenerable express-browserify)
6+
37
### v0.37.0
48
* BREAKING CHANGES INTRODUCED:
59
* All options parameters for all methods are coverted to be lowerCamelCase

Diff for: examples/package-lock.json

+10,299-2,219
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: examples/package.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"scripts": {
66
"start": "node server.js",
77
"postinstall": "./scripts/postinstall.sh",
8-
"dev": "../scripts/run-dev.sh && node server.js"
8+
"watchify": "npx watchify static/browserify-app.js -o static/scripts/browserify-bundle.js --debug --verbose",
9+
"develop": "npm-run-all --parallel watchify start"
910
},
1011
"cacheDirectories": [
1112
"node_modules"
@@ -14,17 +15,18 @@
1415
"defaults": "^1.0.3",
1516
"dotenv": "^8.2.0",
1617
"express": "^4.17.1",
17-
"express-browserify": "^1.0.3",
1818
"express-rate-limit": "^5.1.3",
1919
"express-secure-only": "^0.2.1",
2020
"ibm-watson": "^6.0.2",
2121
"jquery": "^3.5.1",
2222
"object.assign": "^4.0.4",
2323
"vcap_services": "^0.7.1",
24-
"watson-speech": "^0.38.1",
24+
"watchify": "^4.0.0",
25+
"watson-speech": "^0.39.0",
2526
"webpack": "^5.18.0",
2627
"webpack-dev-middleware": "^4.1.0",
27-
"whatwg-fetch": "^3.0.0"
28+
"whatwg-fetch": "^3.0.0",
29+
"npm-run-all": "^4.1.5"
2830
},
2931
"engines": {
3032
"node": ">=12"

Diff for: examples/server.js

+2-7
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
const express = require('express');
2020
const app = express();
2121

22-
const expressBrowserify = require('express-browserify');
2322
const webpackDevMiddleware = require('webpack-dev-middleware');
2423
const webpack = require('webpack');
2524
const webpackConfig = require('./webpack.config');
@@ -52,14 +51,10 @@ const secure = require('express-secure-only');
5251
app.use(secure());
5352
app.use(express.static(__dirname + '/static'));
5453

55-
// set up express-browserify to serve browserify bundles for examples
56-
const isDev = app.get('env') === 'development';
54+
// use watchify to build browserify bundle and serve it
5755
app.get(
5856
'/browserify-bundle.js',
59-
expressBrowserify('static/browserify-app.js', {
60-
watch: isDev,
61-
debug: isDev
62-
})
57+
express.static(__dirname + '/static/scripts/browserify-bundle.js')
6358
);
6459

6560
// set up webpack-dev-middleware to serve Webpack bundles for examples

0 commit comments

Comments
 (0)