(core) support node versions > 5 (spinnaker#2949)

HariPrasath7 · Nov 4, 2016 · ddbe323 · ddbe323
1 parent 4efb458
commit ddbe323
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 16 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:4.4.1
+FROM node:7.0.0
 
 COPY . deck/
 

diff --git a/app/index.html → app/index.deck b/app/index.html → app/index.deck
diff --git a/build.gradle b/build.gradle
@@ -28,8 +28,8 @@ jar {
 
 node {
     // Version of node to use.
-    version = '4.4.1'
-    npmVersion = '2.14.20'
+    version = '7.0.0'
+    npmVersion = '3.10.8'
 
     // Enabled the automatic download. False is the default (for now).
     download = true
@@ -45,7 +45,7 @@ task webpack(type: NodeTask) {
 
 task karma(type: NodeTask) {
   script = file('node_modules/karma/bin/karma')
-  args = ["start", "--single-run", "--reporters", "progress,jenkins"]
+  args = ["start", "--single-run", "--reporters", "progress,mocha"]
   if (project.hasProperty('skipTests')) {
     karma.enabled = false
   }

diff --git a/karma.conf.js b/karma.conf.js
@@ -49,7 +49,6 @@ module.exports = function(config) {
       require('karma-chrome-launcher'),
       require('karma-junit-reporter'),
       require('karma-mocha-reporter'),
-      require('karma-jenkins-reporter'),
       require('karma-coverage'),
     ],
 
@@ -86,12 +85,6 @@ module.exports = function(config) {
       dir : 'coverage/'
     },
 
-    jenkinsReporter: {
-      outputFile: 'test-results.xml',
-      suite: 'com.netflix.spinnaker.deck',
-      classnameSuffix: 'ui-test'
-    },
-
     client: {
       captureConsole: true,
     }

diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "zone.js": "^0.6.23"
   },
   "engines": {
-    "node": ">=4.0.0 <6",
+    "node": ">=4.0.0",
     "npm": ">=2.0.0"
   },
   "scripts": {
@@ -76,15 +76,14 @@
     "file-loader": "^0.8.4",
     "happypack": "^2.2.1",
     "html-loader": "^0.3.0",
-    "html-webpack-plugin": "^1.6.0",
+    "html-webpack-plugin": "^2.24.1",
     "imports-loader": "^0.6.4",
     "istanbul-instrumenter-loader": "^0.1.3",
     "json-loader": "^0.5.2",
-    "karma": "^1.2.0",
+    "karma": "^1.3.0",
     "karma-chrome-launcher": "^2.0.0",
     "karma-coverage": "^1.1.1",
     "karma-jasmine": "^1.0.2",
-    "karma-jenkins-reporter": "0.0.2",
     "karma-junit-reporter": "^1.1.0",
     "karma-mocha-reporter": "^2.1.0",
     "karma-sourcemap-loader": "^0.3.7",

diff --git a/webpack.common.js b/webpack.common.js
@@ -129,7 +129,7 @@ function configure(IS_TEST) {
       new webpack.optimize.CommonsChunkPlugin('init.js'),
       new HtmlWebpackPlugin({
         title: 'Spinnaker',
-        template: './app/index.html',
+        template: './app/index.deck',
         favicon: 'app/favicon.ico',
         inject: true,
       }),