diff --git a/packages/desktop-gui/package.json b/packages/desktop-gui/package.json index b860d2887d..272959c8c2 100644 --- a/packages/desktop-gui/package.json +++ b/packages/desktop-gui/package.json @@ -62,6 +62,6 @@ "react-dom": "^15.1.0", "react-loader": "^2.4.0", "react-router": "^2.4.1", - "zunder": "3.5.8" + "zunder": "4.1.0" } } diff --git a/packages/desktop-gui/scripts/build-prod.js b/packages/desktop-gui/scripts/build-prod.js index 8208fd6956..1fc82c33a7 100644 --- a/packages/desktop-gui/scripts/build-prod.js +++ b/packages/desktop-gui/scripts/build-prod.js @@ -1,7 +1,7 @@ -var z = require('zunder') -var u = z.undertaker -var copyScripts = require('./copy-scripts') -var setZunderConfig = require('./set-zunder-config') +const z = require('zunder') +const u = z.undertaker +const copyScripts = require('./copy-scripts') +const setZunderConfig = require('./set-zunder-config') setZunderConfig(z) diff --git a/packages/desktop-gui/scripts/copy-scripts.js b/packages/desktop-gui/scripts/copy-scripts.js index 353c1c9cbd..e319109712 100644 --- a/packages/desktop-gui/scripts/copy-scripts.js +++ b/packages/desktop-gui/scripts/copy-scripts.js @@ -1,14 +1,14 @@ -var gulp = require("gulp") -var concat = require('gulp-concat') +const gulp = require('gulp') +const concat = require('gulp-concat') module.exports = function copyScripts (dir) { return function () { return gulp.src([ - "node_modules/jquery/dist/jquery.js", - "node_modules/bootstrap-sass/assets/javascripts/bootstrap/dropdown.js", - "node_modules/bootstrap-sass/assets/javascripts/bootstrap/alert.js", + 'node_modules/jquery/dist/jquery.js', + 'node_modules/bootstrap-sass/assets/javascripts/bootstrap/dropdown.js', + 'node_modules/bootstrap-sass/assets/javascripts/bootstrap/alert.js', ]) .pipe(concat('vendor.js')) .pipe(gulp.dest(dir)) } -} \ No newline at end of file +} diff --git a/packages/desktop-gui/zunderfile.js b/packages/desktop-gui/zunderfile.js index 5e5ea394f0..e7daa9b08a 100644 --- a/packages/desktop-gui/zunderfile.js +++ b/packages/desktop-gui/zunderfile.js @@ -1,8 +1,8 @@ -var zunder = require("zunder") -var copyScripts = require('./scripts/copy-scripts') -var setZunderConfig = require('./scripts/set-zunder-config') +const zunder = require('zunder') +const copyScripts = require('./scripts/copy-scripts') +const setZunderConfig = require('./scripts/set-zunder-config') setZunderConfig(zunder) -zunder.on("before:watch", copyScripts(zunder.config.devDir)) -zunder.on("before:build-dev", copyScripts(zunder.config.devDir)) +zunder.on('before:watch', copyScripts(zunder.config.devDir)) +zunder.on('before:build-dev', copyScripts(zunder.config.devDir)) diff --git a/packages/reporter/package.json b/packages/reporter/package.json index 756682ca44..053ce5b584 100644 --- a/packages/reporter/package.json +++ b/packages/reporter/package.json @@ -56,6 +56,6 @@ "react-test-renderer": "^15.5.4", "sinon": "^1.17.4", "sinon-chai": "^2.8.0", - "zunder": "4.0.4" + "zunder": "4.1.0" } } diff --git a/packages/reporter/scripts/build-dev.js b/packages/reporter/scripts/build-dev.js index 40e87fb2fc..6456328a90 100644 --- a/packages/reporter/scripts/build-dev.js +++ b/packages/reporter/scripts/build-dev.js @@ -1,6 +1,6 @@ -var z = require('zunder') -var u = z.undertaker -var setZunderConfig = require('./set-zunder-config') +const z = require('zunder') +const u = z.undertaker +const setZunderConfig = require('./set-zunder-config') setZunderConfig(z) diff --git a/packages/reporter/scripts/build-prod.js b/packages/reporter/scripts/build-prod.js index 80083e5378..4569786a84 100644 --- a/packages/reporter/scripts/build-prod.js +++ b/packages/reporter/scripts/build-prod.js @@ -1,6 +1,6 @@ -var z = require('zunder') -var u = z.undertaker -var setZunderConfig = require('./set-zunder-config') +const z = require('zunder') +const u = z.undertaker +const setZunderConfig = require('./set-zunder-config') setZunderConfig(z) diff --git a/packages/reporter/scripts/set-zunder-config.js b/packages/reporter/scripts/set-zunder-config.js index dc574a7e71..f86072389e 100644 --- a/packages/reporter/scripts/set-zunder-config.js +++ b/packages/reporter/scripts/set-zunder-config.js @@ -1,5 +1,5 @@ module.exports = function setZunderConfig (zunder) { - var commonScripts = ['@cypress/react-tooltip', 'react', 'react-dom', 'mobx', 'mobx-react', 'lodash'] + const commonScripts = ['@cypress/react-tooltip', 'react', 'react-dom', 'mobx', 'mobx-react', 'lodash'] zunder.setConfig({ cacheBust: false, @@ -7,7 +7,7 @@ module.exports = function setZunderConfig (zunder) { { scriptName: 'common.js', libs: commonScripts.map((file) => ({ file })), - } + }, ], prodDir: 'dist', resolutions: commonScripts, diff --git a/packages/reporter/scripts/test.js b/packages/reporter/scripts/test.js index 0b99216ed5..9fbd6d2ee3 100644 --- a/packages/reporter/scripts/test.js +++ b/packages/reporter/scripts/test.js @@ -1,6 +1,6 @@ -var z = require('zunder') -var u = z.undertaker -var setZunderConfig = require('./set-zunder-config') +const z = require('zunder') +const u = z.undertaker +const setZunderConfig = require('./set-zunder-config') setZunderConfig(z) diff --git a/packages/reporter/scripts/watch.js b/packages/reporter/scripts/watch.js index bd29bfd558..c54f59750a 100644 --- a/packages/reporter/scripts/watch.js +++ b/packages/reporter/scripts/watch.js @@ -1,6 +1,6 @@ -var z = require('zunder') -var u = z.undertaker -var setZunderConfig = require('./set-zunder-config') +const z = require('zunder') +const u = z.undertaker +const setZunderConfig = require('./set-zunder-config') setZunderConfig(z) diff --git a/packages/runner/package.json b/packages/runner/package.json index 5b06c1ed84..8a75681ccd 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -48,6 +48,6 @@ "react-test-renderer": "^15.5.4", "sinon": "^1.17.5", "sinon-chai": "^2.8.0", - "zunder": "^3.5.5" + "zunder": "4.1.0" } } diff --git a/packages/runner/scripts/build-dev.js b/packages/runner/scripts/build-dev.js index 0f98df4b79..eb726d9297 100644 --- a/packages/runner/scripts/build-dev.js +++ b/packages/runner/scripts/build-dev.js @@ -1,6 +1,6 @@ -var z = require('zunder') -var u = z.undertaker -var setZunderConfig = require('./set-zunder-config') +const z = require('zunder') +const u = z.undertaker +const setZunderConfig = require('./set-zunder-config') setZunderConfig(z) diff --git a/packages/runner/scripts/build-prod.js b/packages/runner/scripts/build-prod.js index 49b8dc7166..a611e66e38 100644 --- a/packages/runner/scripts/build-prod.js +++ b/packages/runner/scripts/build-prod.js @@ -1,6 +1,6 @@ -var z = require('zunder') -var u = z.undertaker -var setZunderConfig = require('./set-zunder-config') +const z = require('zunder') +const u = z.undertaker +const setZunderConfig = require('./set-zunder-config') setZunderConfig(z) diff --git a/packages/runner/scripts/test.js b/packages/runner/scripts/test.js index 0b99216ed5..9fbd6d2ee3 100644 --- a/packages/runner/scripts/test.js +++ b/packages/runner/scripts/test.js @@ -1,6 +1,6 @@ -var z = require('zunder') -var u = z.undertaker -var setZunderConfig = require('./set-zunder-config') +const z = require('zunder') +const u = z.undertaker +const setZunderConfig = require('./set-zunder-config') setZunderConfig(z) diff --git a/packages/runner/scripts/watch.js b/packages/runner/scripts/watch.js index 5c0de8261a..48f511af4c 100644 --- a/packages/runner/scripts/watch.js +++ b/packages/runner/scripts/watch.js @@ -1,6 +1,6 @@ -var z = require('zunder') -var u = z.undertaker -var setZunderConfig = require('./set-zunder-config') +const z = require('zunder') +const u = z.undertaker +const setZunderConfig = require('./set-zunder-config') setZunderConfig(z)