Update to ember-cli 3.12

lukemelia · lukemelia · commit a7ab05bffa7d · 2019-09-03T12:03:24.000+08:00
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
@@ -1,13 +1,51 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 6,
-    sourceType: 'module'
+    ecmaVersion: 2018
   },
-  extends: 'eslint:recommended',
+  plugins: [
+    'ember'
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended'
+  ],
   env: {
     browser: true
   },
   rules: {
-  }
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        '.eslintrc.js',
+        '.template-lintrc.js',
+        'ember-cli-build.js',
+        'index.js',
+        'testem.js',
+        'blueprints/*/index.js',
+        'config/**/*.js',
+        'tests/dummy/config/**/*.js'
+      ],
+      excludedFiles: [
+        'addon/**',
+        'addon-test-support/**',
+        'app/**',
+        'tests/dummy/app/**'
+      ],
+      parserOptions: {
+        sourceType: 'script'
+      },
+      env: {
+        browser: false,
+        node: true
+      },
+      plugins: ['node'],
+      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
+        // add your custom rules and overrides for node files here
+        'ember/avoid-leaking-state-in-ember-objects': 'off'
+      })
+    }
+  ]
 };
diff --git a/.gitignore b/.gitignore
@@ -1,17 +1,25 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
-/dist
-/tmp
+/dist/
+/tmp/
 
 # dependencies
-/node_modules
-/bower_components
+/bower_components/
+/node_modules/
 
 # misc
+/.env*
+/.pnp*
 /.sass-cache
 /connect.lock
-/coverage/*
+/coverage/
 /libpeerconnection.log
-npm-debug.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
diff --git a/.npmignore b/.npmignore
@@ -1,15 +1,21 @@
-/bower_components
-/config/ember-try.js
-/dist
-/tests
-/tmp
+
 **/.gitkeep
 .bowerrc
 .editorconfig
 .ember-cli
-.gitignore
 .eslintrc.js
+.gitignore
 .watchmanconfig
+/.env*
+/.eslintignore
+/.template-lintrc.js
+/.travis.yml
+/bower.json
+/bower_components/
+/config/ember-try.js
+/dist/
+/tests
+/tmp/
 circle.yml
 ember-cli-build.js
 testem.js
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,15 @@
 ---
 language: node_js
 node_js:
-  - "6"
+  # we recommend testing addons with the same minimum supported node version as Ember CLI
+  # so that your addon works for all apps
+  - "8"
 
 sudo: false
+dist: trusty
+
+addons:
+  chrome: stable
 
 cache:
   yarn: true
@@ -16,4 +22,4 @@ install:
   - yarn install --no-lockfile
 
 script:
-  - yarn test
+  - yarn run test
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,18 @@
+# How To Contribute
+
+## Installation
+
+* `git clone <repository-url>`
+* `cd my-addon`
+* `npm install`
+
+## Linting
+
+* `yarn run lint:js`
+* `yarn run lint:js -- --fix`
+
+## Running tests
+
+* `yarn run test` – Runs the test suite using mocha
+
+For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015
+Copyright (c) 2015-2019
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/config/environment.js b/config/environment.js
@@ -1,4 +1,3 @@
-/* eslint-env node */
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -1,8 +1,9 @@
-/* eslint-env node */
+'use strict';
+
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
-  var app = new EmberAddon(defaults, {
+  let app = new EmberAddon(defaults, {
     // Add options here
   });
 
diff --git a/index.js b/index.js
@@ -1,13 +1,10 @@
-/*eslint-env node*/
-'use strict';
-
 var RSVP = require('rsvp');
 var glob  = require('glob');
 var DeployPluginBase = require('ember-cli-deploy-plugin');
 var path = require('path');
 
 module.exports = {
-  name: 'ember-cli-deploy-build',
+  name: require('./package').name,
 
   createDeployPlugin: function(options) {
     var DeployPlugin = DeployPluginBase.extend({
diff --git a/package.json b/package.json
@@ -2,45 +2,53 @@
   "name": "ember-cli-deploy-build",
   "version": "1.1.1",
   "description": "A Build Plugin for ember-cli-deploy",
-  "directories": {
-    "doc": "doc",
-    "test": "tests"
-  },
   "scripts": {
-    "test": "node tests/runner.js && ./node_modules/.bin/eslint index.js tests/**/*.js"
+    "lint:js": "eslint .",
+    "test": "mocha tests/**/*-test.js"
   },
-  "repository": "https://github.com/ember-cli-deploy/ember-cli-deploy-build",
   "engines": {
-    "node": ">= 4"
+    "node": "8.* || >= 10.*"
   },
-  "author": "Aaron Chambers and the ember-cli-deploy team",
-  "license": "MIT",
   "dependencies": {
     "chalk": "^1.0.0",
     "ember-cli-deploy-plugin": "^0.2.1",
     "glob": "^7.1.1",
     "rsvp": "^3.5.0"
   },
   "devDependencies": {
-    "chai-as-promised": "^6.0.0",
+    "@ember/optional-features": "^0.7.0",
     "chai": "^3.5.0",
-    "ember-cli-babel": "^5.2.4",
-    "ember-cli-htmlbars": "^1.2.0",
+    "chai-as-promised": "^6.0.0",
+    "ember-cli": "~3.12.0",
+    "ember-cli-babel": "^7.7.3",
+    "ember-cli-htmlbars": "^3.0.1",
     "ember-cli-release": "^1.0.0-beta.2",
-    "ember-cli-shims": "^1.0.2",
-    "ember-cli": "^2.12.0",
-    "ember-source": "^2.12.0",
-    "eslint": "^3.18.0",
+    "ember-cli-template-lint": "^1.0.0-beta.1",
+    "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-qunit": "^4.4.1",
+    "ember-source": "~3.12.0",
+    "ember-source-channel-url": "^1.1.0",
+    "ember-try": "^1.0.0",
+    "eslint": "^6.1.0",
+    "eslint-plugin-ember": "^6.2.0",
+    "eslint-plugin-node": "^9.0.1",
     "github": "^0.2.4",
     "glob": "^7.1.1",
-    "loader.js": "^4.2.3",
+    "loader.js": "^4.7.0",
     "mocha": "^3.2.0",
     "multiline": "^1.0.2"
   },
   "keywords": [
     "ember-addon",
     "ember-cli-deploy-plugin"
   ],
+  "repository": "https://github.com/ember-cli-deploy/ember-cli-deploy-build",
+  "license": "MIT",
+  "author": "Aaron Chambers and the ember-cli-deploy team",
+  "directories": {
+    "doc": "doc",
+    "test": "tests"
+  },
   "ember-addon": {
     "configPath": "tests/dummy/config"
   }
diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js
@@ -1,13 +1,9 @@
-import Ember from 'ember';
+import Application from '@ember/application';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-let App;
-
-Ember.MODEL_FACTORY_INJECTIONS = true;
-
-App = Ember.Application.extend({
+const App = Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver
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/router.js b/tests/dummy/app/router.js
@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 
-const Router = Ember.Router.extend({
+const Router = EmberRouter.extend({
   location: config.locationType,
   rootURL: config.rootURL
 });
diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs
@@ -1,5 +1,3 @@
-{{!-- The following component displays Ember's default welcome message. --}}
-{{welcome-page}}
-{{!-- Feel free to remove this! --}}
+<h2 id="title">Welcome to Ember</h2>
 
-{{outlet}}
+{{outlet}}
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
@@ -1,15 +1,15 @@
-/* eslint-env node */
+'use strict';
 
 module.exports = function(environment) {
-  var ENV = {
+  let ENV = {
     modulePrefix: 'dummy',
-    environment: environment,
+    environment,
     rootURL: '/',
     locationType: 'auto',
     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.
@@ -40,6 +40,7 @@ module.exports = function(environment) {
     ENV.APP.LOG_VIEW_LOOKUPS = false;
 
     ENV.APP.rootElement = '#ember-testing';
+    ENV.APP.autoboot = false;
   }
 
   return ENV;
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/tests/dummy/config/targets.js b/tests/dummy/config/targets.js
@@ -0,0 +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
+};
diff --git a/tests/dummy/public/crossdomain.xml b/tests/dummy/public/crossdomain.xml
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/resolver.js b/tests/helpers/resolver.js
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
diff --git a/tests/index-test.js b/tests/index-test.js
diff --git a/tests/test-helper.js b/tests/test-helper.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-/* eslint-env node */`
`2`	`1`	`'use strict';`
`3`	`2`
`4`	`3`	`module.exports = function(/* environment, appConfig */) {`