From da7c81f210dfc7e3d9aee11f5108caa43a2b0cb6 Mon Sep 17 00:00:00 2001 From: Jen Weber Date: Mon, 13 Jan 2020 12:27:00 -0800 Subject: [PATCH 1/2] Remove redundant package --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 2ee49e3..accc301 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,6 @@ "babel-eslint": "^10.0.3", "broccoli-asset-rev": "^3.0.0", "chai": "^4.2.0", - "ember-auto-import": "^1.5.3", "ember-cli": "~3.15.1", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-eslint": "^5.1.0", From c2428ef1ac2bf04c40acc5747e4c3a0c55c4e48d Mon Sep 17 00:00:00 2001 From: Jen Weber Date: Mon, 13 Jan 2020 12:50:54 -0800 Subject: [PATCH 2/2] Resolve ember-data:default-serializers deprecation --- addon/adapters/version.js | 18 ++++++++++++++++++ addon/serializers/application.js | 1 + addon/serializers/version.js | 4 ++++ app/adapters/version.js | 18 +----------------- app/serializers/application.js | 1 + app/serializers/version.js | 1 + 6 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 addon/adapters/version.js create mode 100644 addon/serializers/application.js create mode 100644 addon/serializers/version.js create mode 100644 app/serializers/application.js create mode 100644 app/serializers/version.js diff --git a/addon/adapters/version.js b/addon/adapters/version.js new file mode 100644 index 0000000..c61a1b8 --- /dev/null +++ b/addon/adapters/version.js @@ -0,0 +1,18 @@ +import DS from 'ember-data'; + +export default DS.JSONAPIAdapter.extend({ + buildURL() { + let url = ['content', 'versions.json']; + let host = this.host; + let prefix = this.urlPrefix(); + + if (prefix) { url.unshift(prefix); } + + url = url.join('/'); + if (!host && url && url.charAt(0) !== '/') { + url = '/' + url; + } + + return url; + }, +}); diff --git a/addon/serializers/application.js b/addon/serializers/application.js new file mode 100644 index 0000000..177ec51 --- /dev/null +++ b/addon/serializers/application.js @@ -0,0 +1 @@ +export { default } from '@ember-data/serializer/json-api'; \ No newline at end of file diff --git a/addon/serializers/version.js b/addon/serializers/version.js new file mode 100644 index 0000000..43dff04 --- /dev/null +++ b/addon/serializers/version.js @@ -0,0 +1,4 @@ +import JSONAPISerializer from '@ember-data/serializer/json-api'; + +export default class VersionSerializer extends JSONAPISerializer { +} diff --git a/app/adapters/version.js b/app/adapters/version.js index c61a1b8..9c19f9f 100644 --- a/app/adapters/version.js +++ b/app/adapters/version.js @@ -1,18 +1,2 @@ -import DS from 'ember-data'; +export { default } from 'guidemaker/adapters/version'; -export default DS.JSONAPIAdapter.extend({ - buildURL() { - let url = ['content', 'versions.json']; - let host = this.host; - let prefix = this.urlPrefix(); - - if (prefix) { url.unshift(prefix); } - - url = url.join('/'); - if (!host && url && url.charAt(0) !== '/') { - url = '/' + url; - } - - return url; - }, -}); diff --git a/app/serializers/application.js b/app/serializers/application.js new file mode 100644 index 0000000..612b270 --- /dev/null +++ b/app/serializers/application.js @@ -0,0 +1 @@ +export { default } from 'guidemaker/serializers/application'; diff --git a/app/serializers/version.js b/app/serializers/version.js new file mode 100644 index 0000000..67628bf --- /dev/null +++ b/app/serializers/version.js @@ -0,0 +1 @@ +export { default } from 'guidemaker/serializers/version';