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.

Sign up for GitHub

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

Jump to bottom

Fix vulnerabilities and remove npm shrinkwrap #497

Merged
merged 4 commits into from
Jun 2, 2017
Merged

Fix vulnerabilities and remove npm shrinkwrap #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c09cbda
Removed npm shrinkwrap and upgraded oc-template-jade
matteofigus Jun 1, 2017
e5bf41f
Jade to pug for internal UI
matteofigus Jun 1, 2017
ee3ceba
Update webpack
matteofigus Jun 1, 2017
4062356
Merge branch 'master' of github.com:opentable/oc into shrinkwrap
matteofigus Jun 1, 2017
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
2 changes: 1 addition & 1 deletion client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"minimal-request": "2.2.0",
"nice-cache": "0.0.5",
"oc-template-handlebars": "4.0.1",
"oc-template-jade": "4.0.1",
"oc-template-jade": "4.0.2",
"stringformat": "0.0.5"
},
"engines": {
Expand Down
9,918 changes: 0 additions & 9,918 deletions npm-shrinkwrap.json
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@
"form-data": "0.1.4",
"fs-extra": "0.30.0",
"infinite-loop-loader": "1.0.1",
"jade": "1.11.0",
"jstransformer-clean-css": "^2.0.0",
"jstransformer-uglify-js": "^1.2.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I don't know much about those libraries, where/how do those helpers being registered/used? (I guess you using the clean-css here, but couldn't find other references to those in the PR)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jade has bultin transformers for uglify-js and clean-css. With Pug, they modularised all the tranformers and you need to install all the transformers you want to use separately. That's why I had to include them. Also, 'uglify-css' has been renamed to 'clean-css'.

"lodash": "^4.17.4",
"memory-fs": "0.4.1",
"minimal-request": "2.2.0",
Expand All @@ -78,9 +79,10 @@
"node-dir": "0.1.14",
"npm": "3.10.8",
"oc-template-handlebars": "4.0.1",
"oc-template-jade": "4.0.1",
"oc-template-jade": "4.0.2",
"opn": "4.0.2",
"parse-author": "1.0.0",
"pug": "^2.0.0-rc.1",
"read": "1.0.7",
"require-package-name": "2.0.1",
"response-time": "^2.3.2",
Expand All @@ -91,7 +93,7 @@
"try-require": "^1.2.1",
"uglify-js": "2.6.4",
"watch": "0.19.1",
"webpack": "2.2.0",
"webpack": "2.6.1",
"yargs": "^6.6.0"
}
}
2 changes: 1 addition & 1 deletion src/registry/middleware/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module.exports.bind = function(app, options){
app.use(discoveryHandler);

app.set('views', path.join(__dirname, '../views'));
app.set('view engine', 'jade');
app.set('view engine', 'pug');
app.set('view cache', true);

if(options.verbosity){
Expand Down
2 changes: 1 addition & 1 deletion src/registry/views/component-info.jade → src/registry/views/component-info.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ block content
#plugins.table
.row.header
.t-25 Parameters
.t.75
.t-75
each p, pName in component.oc.parameters
.row
.t-25
Expand Down
0 src/registry/views/component-preview.jade → src/registry/views/component-preview.pug
View file
Open in desktop
File renamed without changes.
0 src/registry/views/components-history.jade → src/registry/views/components-history.pug
View file
Open in desktop
File renamed without changes.
0 src/registry/views/components-list.jade → src/registry/views/components-list.pug
View file
Open in desktop
File renamed without changes.
0 src/registry/views/index.jade → src/registry/views/index.pug
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/registry/views/layout.jade → src/registry/views/layout.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ html
meta(name="language", content="EN")
meta(name="distribution", content="global")
style
include:uglify-css static/style.css
include:clean-css static/style.css
block head

body
Expand Down