Merge pull request #703 from Gaurav0/update_blueprints

Update blueprints

Author: Gaurav0

.eslintrc.js

@@ -1,8 +1,12 @@
 module.exports = {
   root: true,
+  parser: 'babel-eslint',
   parserOptions: {
     ecmaVersion: 2018,
-    sourceType: 'module'
+    sourceType: 'module',
+    ecmaFeatures: {
+      legacyDecorators: true
+    }
   },
   plugins: [
     'ember'

blueprints/application_controller.js

@@ -1,5 +1,5 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
-  appName: 'Ember Twiddle'
-});
+export default class ApplicationController extends Controller {
+  appName = 'Ember Twiddle';
+}

blueprints/application_template.hbs

@@ -1,4 +1,4 @@
-<h1>Welcome to {{appName}}</h1>
+<h1>Welcome to {{this.appName}}</h1>
 <br>
 <br>
 {{outlet}}

blueprints/model.js

@@ -4,5 +4,5 @@ import attr from 'ember-data/attr';
 import { belongsTo, hasMany } from 'ember-data/relationships';
 */
 
-export default Model.extend({
-});
+export default class extends Model {
+}

lib/get-ember-cli-blueprints.js

@@ -5,7 +5,6 @@
 // own blueprints
 function getEmberCLIBlueprints() {
   const fs = require('fs');
-  const path = require('path');
   let fileMap = {};
 
   let blueprintFiles = {
@@ -23,19 +22,14 @@ function getEmberCLIBlueprints() {
         'route-test': 'route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js',
         'service-test': 'service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js',
         'component-test': 'component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js',
-        'acceptance-test': 'acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js'
-      }
-    },
-    "legacyBlueprintFiles": {
-      "path": path.dirname(require.resolve('ember-cli-legacy-blueprints')),
-      "files": {
+        'acceptance-test': 'acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js',
         'component-hbs': 'component/files/__root__/__templatepath__/__templatename__.hbs',
         'component-js': 'component/files/__root__/__path__/__name__.js',
         'controller': 'controller/files/__root__/__path__/__name__.js',
         'route': 'route/files/__root__/__path__/__name__.js',
         'service': 'service/files/__root__/__path__/__name__.js',
         'template': 'template/files/__root__/__path__/__name__.hbs',
-        'helper': 'helper/files/__root__/helpers/__name__.js'
+        'helper': 'helper/files/__root__/__collection__/__name__.js'
       }
     }
   }

package.json

@@ -25,6 +25,7 @@
     "@ember/test-helpers": "^1.7.1",
     "@rollup/plugin-commonjs": "^11.0.2",
     "@rollup/plugin-json": "^4.0.2",
+    "babel-eslint": "^10.0.3",
     "babel-plugin-debug-macros": "^0.3.3",
     "babel-plugin-ember-modules-api-polyfill": "^2.12.0",
     "broccoli-asset-rev": "^3.0.0",

tests/unit/services/ember-cli-test.js

@@ -74,7 +74,7 @@ module('Unit | Service | ember cli', function(hooks) {
   });
 
   test("buildProperties() works as expected with replacements", function (assert) {
-    assert.expect(5);
+    assert.expect(4);
 
     var service = this.owner.lookup('service:ember-cli');
     var props = service.buildProperties('helper', {
@@ -85,7 +85,6 @@ module('Unit | Service | ember cli', function(hooks) {
     assert.ok(props.content, 'has content');
     assert.ok(props.content.indexOf('<%=') === -1, 'No replacement tags in content');
     assert.ok(props.content.indexOf('myHelper(params') !== -1, 'Replacements worked');
-    assert.ok(props.content.indexOf('helper(myHelper)') !== -1, 'Replacements worked if multiple');
   });
 
   test('compileHbs includes moduleName', function(assert) {

yarn.lock

@@ -255,7 +255,7 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.3.4", "@babel/parser@^7.8.6":
+"@babel/parser@^7.3.4", "@babel/parser@^7.7.0", "@babel/parser@^7.8.6":
   version "7.8.6"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.6.tgz#ba5c9910cddb77685a008e3c587af8d27b67962c"
   integrity sha512-trGNYSfwq5s0SgM1BMEB8hX3NDmO7EP2wsDGDexiaKMB92BaRpS+qZfpkMqUBhcsOTBwNy9B/jieo4ad/t/z2g==
@@ -784,7 +784,7 @@
     "@babel/parser" "^7.8.6"
     "@babel/types" "^7.8.6"
 
-"@babel/traverse@^7.1.6", "@babel/traverse@^7.2.4", "@babel/traverse@^7.3.4", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4", "@babel/traverse@^7.8.6":
+"@babel/traverse@^7.1.6", "@babel/traverse@^7.2.4", "@babel/traverse@^7.3.4", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4", "@babel/traverse@^7.8.6":
   version "7.8.6"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.6.tgz#acfe0c64e1cd991b3e32eae813a6eb564954b5ff"
   integrity sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==
@@ -799,7 +799,7 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.1.6", "@babel/types@^7.3.2", "@babel/types@^7.3.4", "@babel/types@^7.4.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6":
+"@babel/types@^7.1.6", "@babel/types@^7.3.2", "@babel/types@^7.3.4", "@babel/types@^7.4.0", "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6":
   version "7.8.6"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.6.tgz#629ecc33c2557fcde7126e58053127afdb3e6d01"
   integrity sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==
@@ -1924,6 +1924,18 @@ babel-core@^6.24.1, babel-core@^6.26.0, babel-core@^6.26.3:
     slash "^1.0.0"
     source-map "^0.5.7"
 
+babel-eslint@^10.0.3:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
+  integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.7.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
+    eslint-visitor-keys "^1.0.0"
+    resolve "^1.12.0"
+
 babel-generator@^6.26.0:
   version "6.26.1"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"