Skip to content

Commit 5d41a67

Browse files
committed
Bump ejs and fix postinstall to handle new module type
1 parent ac84526 commit 5d41a67

4 files changed

Lines changed: 137 additions & 97 deletions

File tree

package-lock.json

Lines changed: 128 additions & 92 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"aws-sdk": "^2.1443.0",
5252
"azure-ad-verify-token-commonjs": "^2.0.2",
5353
"bcryptjs": "^3",
54-
"body-parser": "^1.20.2",
54+
"body-parser": "^2",
5555
"browserify": "^17.0.0",
5656
"buffer-equal-constant-time": "^1.0.1",
5757
"chance": "^1.1.11",
@@ -62,7 +62,7 @@
6262
"cookie-parser": "^1.4.6",
6363
"cors": "^2.8.5",
6464
"debug": "^4.3.4",
65-
"ejs": "^3.1.9",
65+
"ejs": "^5",
6666
"express": "^4.18.2",
6767
"import-fresh": "^3.3.0",
6868
"jsdoc": "^4.0.2",

src/common/lib/COMMON_LIBS.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{"name": "chance"},
33
{"name": "debug"},
4-
{"name": "ejs"},
4+
{"name": "ejs", "requirePath": "ejs/lib/cjs/ejs.js"},
55
{"name": "q"},
66
{"name": "superagent"},
77
{"name": "webgme-ot"}

utils/postinstall.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ var path = require('path'),
2020
COMMON_LIBS = require(path.join(LIB_ROOT_DIR, 'COMMON_LIBS.json'));
2121

2222
function browserifyModule(info) {
23-
var b = browserify({
23+
var requireTarget = info.requirePath || info.name,
24+
requireOptions = {
25+
expose: info.name
26+
},
27+
b = browserify({
2428
standalone: info.name
2529
}),
2630
result = {
@@ -29,7 +33,7 @@ function browserifyModule(info) {
2933
};
3034

3135
console.log('Browserifying ' + info.name + ' into ' + LIB_ROOT_DIR + '');
32-
b.require(info.name);
36+
b.require(requireTarget, requireOptions);
3337

3438
return ensureDir(result.outDir)
3539
.then(function () {

0 commit comments

Comments
 (0)