Merge pull request #925 from loganrosen/ember-3.25

Update to ember-cli 3.25 blueprint

.eslintignore

@@ -13,6 +13,7 @@
 # misc
 /coverage/
 !.*
+.eslintcache
 
 # ember-try
 /.node_modules.ember-try/

.eslintrc.js

@@ -7,47 +7,47 @@ module.exports = {
     ecmaVersion: 2018,
     sourceType: 'module',
     ecmaFeatures: {
-      legacyDecorators: true
-    }
+      legacyDecorators: true,
+    },
   },
-  plugins: [
-    'ember'
-  ],
+  plugins: ['ember'],
   extends: [
     'eslint:recommended',
-    'plugin:ember/recommended'
+    'plugin:ember/recommended',
+    'plugin:prettier/recommended',
   ],
   env: {
-    browser: true
+    browser: true,
   },
   rules: {},
   overrides: [
     // node files
     {
       files: [
         '.eslintrc.js',
+        '.prettierrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
         'testem.js',
         'blueprints/*/index.js',
         'config/**/*.js',
         'lib/*/index.js',
-        'server/**/*.js'
+        'server/**/*.js',
       ],
       parserOptions: {
-        sourceType: 'script'
+        sourceType: 'script',
       },
       env: {
         browser: false,
-        node: true
+        node: true,
       },
       plugins: ['node'],
       extends: ['plugin:node/recommended'],
       rules: {
         // this can be removed once the following is fixed
         // https://github.com/mysticatea/eslint-plugin-node/issues/77
-        'node/no-unpublished-require': 'off'
-      }
-    }
-  ]
+        'node/no-unpublished-require': 'off',
+      },
+    },
+  ],
 };

.gitignore

@@ -12,6 +12,7 @@
 /.env*
 /.pnp*
 /.sass-cache
+/.eslintcache
 /connect.lock
 /coverage/
 /libpeerconnection.log

.prettierignore

@@ -0,0 +1,21 @@
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+/node_modules/
+
+# misc
+/coverage/
+!.*
+.eslintcache
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

.prettierrc.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  singleQuote: true,
+};

.template-lintrc.js

@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  extends: 'octane'
+  extends: 'octane',
 };

app/router.js

@@ -6,5 +6,4 @@ export default class Router extends EmberRouter {
   rootURL = config.rootURL;
 }
 
-Router.map(function() {
-});
+Router.map(function () {});

app/routes/application.js

@@ -1,7 +1,6 @@
 import EmpressApplicationRoute from 'empress-blog/routes/application';
 import { inject as service } from '@ember/service';
 
-
 export default class ApplicationRoute extends EmpressApplicationRoute {
   @service metrics;
   @service router;

app/routes/page.js

@@ -4,6 +4,8 @@ export default class PageRoute extends Route {
   templateName = 'index';
 
   model(params) {
-    return this.store.query('content', {page: `/content/content-${params.id}.json`});
+    return this.store.query('content', {
+      page: `/content/content-${params.id}.json`,
+    });
   }
 }

config/ember-cli-update.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.21.2",
+      "version": "3.25.2",
       "blueprints": [
         {
           "name": "app",

config/environment.js

@@ -1,6 +1,6 @@
 'use strict';
 
-module.exports = function(environment) {
+module.exports = function (environment) {
   let ENV = {
     modulePrefix: 'ember-blog',
     environment,
@@ -14,8 +14,8 @@ module.exports = function(environment) {
       },
       EXTEND_PROTOTYPES: {
         // Prevent Ember Data from overriding Date.parse.
-        Date: false
-      }
+        Date: false,
+      },
     },
 
     APP: {
@@ -27,8 +27,8 @@ module.exports = function(environment) {
       title: 'Ember.js Blog',
       description: 'Official Blog for the Ember.js Open Source Project',
       paginate: true,
-      logo: "/images/logos/e-icon.png",
-      twitter: "emberjs",
+      logo: '/images/logos/e-icon.png',
+      twitter: 'emberjs',
     },
 
     metricsAdapters: [
@@ -37,8 +37,8 @@ module.exports = function(environment) {
         environments: ['production'],
         config: {
           id: 'UA-27675533-1',
-          require: ['linkid']
-        }
+          require: ['linkid'],
+        },
       },
     ],
   };

config/targets.js

@@ -3,7 +3,7 @@
 const browsers = [
   'last 1 Chrome versions',
   'last 1 Firefox versions',
-  'last 1 Safari versions'
+  'last 1 Safari versions',
 ];
 
 const isCI = Boolean(process.env.CI);
@@ -15,5 +15,5 @@ if (isCI || isProduction) {
 
 module.exports = {
   browsers,
-  node: 'current'
+  node: 'current',
 };