From 4b685290906ae05a0476bfb2a3b4a5cdec95b6b8 Mon Sep 17 00:00:00 2001
From: Harvey Kandola <harvey@documize.com>
Date: Sat, 8 Dec 2018 15:35:41 +0000
Subject: [PATCH] [WIP] Upgrade EmberJS to 3.5.x

---
 gui/.eslintignore                 | 21 +++++++++++++++
 gui/.eslintrc.js                  |  2 ++
 gui/.gitignore                    | 22 +++++++++------
 gui/.template-lintrc.js           |  5 ++++
 gui/.travis.yml                   |  5 ++--
 gui/README.md                     |  6 +++++
 gui/config/optional-features.json |  3 ++-
 gui/testem.js                     | 45 ++++++++++++++++---------------
 8 files changed, 76 insertions(+), 33 deletions(-)
 create mode 100644 gui/.template-lintrc.js

diff --git a/gui/.eslintignore b/gui/.eslintignore
index 3415bf1f..442a4053 100644
--- a/gui/.eslintignore
+++ b/gui/.eslintignore
@@ -4,3 +4,24 @@ public/tinymce
 public/codemirror/**
 public/codemirror/
 public/codemirror
+
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+/node_modules/
+
+# misc
+/coverage/
+!.*
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try
diff --git a/gui/.eslintrc.js b/gui/.eslintrc.js
index bf509d78..1b2ccde0 100644
--- a/gui/.eslintrc.js
+++ b/gui/.eslintrc.js
@@ -20,6 +20,8 @@ module.exports = {
     // node files
     {
       files: [
+        '.eslintrc.js',
+        '.template-lintrc.js',
         'testem.js',
         'ember-cli-build.js',
         'config/**/*.js'
diff --git a/gui/.gitignore b/gui/.gitignore
index 34867ca4..74d132cc 100644
--- a/gui/.gitignore
+++ b/gui/.gitignore
@@ -1,18 +1,24 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
-/dist
-/dist-prod
-/tmp
+/dist/
+/dist-prod/
+/tmp/
 
 # dependencies
-/node_modules
-/bower_components
+/bower_components/
+/node_modules/
 
 # misc
 /.sass-cache
 /connect.lock
-/coverage/*
+/coverage/
 /libpeerconnection.log
-npm-debug.log*
-testem.log
+/npm-debug.log*
+/testem.log
+/yarn-error.log
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try
diff --git a/gui/.template-lintrc.js b/gui/.template-lintrc.js
new file mode 100644
index 00000000..b45e96ff
--- /dev/null
+++ b/gui/.template-lintrc.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  extends: 'recommended'
+};
diff --git a/gui/.travis.yml b/gui/.travis.yml
index 68a25a16..4a4995ba 100644
--- a/gui/.travis.yml
+++ b/gui/.travis.yml
@@ -25,5 +25,6 @@ install:
   - yarn install --non-interactive
 
 script:
-  - yarn lint:js
-  - yarn test
+  - npm run lint:hbs
+  - npm run lint:js
+  - npm test
diff --git a/gui/README.md b/gui/README.md
index d4cdaebe..5de84b54 100644
--- a/gui/README.md
+++ b/gui/README.md
@@ -34,6 +34,12 @@ Make use of the many generators for code, try `ember help generate` for more det
 * `ember test`
 * `ember test --server`
 
+### Linting
+
+* `npm run lint:hbs`
+* `npm run lint:js`
+* `npm run lint:js -- --fix`
+
 ### Building
 
 * `ember build` (development)
diff --git a/gui/config/optional-features.json b/gui/config/optional-features.json
index ca5bbd07..19805d62 100644
--- a/gui/config/optional-features.json
+++ b/gui/config/optional-features.json
@@ -1,3 +1,4 @@
 {
-  "application-template-wrapper": false
+  "application-template-wrapper": false,
+  "jquery-integration": true
 }
diff --git a/gui/testem.js b/gui/testem.js
index 703ce379..726d1879 100644
--- a/gui/testem.js
+++ b/gui/testem.js
@@ -1,24 +1,25 @@
 module.exports = {
-	test_page: 'tests/index.html?hidepassed',
-	disable_watching: true,
-	launch_in_ci: [
-		'Chrome'
-	],
-	launch_in_dev: [
-		'Chrome'
-	],
-	browser_args: {
-		Chrome: {
-			mode: 'ci',
-			args: [
-				// --no-sandbox is needed when running Chrome inside a container
-				process.env.TRAVIS ? '--no-sandbox' : null,
-
-				'--disable-gpu',
-				'--headless',
-				'--remote-debugging-port=0',
-				'--window-size=1440,900'
-			].filter(Boolean)
-		}
-	}
+  test_page: 'tests/index.html?hidepassed',
+  disable_watching: true,
+  launch_in_ci: [
+    'Chrome'
+  ],
+  launch_in_dev: [
+    'Chrome'
+  ],
+  browser_args: {
+    Chrome: {
+      ci: [
+        // --no-sandbox is needed when running Chrome inside a container
+        process.env.CI ? '--no-sandbox' : null,
+        '--headless',
+        '--disable-gpu',
+        '--disable-dev-shm-usage',
+        '--disable-software-rasterizer',
+        '--mute-audio',
+        '--remote-debugging-port=0',
+        '--window-size=1440,900'
+      ].filter(Boolean)
+    }
+  }
 };