Merge pull request #134 from xg-wang/upgrade

Deprecate Logger and merge
Drop support for ember<2.16
Use whatwg-fetch instead of forked version.

Author: xg-wang

.eslintrc.js

@@ -9,7 +9,9 @@ module.exports = {
   env: {
     browser: true
   },
-  rules: {},
+  rules: {
+    'no-console': ["error", { allow: ['warn'] }]
+  },
   overrides: [
     // node files
     {

.travis.yml

@@ -22,7 +22,6 @@ env:
   matrix:
     # 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

addon/mixins/adapter-fetch.js

@@ -1,14 +1,8 @@
-import Ember from 'ember';
 import Mixin from '@ember/object/mixin';
-import { assign, merge } from '@ember/polyfills'
+import { assign } from '@ember/polyfills'
 import RSVP from 'rsvp';
 import fetch from 'fetch';
-
-import { serializeQueryParams } from 'ember-fetch/utils/serialize-query-params';
-
-const {
-  Logger: { warn }
-} = Ember;
+import { serializeQueryParams } from '../utils/serialize-query-params';
 
 /**
  * Helper function to create a plain object from the response's Headers.
@@ -32,16 +26,13 @@ export function headersToObject(headers) {
  * @returns {Object}
  */
 export function mungOptionsForFetch(_options, adapter) {
-  // This allows this mixin to be backward compatible with Ember < 2.5.
-  const combineObjs = (assign || merge);
-  const options = combineObjs({
+  const options = assign({
     credentials: 'same-origin',
   }, _options);
 
   let adapterHeaders = adapter.get('headers');
   if (adapterHeaders) {
-    // This double use of `combineObjs` is necessary because `merge` only accepts two arguments.
-    options.headers = combineObjs(combineObjs({}, options.headers || {}), adapterHeaders);
+    options.headers = assign(options.headers || {}, adapterHeaders);
   }
 
   // Default to 'GET' in case `type` is not passed in (mimics jQuery.ajax).
@@ -93,7 +84,7 @@ export function determineBodyPromise(response, requestData) {
       if (response.ok && (status === 204 || status === 205 || requestData.method === 'HEAD')) {
         payload = { data: null };
       } else {
-        warn('This response was unable to be parsed as json.', payload);
+        console.warn('This response was unable to be parsed as json.', payload);
       }
     }
     return payload;

config/ember-try.js

@@ -11,14 +11,6 @@ module.exports = function() {
     return {
       useYarn: true,
       scenarios: [
-        {
-          name: 'ember-lts-2.12',
-          npm: {
-            devDependencies: {
-              'ember-source': '~2.12.0'
-            }
-          }
-        },
         {
           name: 'ember-lts-2.16',
           npm: {

index.js

@@ -150,9 +150,7 @@ function treeForBrowserFetch() {
       ]
     }
   });
-  // Fork whatwg-fetch to provide umd build before official release, no extra change made.
-  // We will get back to the official one when new version released.
-  const fetchNode = new Rollup(path.dirname(path.dirname(require.resolve('@xg-wang/whatwg-fetch'))), {
+  const fetchNode = new Rollup(path.dirname(path.dirname(require.resolve('whatwg-fetch'))), {
     rollup: {
       input: 'fetch.js',
       output: {

package.json

@@ -20,7 +20,6 @@
     "test:node": "mocha"
   },
   "dependencies": {
-    "@xg-wang/whatwg-fetch": "^3.0.0",
     "abortcontroller-polyfill": "^1.1.9",
     "babel-core": "^6.26.3",
     "babel-preset-env": "^1.7.0",
@@ -31,7 +30,8 @@
     "broccoli-templater": "^2.0.1",
     "ember-cli-babel": "^6.8.2",
     "node-fetch": "^2.0.0-alpha.9",
-    "rollup-plugin-babel": "^3.0.7"
+    "rollup-plugin-babel": "^3.0.7",
+    "whatwg-fetch": "^3.0.0"
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
@@ -53,7 +53,7 @@
     "ember-resolver": "^4.0.0",
     "ember-source": "~3.0.0",
     "ember-source-channel-url": "^1.0.1",
-    "ember-try": "^0.2.23",
+    "ember-try": "^1.1.0",
     "eslint-plugin-ember": "^5.0.0",
     "eslint-plugin-node": "^5.2.1",
     "loader.js": "^4.2.3",