Update based on latest ember-cli

snewcomer · snewcomer · commit d7b40680342b · 2018-09-22T00:10:18.000-04:00
diff --git a/.eslintignore b/.eslintignore
@@ -1,14 +1,18 @@
 # unconventional js
-/blueprints/*
-/fastboot-tests/fastboot-1.0-test.js
+/blueprints/*/files/
 /vendor/
 
 # compiled output
 /dist/
 /tmp/
 
+# dependencies
+/bower_components/
+
 # misc
 /coverage/
 
 # ember-try
 /.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -20,6 +20,7 @@ module.exports = {
     // node files
     {
       files: [
+        '.template-lintrc.js',
         'ember-cli-build.js',
         'index.js',
         'testem.js',
diff --git a/.npmignore b/.npmignore
@@ -1,22 +1,28 @@
-/bower_components
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+
+# misc
+/.bowerrc
+/.editorconfig
+/.ember-cli
+/.eslintignore
+/.eslintrc.js
+/.gitignore
+/.watchmanconfig
+/.travis.yml
+/bower.json
 /config/ember-try.js
-/dist
-/tests
-/tmp
-**/.gitkeep
-.bowerrc
-.editorconfig
-.ember-cli
-.eslintrc.js
-.gitignore
-.watchmanconfig
-.travis.yml
-bower.json
-ember-cli-build.js
-testem.js
-yarn.lock
+/ember-cli-build.js
+/testem.js
+/tests/
+/yarn.lock
+.gitkeep
 
 # 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,8 @@
+'use strict';
+
+module.exports = {
+  extends: 'recommended',
+  rules: {
+    'no-html-comments': false
+  }
+};
diff --git a/.travis.yml b/.travis.yml
@@ -18,22 +18,38 @@ env:
   global:
     # See https://git.io/vdao3 for details.
     - JOBS=1
-  matrix:
+
+jobs:
+  fail_fast: true
+  allow_failures:
+    - env: EMBER_TRY_SCENARIO=ember-canary
+
+  include:
+    # runs linting and tests with current locked deps
+
+    - stage: "Tests"
+      name: "Tests"
+      install:
+        - yarn install --non-interactive
+      script:
+        - yarn lint:hbs
+        - yarn lint:js
+        - yarn test
+
+    - name: "Floating Dependencies"
+      script:
+        - yarn test
+
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
-    - EMBER_TRY_SCENARIO=ember-lts-2.12
-    - EMBER_TRY_SCENARIO=ember-lts-2.16
-    - EMBER_TRY_SCENARIO=ember-lts-2.18
-    - EMBER_TRY_SCENARIO=ember-release
-    - EMBER_TRY_SCENARIO=ember-canary
-    - EMBER_TRY_SCENARIO=ember-default
-    - EMBER_TRY_SCENARIO=fastboot
-
-matrix:
-  fast_finish: true
-  allow_failures:
+    - stage: "Additional Tests"
+      env: EMBER_TRY_SCENARIO=ember-lts-2.16
+    - env: EMBER_TRY_SCENARIO=ember-lts-2.18
+    - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
+    - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
+    - env: EMBER_TRY_SCENARIO=fastboot
 
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
@@ -43,7 +59,4 @@ install:
   - yarn install --no-lockfile --non-interactive
 
 script:
-  - yarn lint:js
-  # Usually, it's ok to finish the test scenario without reverting
-  #  to the addon's original dependency state, skipping "cleanup".
-  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
+  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -11,26 +11,26 @@ module.exports = function() {
     return {
       useYarn: true,
       scenarios: [
-        {
-          name: 'ember-lts-2.12',
-          npm: {
-            devDependencies: {
-              'ember-source': '~2.12.0'
-            }
-          }
-        },
         {
           name: 'ember-lts-2.16',
+          env: {
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
+          },
           npm: {
             devDependencies: {
+              '@ember/jquery': '^0.5.1',
               'ember-source': '~2.16.0'
             }
           }
         },
         {
           name: 'ember-lts-2.18',
+          env: {
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
+          },
           npm: {
             devDependencies: {
+              '@ember/jquery': '^0.5.1',
               'ember-source': '~2.18.0'
             }
           }
@@ -66,13 +66,24 @@ module.exports = function() {
           }
         },
         {
-          name: 'fastboot',
-          command: 'ember fastboot:test',
+          name: 'ember-default-with-jquery',
+          env: {
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({
+              'jquery-integration': true
+            })
+          },
           npm: {
             devDependencies: {
-              'ember-source': null
+              '@ember/jquery': '^0.5.1'
             }
           }
+        },
+        {
+          name: 'fastboot',
+          command: 'ember fastboot:test',
+          npm: {
+            devDependencies: {}
+          }
         }
       ]
     };
diff --git a/fastboot-tests/fastboot-1.0-test.js b/fastboot-tests/fastboot-1.0-test.js
@@ -4,9 +4,9 @@
 const expect = require('chai').expect;
 const setupTest = require('ember-fastboot-addon-tests').setupTest;
 
-describe('FastBoot 1.0', function() {
+describe('FastBoot 2.0', function() {
   setupTest('fastboot', {
-    emberCliFastbootVersion: '1.0.0-rc.1'
+    emberCliFastbootVersion: '2.0.0'
   });
 
   it('index page', function() {
diff --git a/fastboot-tests/fixtures/fastboot/app/templates/head.hbs b/fastboot-tests/fixtures/fastboot/app/templates/head.hbs
@@ -2,4 +2,4 @@
 <!-- here. The 'model' available in this template can be populated by-->
 <!-- setting values on the 'head-data' service. -->
 
-<meta property="og:title" content={{model.title}} />
+<meta property="og:title" content={{model.title}}>
diff --git a/index.js b/index.js
@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  name: 'ember-cli-head'
+  name: require('./package').name
 };
diff --git a/package.json b/package.json
@@ -7,55 +7,61 @@
     "doc": "doc",
     "test": "tests"
   },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ronco/ember-cli-head.git"
+  },
+  "license": "MIT",
+  "author": "",
   "scripts": {
     "build": "ember build",
+    "lint:hbs": "ember-template-lint .",
     "lint:js": "eslint .",
     "start": "ember serve",
-    "test": "ember try:each"
+    "test": "ember test",
+    "test:all": "ember try:each"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ronco/ember-cli-head.git"
+  "keywords": [
+    "ember-addon",
+    "meta",
+    "seo"
+  ],
+  "dependencies": {
+    "ember-cli-babel": "^6.16.0",
+    "ember-cli-htmlbars": "^3.0.0"
   },
-  "author": "",
-  "license": "MIT",
   "devDependencies": {
+    "@ember/optional-features": "^0.6.3",
     "broccoli-asset-rev": "^2.7.0",
     "chai": "^4.1.2",
+    "ember-ajax": "^3.1.0",
     "ember-cli": "~3.4.3",
-    "ember-cli-app-version": "^3.1.3",
-    "ember-cli-dependency-checker": "^2.1.0",
+    "ember-cli-dependency-checker": "^3.0.0",
     "ember-cli-eslint": "^4.2.3",
-    "ember-cli-fastboot": "^1.1.1",
-    "ember-cli-htmlbars-inline-precompile": "^1.0.2",
-    "ember-cli-inject-live-reload": "^1.7.0",
+    "ember-cli-fastboot": "^2.0.0",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.3",
+    "ember-cli-inject-live-reload": "^1.8.2",
     "ember-cli-qunit": "^4.3.2",
-    "ember-cli-release": "^0.2.9",
-    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-uglify": "^2.0.0",
+    "ember-cli-template-lint": "^1.0.0-beta.1",
+    "ember-cli-uglify": "^2.1.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.0",
     "ember-fastboot-addon-tests": "^0.4.0",
     "ember-load-initializers": "^1.1.0",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-resolver": "^4.5.0",
-    "ember-source": "^3.4.0",
+    "ember-resolver": "^5.0.1",
+    "ember-source": "~3.4.0",
     "ember-source-channel-url": "^1.1.0",
-    "ember-try": "^0.2.23",
+    "ember-try": "^1.0.0",
+    "ember-welcome-page": "^3.2.0",
     "eslint-plugin-ember": "^5.2.0",
     "eslint-plugin-node": "^7.0.1",
-    "loader.js": "^4.6.0"
-  },
-  "keywords": [
-    "ember-addon"
-  ],
-  "dependencies": {
-    "ember-cli-babel": "^6.11.0",
-    "ember-cli-htmlbars": "^2.0.3"
+    "loader.js": "^4.7.0",
+    "qunit-dom": "^0.7.1"
   },
   "engines": {
-    "node": ">= 6"
+    "node": "6.* || 8.* || >= 10.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"
diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html
@@ -9,8 +9,8 @@
 
     {{content-for "head"}}
 
-    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link rel="stylesheet" href="{{rootURL}}assets/dummy.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/dummy.css">
 
     {{content-for "head-footer"}}
   </head>
diff --git a/tests/dummy/app/templates/head.hbs b/tests/dummy/app/templates/head.hbs
@@ -2,4 +2,4 @@
 <!-- here. The 'model' available in this template can be populated by-->
 <!-- setting values on the 'head-data' service. -->
 
-<meta property="og:title" content={{model.title}} />
+<meta property="og:title" content={{model.title}}>
diff --git a/tests/dummy/config/optional-features.json b/tests/dummy/config/optional-features.json
@@ -0,0 +1,3 @@
+{
+  "jquery-integration": false
+}
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ module.exports = {`
`20`	`20`	`// node files`
`21`	`21`	`{`
`22`	`22`	`files: [`
	`23`	`+ '.template-lintrc.js',`
`23`	`24`	`'ember-cli-build.js',`
`24`	`25`	`'index.js',`
`25`	`26`	`'testem.js',`
Original file line number	Diff line number	Diff line change
`@@ -11,26 +11,26 @@ module.exports = function() {`
`11`	`11`	`return {`
`12`	`12`	`useYarn: true,`
`13`	`13`	`scenarios: [`
`14`		`- {`
`15`		`- name: 'ember-lts-2.12',`
`16`		`- npm: {`
`17`		`- devDependencies: {`
`18`		`- 'ember-source': '~2.12.0'`
`19`		`- }`
`20`		`- }`
`21`		`- },`
`22`	`14`	`{`
`23`	`15`	`name: 'ember-lts-2.16',`
	`16`	`+ env: {`
	`17`	`+ EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),`
	`18`	`+ },`
`24`	`19`	`npm: {`
`25`	`20`	`devDependencies: {`
	`21`	`+ '@ember/jquery': '^0.5.1',`
`26`	`22`	`'ember-source': '~2.16.0'`
`27`	`23`	`}`
`28`	`24`	`}`
`29`	`25`	`},`
`30`	`26`	`{`
`31`	`27`	`name: 'ember-lts-2.18',`
	`28`	`+ env: {`
	`29`	`+ EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),`
	`30`	`+ },`
`32`	`31`	`npm: {`
`33`	`32`	`devDependencies: {`
	`33`	`+ '@ember/jquery': '^0.5.1',`
`34`	`34`	`'ember-source': '~2.18.0'`
`35`	`35`	`}`
`36`	`36`	`}`
`@@ -66,13 +66,24 @@ module.exports = function() {`
`66`	`66`	`}`
`67`	`67`	`},`
`68`	`68`	`{`
`69`		`- name: 'fastboot',`
`70`		`- command: 'ember fastboot:test',`
	`69`	`+ name: 'ember-default-with-jquery',`
	`70`	`+ env: {`
	`71`	`+ EMBER_OPTIONAL_FEATURES: JSON.stringify({`
	`72`	`+ 'jquery-integration': true`
	`73`	`+ })`
	`74`	`+ },`
`71`	`75`	`npm: {`
`72`	`76`	`devDependencies: {`
`73`		`- 'ember-source': null`
	`77`	`+ '@ember/jquery': '^0.5.1'`
`74`	`78`	`}`
`75`	`79`	`}`
	`80`	`+ },`
	`81`	`+ {`
	`82`	`+ name: 'fastboot',`
	`83`	`+ command: 'ember fastboot:test',`
	`84`	`+ npm: {`
	`85`	`+ devDependencies: {}`
	`86`	`+ }`
`76`	`87`	`}`
`77`	`88`	`]`
`78`	`89`	`};`