Merge pull request #497 from opentable/shrinkwrap

Fix vulnerabilities and remove npm shrinkwrap
opencomponents · Jun 2, 2017 · 7f44bae · 7f44bae
2 parents c959041 + 4062356
commit 7f44bae
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 9,925 deletions.
diff --git a/client/package.json b/client/package.json
@@ -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": {

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -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",
     "lodash": "^4.17.4",
     "memory-fs": "0.4.1",
     "minimal-request": "2.2.0",
@@ -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",
@@ -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"
   }
 }
diff --git a/src/registry/middleware/index.js b/src/registry/middleware/index.js
@@ -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){

diff --git a/src/registry/views/component-info.jade → src/registry/views/component-info.pug b/src/registry/views/component-info.jade → src/registry/views/component-info.pug
@@ -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

diff --git a/src/registry/views/component-preview.jade → src/registry/views/component-preview.pug b/src/registry/views/component-preview.jade → src/registry/views/component-preview.pug
diff --git a/src/registry/views/components-history.jade → src/registry/views/components-history.pug b/src/registry/views/components-history.jade → src/registry/views/components-history.pug
diff --git a/src/registry/views/components-list.jade → src/registry/views/components-list.pug b/src/registry/views/components-list.jade → src/registry/views/components-list.pug
diff --git a/src/registry/views/index.jade → src/registry/views/index.pug b/src/registry/views/index.jade → src/registry/views/index.pug
diff --git a/src/registry/views/layout.jade → src/registry/views/layout.pug b/src/registry/views/layout.jade → src/registry/views/layout.pug
@@ -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