Merge pull request #99 from kiwiupover/update-ember-and-deps

mansona · web-flow · commit 3efdaf225655 · 2019-04-20T21:05:50.000+01:00
Update ember and deps
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,20 @@
+# 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/.eslintrc.js b/.eslintrc.js
@@ -21,10 +21,14 @@ module.exports = {
     {
       files: [
         'fastboot-server.js',
-        'testem.js',
+        '.eslintrc.js',
+        '.template-lintrc.js',
         'ember-cli-build.js',
+        'testem.js',
+        'blueprints/*/index.js',
         'config/**/*.js',
-        'lib/*/index.js'
+        'lib/*/index.js',
+        'server/**/*.js'
       ],
       parserOptions: {
         sourceType: 'script',
@@ -34,15 +38,6 @@ module.exports = {
         browser: false,
         node: true
       }
-    },
-
-    // test files
-    {
-      files: ['tests/**/*.js'],
-      excludedFiles: ['tests/dummy/**/*.js'],
-      env: {
-        embertest: true
-      }
     }
   ]
 };
diff --git a/.gitignore b/.gitignore
@@ -6,19 +6,21 @@
 /tmp
 
 # dependencies
-/node_modules
-/bower_components
+/bower_components/
+/node_modules/
 
 # misc
+/.env*
+/.pnp*
 /.sass-cache
 /connect.lock
-/coverage/*
+/coverage/
 /libpeerconnection.log
-npm-debug.log*
-yarn-error.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
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try
diff --git a/.template-lintrc.js b/.template-lintrc.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  extends: 'recommended'
+};
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-- '6'
+- '10'
 sudo: false
 dist: trusty
 
@@ -10,28 +10,17 @@ addons:
 cache:
   yarn: true
   directories:
-    - $HOME/.cache
+    - $HOME/.npm
 
 env:
   global:
     # See https://git.io/vdao3 for details.
     - JOBS=1
 
-before_install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash
-  - export PATH=$HOME/.yarn/bin:$PATH
 
 install:
-  - yarn
+  - npm install
 
 script:
-  - yarn run lint:js
-  - yarn test
-
-deploy:
-  provider: heroku
-  api_key:
-    secure: iduQwr4SumssmTXAsg2DSgwpmrL7PTf01uk0cqETBG1y2puGswAiWyNSHiswHWFhpvFhCQDkcG+S4L2Geq7luOFhBXcUWpDO6ZuN2mj+MnpFfGbQMNbXF9OwZrkyzPgi3R4cQbm7wrvvGQYBhCC0JMdgl3w+GjfofgxOYNaWtBVlLkXaFz5EylD9pr3OYjIYPt7rT/8E3R2TBqrDxhESXYm+SKSUti8QX4AugsDA9vAr562kjzze0LYMmnyUVSeoBUtj4wBoEY9/z+3tAS6SpUxpivJKEuJXK4b+iZT0hPokAp5SJXH6hsZDK3QrjAvAZcaNgcwLnV7HyLtpYZjZ39O75FNoRcXDjP/pEkiKwx5X+KLEYjH/+vM9JIYJaiRpjeETIb3KjJBKYejT++d0NQP1gdOxgtRvZIMYAGc5TAjiKUFH0MjEXjGo0pfT2lv9/eif5yFbf11wO8i7YzUQaTvBCRy8PKG7ah1kDOlfMGf3H8Vy6QHD5fEgVbcgaGh/0t51iTSVt7JaB8SEBdKRx3fhNoSQAsyzAaNA8Hx+CgIXE0Spt2qhV5VQc2hgAYEwUeNj3zfCo1zRUkRzpYOLH8Vrl0ViB136Kjox+AdFMbRpAp89ePBZnces/xDkANTf3RfUNHV5rQjn57fpLwI/fcV7Rclo7k0cmMWoZE2BhOk=
-  app: fastboot-website
-  on:
-    repo: ember-fastboot/fastboot-website
+  - npm run lint:js
+  - npm test
diff --git a/README.md b/README.md
@@ -20,7 +20,13 @@ To run the website locally:
 
 ### Running Tests
 
-- `ember test`
+* `ember test`
+* `ember test --server`
+
+### Building
+
+* `ember build` (development)
+* `ember build --environment production` (production)
 
 ### Deploying
 
diff --git a/app.json b/app.json
@@ -25,6 +25,9 @@
     },
     "WORKER_COUNT": {
       "required": true
+    },
+    "EXPERIMENTAL_RENDER_MODE_SERIALIZE": {
+      "required": true
     }
   },
   "formation": {
diff --git a/app/components/main-hero/template.hbs b/app/components/main-hero/template.hbs
@@ -18,11 +18,11 @@
   </div>
 
   <div class="main-hero-actions">
-    {{#link-to 'page' 'quickstart' class='main-hero-button'}}
+    {{#link-to "page" "quickstart" class="main-hero-button"}}
       Quickstart
     {{/link-to}}
 
-    {{#link-to 'page' 'docs/user-guide' class='main-hero-button'}}
+    {{#link-to "page" "docs/user-guide" class="main-hero-button"}}
       User Guide
     {{/link-to}}
   </div>
diff --git a/app/components/nav-bar.js b/app/components/nav-bar.js
@@ -6,6 +6,8 @@ export default Component.extend({
   classNameBindings: 'isOffTop',
 
   didInsertElement() {
+    this._super(...arguments);
+    
     let $window = $(window);
 
     $window.on('scroll', () => {
diff --git a/app/index.html b/app/index.html
@@ -10,7 +10,7 @@
     {{content-for "head"}}
 
     <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/my-app.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/fastboot-website.css">
 
     {{content-for "head-footer"}}
   </head>
diff --git a/app/router.js b/app/router.js
@@ -8,6 +8,7 @@ const Router = EmberRouter.extend({
   location: config.locationType,
   rootURL: config.rootURL,
   metrics: injectService(),
+  fastboot: injectService(),
 
   didTransition() {
     this._super(...arguments);
@@ -18,6 +19,10 @@ const Router = EmberRouter.extend({
   },
 
   _scrollPage() {
+    if (this.fastboot.isFastBoot) {
+      return;
+    }
+
     run.scheduleOnce('afterRender', this, () => {
       let position = 0;
       let hash = window.location.hash;
@@ -33,11 +38,15 @@ const Router = EmberRouter.extend({
   },
 
   _trackPage() {
+    if (this.fastboot.isFastBoot) {
+      return;
+    }
+    
     run.scheduleOnce('afterRender', this, () => {
       let page = document.location.pathname;
       let title = this.getWithDefault('currentRouteName', 'unknown');
 
-      get(this, 'metrics').trackPage({ page, title });
+      this.metrics.trackPage({ page, title });
     });
   }
 });
diff --git a/app/templates/components/main-nav.hbs b/app/templates/components/main-nav.hbs
@@ -1,8 +1,8 @@
 {{fastboot-logo}}
 <ul class="list-reset">
-  <li class="inline-block mr1">{{link-to 'Intro' 'index'}}</li>
-  <li class="inline-block mr1">{{link-to 'Quickstart' 'page' 'quickstart'}}</li>
-  <li class="inline-block mr1">{{link-to 'User Guide' 'page' 'docs/user-guide'}}</li>
-  <li class="inline-block mr1">{{link-to 'Deploying' 'page' 'docs/deploying'}}</li>
-  <li class="inline-block mr1">{{link-to 'Addon Author Guide' 'page' 'docs/addon-author-guide'}}</li>
+  <li class="inline-block mr1">{{link-to "Intro" "index"}}</li>
+  <li class="inline-block mr1">{{link-to "Quickstart" "page" "quickstart"}}</li>
+  <li class="inline-block mr1">{{link-to "User Guide" "page" "docs/user-guide"}}</li>
+  <li class="inline-block mr1">{{link-to "Deploying" "page" "docs/deploying"}}</li>
+  <li class="inline-block mr1">{{link-to "Addon Author Guide" "page" "docs/addon-author-guide"}}</li>
 </ul>
diff --git a/app/templates/components/nav-bar.hbs b/app/templates/components/nav-bar.hbs
@@ -1,4 +1,3 @@
-{{#link-to 'index'}}
+{{#link-to "index"}}
   <h1>FastBoot</h1>
 {{/link-to}}
-
diff --git a/app/templates/components/route-error.hbs b/app/templates/components/route-error.hbs
@@ -2,6 +2,6 @@
 <h2>Try one of these:</h2>
 <ul>
   {{#each availablePages as |page|}}
-    <li>{{link-to page 'page' page}}</li>
+    <li>{{link-to page "page" page}}</li>
   {{/each}}
 </ul>
diff --git a/app/templates/head.hbs b/app/templates/head.hbs
@@ -1,4 +1,4 @@
-<meta name="twitter:card" content="summary" />
-<meta name="twitter:title" content="Ember FastBoot" />
-<meta name="twitter:description" content="Progressive enhancement for ambitious web apps" />
+<meta name="twitter:card" content="summary">
+<meta name="twitter:title" content="Ember FastBoot">
+<meta name="twitter:description" content="Progressive enhancement for ambitious web apps">
 <meta name="twitter:image" content="/images/site-preview.png">
diff --git a/config/environment.js b/config/environment.js
@@ -19,6 +19,10 @@ module.exports = function(environment) {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
         // e.g. 'with-controller': true
+      },
+      EXTEND_PROTOTYPES: {
+        // Prevent Ember Data from overriding Date.parse.
+        Date: false
       }
     },
 
diff --git a/config/optional-features.json b/config/optional-features.json
@@ -0,0 +1,3 @@
+{
+  "jquery-integration": true
+}
diff --git a/config/targets.js b/config/targets.js
@@ -1,8 +1,18 @@
+'use strict';
+
+const browsers = [
+  'last 1 Chrome versions',
+  'last 1 Firefox versions',
+  'last 1 Safari versions'
+];
+
+const isCI = !!process.env.CI;
+const isProduction = process.env.EMBER_ENV === 'production';
+
+if (isCI || isProduction) {
+  browsers.push('ie 11');
+}
+
 module.exports = {
-  browsers: [
-    'ie 9',
-    'last 1 Chrome versions',
-    'last 1 Firefox versions',
-    'last 1 Safari versions'
-  ]
-};
+  browsers
+};
diff --git a/fastboot-server.js b/fastboot-server.js
@@ -7,8 +7,8 @@ const fastbootMiddleware = require('fastboot-express-middleware');
 const staticGzip = require('express-serve-static-gzip');
 const sabayon = require('express-sabayon');
 
-var assetPath = 'tmp/deploy-dist'
-var port = process.env.PORT || 3000;
+const assetPath = 'tmp/deploy-dist'
+const port = process.env.PORT || 3000;
 
 // eslint-disable-next-line no-console
 console.log('Booting Ember app...');
@@ -31,9 +31,9 @@ try {
 // eslint-disable-next-line no-console
 console.log('Ember app booted successfully.');
 cluster(function() {
-  var app = express();
+  let app = express();
 
-  var fastboot = fastbootMiddleware(assetPath);
+  let fastboot = fastbootMiddleware(assetPath);
 
   if (assetPath) {
     app.get('/', fastboot);
@@ -44,10 +44,10 @@ cluster(function() {
   app.get(sabayon.path, sabayon.middleware());
   app.get('/*', fastboot);
 
-  var listener = app.listen(port, function() {
-    var host = listener.address().address;
-    var port = listener.address().port;
-    var family = listener.address().family;
+  let listener = app.listen(port, function() {
+    let host = listener.address().address;
+    let port = listener.address().port;
+    let family = listener.address().family;
 
     if (family === 'IPv6') { host = '[' + host + ']'; }
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/testem.js b/testem.js
diff --git a/tests/helpers/.gitkeep b/tests/helpers/.gitkeep
diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js
diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
diff --git a/tests/unit/routes/application-test.js b/tests/unit/routes/application-test.js
diff --git a/yarn.lock b/yarn.lock
