Skip to content

Commit 2e9b3a5

Browse files
committed
fix security vulnerability in lodash.template
1 parent 0970211 commit 2e9b3a5

File tree

3 files changed

+32
-68
lines changed

3 files changed

+32
-68
lines changed

index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const path = require('path');
2020
// broccoli-rollup: rollup dependencies to expected module format
2121
//
2222
const stew = require('broccoli-stew');
23-
const Template = require('broccoli-templater');
23+
const Template = require('@gorner/broccoli-templater');
2424
const MergeTrees = require('broccoli-merge-trees');
2525
const concat = require('broccoli-concat');
2626
const map = stew.map;

package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"broccoli-merge-trees": "^4.2.0",
3838
"broccoli-rollup": "^5.0.0",
3939
"broccoli-stew": "^3.0.0",
40-
"broccoli-templater": "^2.0.1",
40+
"@gorner/broccoli-templater": "^2.0.3",
4141
"calculate-cache-key-for-tree": "^2.0.0",
4242
"caniuse-api": "^3.0.0",
4343
"ember-cli-babel": "^7.26.11",
@@ -48,7 +48,10 @@
4848
"whatwg-fetch": "^3.6.2"
4949
},
5050
"resolutions": {
51-
"@babel/traverse": "^7.25.9"
51+
"@babel/traverse": "^7.25.9",
52+
"json5": "^2.2.3",
53+
"rollup": "^2.79.2",
54+
"sourcemap-validator": "gorner/sourcemap-validator#replace-lodash-template"
5255
},
5356
"devDependencies": {
5457
"@babel/core": "^7.26.0",
@@ -102,7 +105,7 @@
102105
"chai-fs": "^2.0.0",
103106
"concurrently": "^8.0.1",
104107
"ember-auto-import": "^2.9.0",
105-
"ember-cli": "~4.12.1",
108+
"ember-cli": "~4.12.3",
106109
"ember-cli-addon-tests": "^0.11.1",
107110
"ember-cli-dependency-checker": "^3.3.1",
108111
"ember-cli-fastboot": "^4.1.5",

yarn.lock

Lines changed: 25 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,6 +1386,17 @@
13861386
dependencies:
13871387
babel-plugin-debug-macros "^0.3.4"
13881388

1389+
"@gorner/broccoli-templater@^2.0.3":
1390+
version "2.0.3"
1391+
resolved "https://registry.yarnpkg.com/@gorner/broccoli-templater/-/broccoli-templater-2.0.3.tgz#c57f9b847d8cb5c436e934aa923bf0062ba0e05a"
1392+
integrity sha512-YTnGn1lYgUvD5C2JmN2j6nCFzvri79Xzu57rBgSlk9Mb7otME75jgk0N3gPGnwLPxqJqr0Bqt+JdvQ2lfkm2rw==
1393+
dependencies:
1394+
broccoli-plugin "^1.3.1"
1395+
fs-tree-diff "^0.5.9"
1396+
lodash "^4.17.21"
1397+
rimraf "^2.6.2"
1398+
walk-sync "^0.3.3"
1399+
13891400
"@handlebars/parser@~2.0.0":
13901401
version "2.0.0"
13911402
resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5"
@@ -3811,17 +3822,6 @@ broccoli-stew@^3.0.0:
38113822
symlink-or-copy "^1.2.0"
38123823
walk-sync "^1.1.3"
38133824

3814-
broccoli-templater@^2.0.1:
3815-
version "2.0.2"
3816-
resolved "https://registry.yarnpkg.com/broccoli-templater/-/broccoli-templater-2.0.2.tgz#285a892071c0b3ad5ebc275d9e8b3465e2d120d6"
3817-
integrity sha512-71KpNkc7WmbEokTQpGcbGzZjUIY1NSVa3GB++KFKAfx5SZPUozCOsBlSTwxcv8TLoCAqbBnsX5AQPgg6vJ2l9g==
3818-
dependencies:
3819-
broccoli-plugin "^1.3.1"
3820-
fs-tree-diff "^0.5.9"
3821-
lodash.template "^4.4.0"
3822-
rimraf "^2.6.2"
3823-
walk-sync "^0.3.3"
3824-
38253825
broccoli-terser-sourcemap@^4.1.0:
38263826
version "4.1.1"
38273827
resolved "https://registry.yarnpkg.com/broccoli-terser-sourcemap/-/broccoli-terser-sourcemap-4.1.1.tgz#4c26696e07a822e1fc91fb48c5b6d6c70d5ca9b2"
@@ -5491,10 +5491,10 @@ ember-cli-version-checker@^5.1.1, ember-cli-version-checker@^5.1.2:
54915491
semver "^7.3.4"
54925492
silent-error "^1.1.1"
54935493

5494-
ember-cli@~4.12.1:
5495-
version "4.12.2"
5496-
resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-4.12.2.tgz#a9d2dd191093fcf18122732fae8999c9ca873447"
5497-
integrity sha512-990UglceEsB3nd/pTI08wL+hbApICrd6P4BO88486rSf9r3XjZ7LBcD318N8I1AGe5IUDkbccMrOQxoHge6zNg==
5494+
ember-cli@~4.12.3:
5495+
version "4.12.3"
5496+
resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-4.12.3.tgz#a8c3f0e62ed1c595fd2348eca82a3a068c6bf001"
5497+
integrity sha512-Ilap7fVGx0+sF6y5O1id+xVPYlc2cJ8OAG6faEQPyvbaCCUsCZnAEr7EMA+5qg0kNqjawIIHJTgnQesdbaDwtg==
54985498
dependencies:
54995499
"@babel/core" "^7.21.0"
55005500
"@babel/plugin-transform-modules-amd" "^7.20.11"
@@ -5558,7 +5558,7 @@ ember-cli@~4.12.1:
55585558
isbinaryfile "^5.0.0"
55595559
js-yaml "^4.1.0"
55605560
leek "0.0.24"
5561-
lodash.template "^4.5.0"
5561+
lodash "^4.17.21"
55625562
markdown-it "^13.0.1"
55635563
markdown-it-terminal "^0.4.0"
55645564
minimatch "^7.4.1"
@@ -8607,19 +8607,7 @@ json-stringify-safe@~5.0.1:
86078607
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
86088608
integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
86098609

8610-
json5@^0.5.1:
8611-
version "0.5.1"
8612-
resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
8613-
integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
8614-
8615-
json5@^1.0.1:
8616-
version "1.0.1"
8617-
resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
8618-
integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
8619-
dependencies:
8620-
minimist "^1.2.0"
8621-
8622-
json5@^2.1.2, json5@^2.2.3:
8610+
json5@^0.5.1, json5@^1.0.1, json5@^2.1.2, json5@^2.2.3:
86238611
version "2.2.3"
86248612
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
86258613
integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -8904,11 +8892,6 @@ lodash._isiterateecall@^3.0.0:
89048892
resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
89058893
integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
89068894

8907-
lodash._reinterpolate@^3.0.0:
8908-
version "3.0.0"
8909-
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
8910-
integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
8911-
89128895
lodash.assign@^3.2.0:
89138896
version "3.2.0"
89148897
resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"
@@ -8968,11 +8951,6 @@ lodash.flatten@^3.0.2:
89688951
lodash._baseflatten "^3.0.0"
89698952
lodash._isiterateecall "^3.0.0"
89708953

8971-
lodash.foreach@^4.5.0:
8972-
version "4.5.0"
8973-
resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
8974-
integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=
8975-
89768954
lodash.isarguments@^3.0.0:
89778955
version "3.1.0"
89788956
resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
@@ -9017,21 +8995,6 @@ lodash.restparam@^3.0.0:
90178995
resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
90188996
integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
90198997

9020-
lodash.template@^4.4.0, lodash.template@^4.5.0:
9021-
version "4.5.0"
9022-
resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
9023-
integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
9024-
dependencies:
9025-
lodash._reinterpolate "^3.0.0"
9026-
lodash.templatesettings "^4.0.0"
9027-
9028-
lodash.templatesettings@^4.0.0:
9029-
version "4.2.0"
9030-
resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
9031-
integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
9032-
dependencies:
9033-
lodash._reinterpolate "^3.0.0"
9034-
90358998
lodash.truncate@^4.4.2:
90368999
version "4.4.2"
90379000
resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
@@ -11224,10 +11187,10 @@ rollup-pluginutils@^2.8.1:
1122411187
dependencies:
1122511188
estree-walker "^0.6.1"
1122611189

11227-
rollup@^2.50.0:
11228-
version "2.79.1"
11229-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
11230-
integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
11190+
rollup@^2.50.0, rollup@^2.79.2:
11191+
version "2.79.2"
11192+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.2.tgz#f150e4a5db4b121a21a747d762f701e5e9f49090"
11193+
integrity sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==
1123111194
optionalDependencies:
1123211195
fsevents "~2.3.2"
1123311196

@@ -11788,14 +11751,12 @@ sourcemap-codec@^1.4.4:
1178811751
resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
1178911752
integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
1179011753

11791-
sourcemap-validator@^1.1.0:
11792-
version "1.1.1"
11793-
resolved "https://registry.yarnpkg.com/sourcemap-validator/-/sourcemap-validator-1.1.1.tgz#3d7d8a399ccab09c1fedc510d65436e25b1c386b"
11794-
integrity sha512-pq6y03Vs6HUaKo9bE0aLoksAcpeOo9HZd7I8pI6O480W/zxNZ9U32GfzgtPP0Pgc/K1JHna569nAbOk3X8/Qtw==
11754+
sourcemap-validator@^1.1.0, sourcemap-validator@gorner/sourcemap-validator#replace-lodash-template:
11755+
version "2.1.0"
11756+
resolved "https://codeload.github.com/gorner/sourcemap-validator/tar.gz/56c83fafaf214fcdb54981c9684dc9d92e0029be"
1179511757
dependencies:
1179611758
jsesc "~0.3.x"
11797-
lodash.foreach "^4.5.0"
11798-
lodash.template "^4.5.0"
11759+
lodash "^4.17.21"
1179911760
source-map "~0.1.x"
1180011761

1180111762
spawn-args@^0.2.0:

0 commit comments

Comments
 (0)