From fcffb5ee2914ed0b9cd6922d9d715443bc63011f Mon Sep 17 00:00:00 2001 From: Robert Wagner Date: Mon, 13 Sep 2021 15:18:08 -0400 Subject: [PATCH] Ember 4 support --- addon/routes/docs/api/item.js | 9 +++-- addon/services/project-version.js | 3 +- package.json | 2 +- tests/dummy/app/pods/sandbox/route.js | 9 +++-- tests/helpers/destroy-app.js | 8 ----- tests/helpers/module-for-acceptance.js | 22 ------------ tests/helpers/start-app.js | 17 ---------- yarn.lock | 46 ++++++-------------------- 8 files changed, 24 insertions(+), 92 deletions(-) delete mode 100644 tests/helpers/destroy-app.js delete mode 100644 tests/helpers/module-for-acceptance.js delete mode 100644 tests/helpers/start-app.js diff --git a/addon/routes/docs/api/item.js b/addon/routes/docs/api/item.js index c883289e1..ebf84f3e0 100644 --- a/addon/routes/docs/api/item.js +++ b/addon/routes/docs/api/item.js @@ -1,7 +1,10 @@ import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; import { assert } from '@ember/debug'; -export default Route.extend({ +export default class DocsApiRoute extends Route { + @service store; + model({ path }) { let item; @@ -43,5 +46,5 @@ export default Route.extend({ assert(`item not found for path '${path}'`, item); return item; - }, -}); + } +} diff --git a/addon/services/project-version.js b/addon/services/project-version.js index 1c67f861b..4dabe7e3e 100644 --- a/addon/services/project-version.js +++ b/addon/services/project-version.js @@ -3,7 +3,6 @@ import { getOwner } from '@ember/application'; import { computed } from '@ember/object'; import { task } from 'ember-concurrency'; import config from 'ember-get-config'; -import { assign } from '@ember/polyfills'; import fetch from 'fetch'; const { latestVersionName } = config['ember-cli-addon-docs']; @@ -15,7 +14,7 @@ export default Service.extend({ if (response.ok) { json = yield response.json(); } else { - json = { [latestVersionName]: assign({}, this.currentVersion) }; + json = { [latestVersionName]: Object.assign({}, this.currentVersion) }; } this.set( diff --git a/package.json b/package.json index a3242ef09..ec99e7c72 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "ember-auto-import": "^1.11.3", "ember-cli-autoprefixer": "^1.0.2", "ember-cli-babel": "^7.26.6", - "ember-cli-clipboard": "^0.15.0", + "ember-cli-clipboard": "jkusa/ember-cli-clipboard#e27143fe91c486baa4fe2abf654f73ef594b5216", "ember-cli-htmlbars": "^5.7.1", "ember-cli-postcss": "^7.0.2", "ember-cli-string-helpers": "^6.1.0", diff --git a/tests/dummy/app/pods/sandbox/route.js b/tests/dummy/app/pods/sandbox/route.js index 3a4d5932f..1beb22a92 100644 --- a/tests/dummy/app/pods/sandbox/route.js +++ b/tests/dummy/app/pods/sandbox/route.js @@ -1,7 +1,10 @@ import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; + +export default class SandboxRoute extends Route { + @service store; -export default Route.extend({ model() { return this.store.findRecord('project', 'sandbox'); - }, -}); + } +} diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js deleted file mode 100644 index 28dec908e..000000000 --- a/tests/helpers/destroy-app.js +++ /dev/null @@ -1,8 +0,0 @@ -import { run } from '@ember/runloop'; - -export default function destroyApp(application) { - run(application, 'destroy'); - if (window.server) { - window.server.shutdown(); - } -} diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js deleted file mode 100644 index 68cbbdeb8..000000000 --- a/tests/helpers/module-for-acceptance.js +++ /dev/null @@ -1,22 +0,0 @@ -import { module } from 'qunit'; -import { resolve } from 'rsvp'; -import startApp from '../helpers/start-app'; -import destroyApp from '../helpers/destroy-app'; - -export default function (name, options = {}) { - module(name, { - beforeEach() { - this.application = startApp(); - - if (options.beforeEach) { - return options.beforeEach.apply(this, arguments); - } - }, - - afterEach() { - let afterEach = - options.afterEach && options.afterEach.apply(this, arguments); - return resolve(afterEach).then(() => destroyApp(this.application)); - }, - }); -} diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js deleted file mode 100644 index 99d35dcf4..000000000 --- a/tests/helpers/start-app.js +++ /dev/null @@ -1,17 +0,0 @@ -import Application from '../../app'; -import config from '../../config/environment'; -import { merge } from '@ember/polyfills'; -import { run } from '@ember/runloop'; - -export default function startApp(attrs) { - let attributes = merge({}, config.APP); - attributes.autoboot = true; - attributes = merge(attributes, attrs); // use defaults, but you can override; - - return run(() => { - let application = Application.create(attributes); - application.setupForTesting(); - application.injectTestHelpers(); - return application; - }); -} diff --git a/yarn.lock b/yarn.lock index 37712fd34..df361216a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2902,11 +2902,6 @@ babel-plugin-filter-imports@^4.0.0: "@babel/types" "^7.7.2" lodash "^4.17.15" -babel-plugin-htmlbars-inline-precompile@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-3.2.0.tgz#c4882ea875d0f5683f0d91c1f72e29a4f14b5606" - integrity sha512-IUeZmgs9tMUGXYu1vfke5I18yYJFldFGdNFQOWslXTnDWXzpwPih7QFduUqvT+awDpDuNtXpdt5JAf43Q1Hhzg== - babel-plugin-htmlbars-inline-precompile@^5.0.0: version "5.3.0" resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-5.3.0.tgz#eeaff07c35415264aea4d6bafb5e71167f6ffb2f" @@ -3740,7 +3735,7 @@ broccoli-plugin@^2.0.0, broccoli-plugin@^2.1.0: rimraf "^2.3.4" symlink-or-copy "^1.1.8" -broccoli-plugin@^3.0.0, broccoli-plugin@^3.1.0: +broccoli-plugin@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-3.1.0.tgz#54ba6dd90a42ec3db5624063292610e326b1e542" integrity sha512-7w7FP8WJYjLvb0eaw27LO678TGGaom++49O1VYIuzjhXjK5kn2+AMlDm7CaUFw4F7CLGoVQeZ84d8gICMJa4lA== @@ -5619,7 +5614,7 @@ elliptic@^6.5.3: ember-compatibility-helpers "^1.1.2" ember-destroyable-polyfill "^2.0.2" -ember-auto-import@^1.10.1, ember-auto-import@^1.11.3, ember-auto-import@^1.2.19, ember-auto-import@^1.5.3: +ember-auto-import@^1.10.1, ember-auto-import@^1.11.3, ember-auto-import@^1.2.19: version "1.12.0" resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.12.0.tgz#52246b04891090e2608244e65c4c6af7710df12b" integrity sha512-fzMGnyHGfUNFHchpLbJ98Vs/c5H2wZBMR9r/XwW+WOWPisZDGLUPPyhJQsSREPoUQ+o8GvyLaD/rkrKqW8bmgw== @@ -5703,12 +5698,12 @@ ember-cli-autoprefixer@^1.0.2: broccoli-autoprefixer "^8.0.0" ember-cli-htmlbars "^5.0.0" -ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0, ember-cli-babel-plugin-helpers@^1.1.1: +ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879" integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw== -ember-cli-babel@^6.11.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.6.0, ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.1.4, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.2, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.5, ember-cli-babel@^7.26.6, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3: +ember-cli-babel@^6.11.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.6.0, ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.1.4, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.5, ember-cli-babel@^7.26.6, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3: version "7.26.6" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.6.tgz#322fbbd3baad9dd99e3276ff05bc6faef5e54b39" integrity sha512-040svtfj2RC35j/WMwdWJFusZaXmNoytLAMyBDGLMSlRvznudTxZjGlPV6UupmtTBApy58cEF8Fq4a+COWoEmQ== @@ -5755,16 +5750,15 @@ ember-cli-blueprint-test-helpers@^0.19.2: testdouble "^3.2.6" tmp-sync "^1.0.0" -ember-cli-clipboard@^0.15.0: +ember-cli-clipboard@jkusa/ember-cli-clipboard#e27143fe91c486baa4fe2abf654f73ef594b5216: version "0.15.0" - resolved "https://registry.yarnpkg.com/ember-cli-clipboard/-/ember-cli-clipboard-0.15.0.tgz#3704baaeab1f0a2df13b3d77632dea7266aabe54" - integrity sha512-gcjm2ofr3NOGH6/MFp+2AVqEKTYkdRUvRsVovTg45Iy414jKyWwxu9l3jWM0ZZkRc2IqjE0V2ta9JJe2/HRPUA== + resolved "https://codeload.github.com/jkusa/ember-cli-clipboard/tar.gz/e27143fe91c486baa4fe2abf654f73ef594b5216" dependencies: "@ember/render-modifiers" "^1.0.1" clipboard "^2.0.6" - ember-auto-import "^1.5.3" - ember-cli-babel "^7.20.2" - ember-cli-htmlbars "^4.2.3" + ember-auto-import "^1.10.1" + ember-cli-babel "^7.23.1" + ember-cli-htmlbars "^5.3.2" ember-cli-dependency-checker@^3.2.0: version "3.2.0" @@ -5840,27 +5834,7 @@ ember-cli-htmlbars@^3.0.1: json-stable-stringify "^1.0.1" strip-bom "^3.0.0" -ember-cli-htmlbars@^4.2.3: - version "4.5.0" - resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.5.0.tgz#d299e4f7eba6f30dc723ee086906cc550beb252e" - integrity sha512-bYJpK1pqFu9AadDAGTw05g2LMNzY8xTCIqQm7dMJmKEoUpLRFbPf4SfHXrktzDh7Q5iggl6Skzf1M0bPlIxARw== - dependencies: - "@ember/edition-utils" "^1.2.0" - babel-plugin-htmlbars-inline-precompile "^3.2.0" - broccoli-debug "^0.6.5" - broccoli-persistent-filter "^2.3.1" - broccoli-plugin "^3.1.0" - common-tags "^1.8.0" - ember-cli-babel-plugin-helpers "^1.1.0" - fs-tree-diff "^2.0.1" - hash-for-dep "^1.5.1" - heimdalljs-logger "^0.1.10" - json-stable-stringify "^1.0.1" - semver "^6.3.0" - strip-bom "^4.0.0" - walk-sync "^2.0.2" - -ember-cli-htmlbars@^5.0.0, ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.6.3, ember-cli-htmlbars@^5.7.1: +ember-cli-htmlbars@^5.0.0, ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.3.2, ember-cli-htmlbars@^5.6.3, ember-cli-htmlbars@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.7.1.tgz#eb5b88c7d9083bc27665fb5447a9b7503b32ce4f" integrity sha512-9laCgL4tSy48orNoQgQKEHp93MaqAs9ZOl7or5q+8iyGGJHW6sVXIYrVv5/5O9HfV6Ts8/pW1rSoaeKyLUE+oA==