feat: Update to Ember & Ember-cli 3.10 (ember-learn#368)

cibernox · samselikoff · commit b2ec9a329c8a · 2019-05-31T15:23:46.000-04:00
diff --git a/.eslintignore b/.eslintignore
@@ -8,9 +8,11 @@
 
 # dependencies
 /bower_components/
+/node_modules/
 
 # misc
 /coverage/
+!.*
 
 # ember-try
 /.node_modules.ember-try/
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -28,6 +28,7 @@ module.exports = {
     // node files
     {
       files: [
+        '.eslintrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
         'index.js',
@@ -46,7 +47,7 @@ module.exports = {
       ],
       parserOptions: {
         sourceType: 'script',
-        ecmaVersion: 2015
+        ecmaVersion: 2017
       },
       env: {
         browser: false,
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,8 @@
 /node_modules/
 
 # misc
+/.env*
+/.pnp*
 /.sass-cache
 /connect.lock
 /coverage/
diff --git a/.npmignore b/.npmignore
@@ -9,13 +9,16 @@
 /.bowerrc
 /.editorconfig
 /.ember-cli
+/.env*
 /.eslintignore
 /.eslintrc.js
 /.gitignore
-/.watchmanconfig
+/.template-lintrc.js
 /.travis.yml
+/.watchmanconfig
 /bower.json
 /config/ember-try.js
+/CONTRIBUTING.md
 /ember-cli-build.js
 /testem.js
 /tests/
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - "6"
+  - "8"
 
 sudo: true
 dist: trusty
@@ -52,9 +52,8 @@ jobs:
       script: yarn test:test-apps
 
     - stage: versioned tests
-      env: EMBER_TRY_SCENARIO=ember-lts-2.8
-    - env: EMBER_TRY_SCENARIO=ember-lts-2.12
-    - env: EMBER_TRY_SCENARIO=ember-lts-2.16
+      env: EMBER_TRY_SCENARIO=ember-lts-2.12
+    - 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
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,26 @@
+# How To Contribute
+
+## Installation
+
+* `git clone <repository-url>`
+* `cd my-addon`
+* `npm install`
+
+## Linting
+
+* `npm run lint:hbs`
+* `npm run lint:js`
+* `npm run lint:js -- --fix`
+
+## Running tests
+
+* `ember test` – Runs the test suite on the current Ember version
+* `ember test --server` – Runs the test suite in "watch mode"
+* `ember try:each` – Runs the test suite against multiple Ember versions
+
+## Running the dummy application
+
+* `ember serve`
+* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
+
+For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -11,45 +11,29 @@ module.exports = function() {
     return {
       useYarn: true,
       scenarios: [
-        {
-          name: 'node',
-          command: 'yarn test:node'
-        },
-        {
-          name: 'ember-lts-2.8',
-          bower: {
-            dependencies: {
-              'ember': 'components/ember#lts-2-8'
-            },
-            resolutions: {
-              'ember': 'lts-2-8'
-            }
-          },
-        },
         {
           name: 'ember-lts-2.12',
           npm: {
             devDependencies: {
-              'ember-source': '~2.12.0',
-              'ember-native-dom-event-dispatcher': '~0.6.4'
+              '@ember/jquery': '^0.5.1',
+              'ember-source': '~2.18.0'
             }
           }
         },
         {
-          name: 'ember-lts-2.16',
+          name: 'ember-lts-2.18',
           npm: {
             devDependencies: {
-              'ember-source': '~2.16.0',
-              'ember-native-dom-event-dispatcher': '~0.6.4'
+              '@ember/jquery': '^0.5.1',
+              'ember-source': '~2.18.0'
             }
           }
         },
         {
-          name: 'ember-lts-2.18',
+          name: 'ember-lts-3.4',
           npm: {
             devDependencies: {
-              'ember-source': '~2.18.0',
-              'ember-native-dom-event-dispatcher': '~0.6.4'
+              'ember-source': '~3.4.0'
             }
           }
         },
@@ -77,6 +61,10 @@ module.exports = function() {
             }
           }
         },
+        // The default `.travis.yml` runs this scenario via `npm test`,
+        // not via `ember try`. It's still included here so that running
+        // `ember try:each` manually or from a customized CI config will run it
+        // along with all the other scenarios.
         {
           name: 'ember-default',
           npm: {
diff --git a/index.js b/index.js
@@ -231,7 +231,7 @@ module.exports = {
   },
 
   _highlightJSTree() {
-    return new Funnel(path.dirname(require.resolve('highlightjs/package.json')), {
+    return new Funnel(path.dirname(require.resolve('highlightjs/package.json')), { // eslint-disable-line node/no-missing-require
       srcDir: 'styles',
       destDir: 'highlightjs-styles'
     });
diff --git a/package.json b/package.json
@@ -39,10 +39,10 @@
     "chalk": "^2.4.2",
     "ember-auto-import": "^1.2.19",
     "ember-cli-autoprefixer": "^0.8.1",
-    "ember-cli-babel": "^6.16.0",
+    "ember-cli-babel": "^7.7.3",
     "ember-cli-clipboard": "^0.11.1",
-    "ember-cli-htmlbars": "^3.0.0",
-    "ember-cli-htmlbars-inline-precompile": "^1.0.3",
+    "ember-cli-htmlbars": "^3.0.1",
+    "ember-cli-htmlbars-inline-precompile": "^2.1.0",
     "ember-cli-sass": "10.0.0",
     "ember-cli-string-helpers": "^1.9.0",
     "ember-cli-string-utils": "^1.1.0",
@@ -94,34 +94,34 @@
     "chai": "^4.2.0",
     "common-tags": "^1.8.0",
     "ember-classy-page-object": "^0.5.0",
-    "ember-cli": "~3.4.3",
+    "ember-cli": "~3.10.0",
     "ember-cli-addon-docs-esdoc": "^0.2.1",
     "ember-cli-addon-docs-yuidoc": "^0.2.1",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
-    "ember-cli-dependency-checker": "^3.0.0",
+    "ember-cli-dependency-checker": "^3.1.0",
     "ember-cli-dependency-lint": "^1.1.3",
     "ember-cli-deploy": "^1.0.2",
     "ember-cli-deploy-build": "^1.1.1",
     "ember-cli-deploy-git": "^1.3.3",
     "ember-cli-deploy-git-ci": "^1.0.1",
-    "ember-cli-eslint": "^4.2.3",
+    "ember-cli-eslint": "^5.1.0",
     "ember-cli-inject-live-reload": "^1.8.2",
     "ember-cli-mirage": "^0.4.14",
-    "ember-cli-qunit": "^4.4.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-template-lint": "^1.0.0-beta.2",
     "ember-cli-uglify": "^2.1.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.0",
-    "ember-load-initializers": "^1.1.0",
+    "ember-load-initializers": "^2.0.0",
     "ember-maybe-import-regenerator-for-testing": "^1.0.0",
+    "ember-qunit": "^4.4.1",
     "ember-resolver": "^5.0.1",
-    "ember-source": "~3.4.5",
-    "ember-source-channel-url": "^1.1.0",
+    "ember-source": "~3.10.0",
+    "ember-source-channel-url": "^2.0.0",
     "ember-test-selectors": "^1.0.0",
     "ember-try": "^1.0.0",
-    "eslint-plugin-ember": "^5.2.0",
-    "eslint-plugin-node": "^7.0.1",
+    "eslint-plugin-ember": "^6.2.0",
+    "eslint-plugin-node": "^8.0.1",
     "loader.js": "^4.7.0",
     "mocha": "^6.0.2",
     "qunit-dom": "^0.8.4"
diff --git a/sandbox/.eslintrc.js b/sandbox/.eslintrc.js
@@ -21,5 +21,28 @@ module.exports = {
 
     // ember-keyboard uses events
     'ember/no-on-calls-in-components': 'off',
-  }
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        '.eslintrc.js',
+      ],
+      excludedFiles: [
+        'addon/**',
+        'addon-test-support/**',
+        'app/**',
+        'tests/dummy/app/**'
+      ],
+      parserOptions: {
+        sourceType: 'script',
+        ecmaVersion: 2017
+      },
+      env: {
+        browser: false,
+        node: true
+      },
+      plugins: ['node']
+    },
+  ]
 };
diff --git a/scripts/link-them.sh b/scripts/link-them.sh
@@ -10,6 +10,7 @@ for package in "new-addon"; do
     pushd ./test-apps/$package/node_modules > /dev/null
     rm -rf .bin
     ln -s ../../../node_modules/.bin .bin
+    rm -rf .bin/sha.js
     popd > /dev/null
 done
 
diff --git a/test-apps/new-addon/.eslintrc.js b/test-apps/new-addon/.eslintrc.js
@@ -20,6 +20,7 @@ module.exports = {
     // node files
     {
       files: [
+        '.eslintrc.js',
         'ember-cli-build.js',
         'index.js',
         'testem.js',
diff --git a/test-apps/new-addon/config/ember-try.js b/test-apps/new-addon/config/ember-try.js
@@ -9,27 +9,22 @@ module.exports = function() {
     getChannelURL('canary')
   ]).then((urls) => {
     return {
+      useYarn: true,
       scenarios: [
         {
           name: 'ember-lts-2.12',
           npm: {
             devDependencies: {
-              'ember-source': '~2.12.0'
-            }
-          }
-        },
-        {
-          name: 'ember-lts-2.16',
-          npm: {
-            devDependencies: {
-              'ember-source': '~2.16.0'
+              '@ember/jquery': '^0.5.1',
+              'ember-source': '~2.18.0'
             }
           }
         },
         {
           name: 'ember-lts-2.18',
           npm: {
             devDependencies: {
+              '@ember/jquery': '^0.5.1',
               'ember-source': '~2.18.0'
             }
           }
diff --git a/test-apps/new-addon/package.json b/test-apps/new-addon/package.json
@@ -32,7 +32,7 @@
     "ember-cli-htmlbars": "*",
     "ember-cli-htmlbars-inline-precompile": "*",
     "ember-cli-inject-live-reload": "*",
-    "ember-cli-qunit": "*",
+    "ember-qunit": "*",
     "ember-cli-sri": "*",
     "ember-cli-uglify": "*",
     "ember-disable-prototype-extensions": "*",
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
@@ -11,7 +11,7 @@ module.exports = function(environment) {
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
-        // e.g. 'with-controller': true
+        // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
       },
       EXTEND_PROTOTYPES: {
         // Prevent Ember Data from overriding Date.parse.
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -11,45 +11,29 @@ module.exports = function() {`
`11`	`11`	`return {`
`12`	`12`	`useYarn: true,`
`13`	`13`	`scenarios: [`
`14`		`- {`
`15`		`- name: 'node',`
`16`		`- command: 'yarn test:node'`
`17`		`- },`
`18`		`- {`
`19`		`- name: 'ember-lts-2.8',`
`20`		`- bower: {`
`21`		`- dependencies: {`
`22`		`- 'ember': 'components/ember#lts-2-8'`
`23`		`- },`
`24`		`- resolutions: {`
`25`		`- 'ember': 'lts-2-8'`
`26`		`- }`
`27`		`- },`
`28`		`- },`
`29`	`14`	`{`
`30`	`15`	`name: 'ember-lts-2.12',`
`31`	`16`	`npm: {`
`32`	`17`	`devDependencies: {`
`33`		`- 'ember-source': '~2.12.0',`
`34`		`- 'ember-native-dom-event-dispatcher': '~0.6.4'`
	`18`	`+ '@ember/jquery': '^0.5.1',`
	`19`	`+ 'ember-source': '~2.18.0'`
`35`	`20`	`}`
`36`	`21`	`}`
`37`	`22`	`},`
`38`	`23`	`{`
`39`		`- name: 'ember-lts-2.16',`
	`24`	`+ name: 'ember-lts-2.18',`
`40`	`25`	`npm: {`
`41`	`26`	`devDependencies: {`
`42`		`- 'ember-source': '~2.16.0',`
`43`		`- 'ember-native-dom-event-dispatcher': '~0.6.4'`
	`27`	`+ '@ember/jquery': '^0.5.1',`
	`28`	`+ 'ember-source': '~2.18.0'`
`44`	`29`	`}`
`45`	`30`	`}`
`46`	`31`	`},`
`47`	`32`	`{`
`48`		`- name: 'ember-lts-2.18',`
	`33`	`+ name: 'ember-lts-3.4',`
`49`	`34`	`npm: {`
`50`	`35`	`devDependencies: {`
`51`		`- 'ember-source': '~2.18.0',`
`52`		`- 'ember-native-dom-event-dispatcher': '~0.6.4'`
	`36`	`+ 'ember-source': '~3.4.0'`
`53`	`37`	`}`
`54`	`38`	`}`
`55`	`39`	`},`
`@@ -77,6 +61,10 @@ module.exports = function() {`
`77`	`61`	`}`
`78`	`62`	`}`
`79`	`63`	`},`
	`64`	+ // The default `.travis.yml` runs this scenario via `npm test`,
	`65`	+ // not via `ember try`. It's still included here so that running
	`66`	+ // `ember try:each` manually or from a customized CI config will run it
	`67`	`+ // along with all the other scenarios.`
`80`	`68`	`{`
`81`	`69`	`name: 'ember-default',`
`82`	`70`	`npm: {`
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`	`+ '.eslintrc.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
`@@ -9,27 +9,22 @@ module.exports = function() {`
`9`	`9`	`getChannelURL('canary')`
`10`	`10`	`]).then((urls) => {`
`11`	`11`	`return {`
	`12`	`+ useYarn: true,`
`12`	`13`	`scenarios: [`
`13`	`14`	`{`
`14`	`15`	`name: 'ember-lts-2.12',`
`15`	`16`	`npm: {`
`16`	`17`	`devDependencies: {`
`17`		`- 'ember-source': '~2.12.0'`
`18`		`- }`
`19`		`- }`
`20`		`- },`
`21`		`- {`
`22`		`- name: 'ember-lts-2.16',`
`23`		`- npm: {`
`24`		`- devDependencies: {`
`25`		`- 'ember-source': '~2.16.0'`
	`18`	`+ '@ember/jquery': '^0.5.1',`
	`19`	`+ 'ember-source': '~2.18.0'`
`26`	`20`	`}`
`27`	`21`	`}`
`28`	`22`	`},`
`29`	`23`	`{`
`30`	`24`	`name: 'ember-lts-2.18',`
`31`	`25`	`npm: {`
`32`	`26`	`devDependencies: {`
	`27`	`+ '@ember/jquery': '^0.5.1',`
`33`	`28`	`'ember-source': '~2.18.0'`
`34`	`29`	`}`
`35`	`30`	`}`