From 67bc170889bdbfa2f2bbaf3eaef92cee63a65e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Mon, 30 Nov 2015 07:58:47 +0100 Subject: [PATCH 1/4] Use hashbang before comment in node env --- frontend/scripts/clean-shrinkwrap.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/scripts/clean-shrinkwrap.js b/frontend/scripts/clean-shrinkwrap.js index f3361682fc..bc28cd7da4 100755 --- a/frontend/scripts/clean-shrinkwrap.js +++ b/frontend/scripts/clean-shrinkwrap.js @@ -1,3 +1,5 @@ +#!/usr/bin/env node + //-- copyright // OpenProject is a project management system. // Copyright (C) 2012-2015 the OpenProject Foundation (OPF) @@ -26,8 +28,6 @@ // See doc/COPYRIGHT.rdoc for more details. //++ -#!/usr/bin/env node - /** * this script is just a temporary solution to deal with the issue of npm outputting the npm * shrinkwrap file in an unstable manner. From ec3a27648b923f21365aa395a029158e864274df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Mon, 30 Nov 2015 08:00:41 +0100 Subject: [PATCH 2/4] Fix lodash to shrinkwrapped version --- frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/package.json b/frontend/package.json index 8cf91d4c3f..1ea06cdec5 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -55,7 +55,7 @@ "glob": "^4.5.3", "html-loader": "^0.2.3", "json-loader": "^0.5.1", - "lodash": "^2.4.2", + "lodash": "2.4.1", "ngtemplate-loader": "^0.1.2", "polyfill-function-prototype-bind": "0.0.1", "shelljs": "^0.3.0", From bd187c7525c190877a8ed42cb8fec26f4eabacdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Mon, 30 Nov 2015 08:04:23 +0100 Subject: [PATCH 3/4] Add ng-annotate Also removes fsevents@0.3.6, this is relevant for OSX events only and should not be contained. Use `npm i -g fsevents` to install the mac wrapper. --- frontend/npm-shrinkwrap.json | 83 ++++++++++++++++++++++++++++++++---- frontend/package.json | 1 + frontend/webpack.config.js | 3 +- 3 files changed, 78 insertions(+), 9 deletions(-) diff --git a/frontend/npm-shrinkwrap.json b/frontend/npm-shrinkwrap.json index 8da7caf53e..63163869dd 100644 --- a/frontend/npm-shrinkwrap.json +++ b/frontend/npm-shrinkwrap.json @@ -1221,6 +1221,81 @@ "lodash": { "version": "2.4.1" }, + "ng-annotate-loader": { + "version": "0.0.10", + "dependencies": { + "ng-annotate": { + "version": "1.0.2", + "dependencies": { + "acorn": { + "version": "2.1.0" + }, + "alter": { + "version": "0.2.0" + }, + "convert-source-map": { + "version": "1.0.0" + }, + "optimist": { + "version": "0.6.1", + "dependencies": { + "wordwrap": { + "version": "0.0.3" + }, + "minimist": { + "version": "0.0.10" + } + } + }, + "ordered-ast-traverse": { + "version": "1.1.1", + "dependencies": { + "ordered-esprima-props": { + "version": "1.1.0" + } + } + }, + "simple-fmt": { + "version": "0.1.0" + }, + "simple-is": { + "version": "0.2.0" + }, + "stable": { + "version": "0.1.5" + }, + "stringmap": { + "version": "0.2.2" + }, + "stringset": { + "version": "0.2.1" + }, + "tryor": { + "version": "0.1.2" + } + } + }, + "source-map": { + "version": "0.4.2", + "dependencies": { + "amdefine": { + "version": "1.0.0" + } + } + }, + "loader-utils": { + "version": "0.2.12", + "dependencies": { + "big.js": { + "version": "3.1.3" + }, + "json5": { + "version": "0.4.0" + } + } + } + } + }, "ngtemplate-loader": { "version": "0.1.3", "dependencies": { @@ -1683,14 +1758,6 @@ } } } - }, - "fsevents": { - "version": "0.3.6", - "dependencies": { - "nan": { - "version": "1.8.4" - } - } } } }, diff --git a/frontend/package.json b/frontend/package.json index 1ea06cdec5..54b39b976b 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -56,6 +56,7 @@ "html-loader": "^0.2.3", "json-loader": "^0.5.1", "lodash": "2.4.1", + "ng-annotate-loader": "0.0.10", "ngtemplate-loader": "^0.1.2", "polyfill-function-prototype-bind": "0.0.1", "shelljs": "^0.3.0", diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js index 953dfb0c9f..6816f8ff53 100644 --- a/frontend/webpack.config.js +++ b/frontend/webpack.config.js @@ -66,7 +66,8 @@ var loaders = [ { test: /\.png$/, loader: 'url-loader?limit=100000&mimetype=image/png' }, { test: /\.gif$/, loader: 'file-loader' }, { test: /\.jpg$/, loader: 'file-loader' }, - { test: /js-[\w|-]{2,5}\.yml$/, loader: 'json!yaml' } + { test: /js-[\w|-]{2,5}\.yml$/, loader: 'json!yaml' }, + { test: /[\/].*\.js$/, loader: 'ng-annotate?map=true' } ]; for (var k in pathConfig.pluginNamesPaths) { From 9aa344250c97b8f04ae182d7cb708d7cf9e0b5b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Mon, 30 Nov 2015 08:10:10 +0100 Subject: [PATCH 4/4] Bump version to lodash 2.4.2 --- frontend/npm-shrinkwrap.json | 2 +- frontend/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/npm-shrinkwrap.json b/frontend/npm-shrinkwrap.json index 63163869dd..635eb60412 100644 --- a/frontend/npm-shrinkwrap.json +++ b/frontend/npm-shrinkwrap.json @@ -1219,7 +1219,7 @@ "version": "0.5.1" }, "lodash": { - "version": "2.4.1" + "version": "2.4.2" }, "ng-annotate-loader": { "version": "0.0.10", diff --git a/frontend/package.json b/frontend/package.json index 54b39b976b..223a14b434 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -55,7 +55,7 @@ "glob": "^4.5.3", "html-loader": "^0.2.3", "json-loader": "^0.5.1", - "lodash": "2.4.1", + "lodash": "^2.4.2", "ng-annotate-loader": "0.0.10", "ngtemplate-loader": "^0.1.2", "polyfill-function-prototype-bind": "0.0.1",