Skip to content

Commit f7e47b1

Browse files
Ember 4 support (#932)
1 parent 75c940d commit f7e47b1

File tree

8 files changed

+24
-92
lines changed

8 files changed

+24
-92
lines changed

addon/routes/docs/api/item.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import Route from '@ember/routing/route';
2+
import { inject as service } from '@ember/service';
23
import { assert } from '@ember/debug';
34

4-
export default Route.extend({
5+
export default class DocsApiRoute extends Route {
6+
@service store;
7+
58
model({ path }) {
69
let item;
710

@@ -43,5 +46,5 @@ export default Route.extend({
4346
assert(`item not found for path '${path}'`, item);
4447

4548
return item;
46-
},
47-
});
49+
}
50+
}

addon/services/project-version.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { getOwner } from '@ember/application';
33
import { computed } from '@ember/object';
44
import { task } from 'ember-concurrency';
55
import config from 'ember-get-config';
6-
import { assign } from '@ember/polyfills';
76
import fetch from 'fetch';
87

98
const { latestVersionName } = config['ember-cli-addon-docs'];
@@ -15,7 +14,7 @@ export default Service.extend({
1514
if (response.ok) {
1615
json = yield response.json();
1716
} else {
18-
json = { [latestVersionName]: assign({}, this.currentVersion) };
17+
json = { [latestVersionName]: Object.assign({}, this.currentVersion) };
1918
}
2019

2120
this.set(

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"ember-auto-import": "^1.11.3",
5555
"ember-cli-autoprefixer": "^1.0.2",
5656
"ember-cli-babel": "^7.26.6",
57-
"ember-cli-clipboard": "^0.15.0",
57+
"ember-cli-clipboard": "jkusa/ember-cli-clipboard#e27143fe91c486baa4fe2abf654f73ef594b5216",
5858
"ember-cli-htmlbars": "^5.7.1",
5959
"ember-cli-postcss": "^7.0.2",
6060
"ember-cli-string-helpers": "^6.1.0",

tests/dummy/app/pods/sandbox/route.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import Route from '@ember/routing/route';
2+
import { inject as service } from '@ember/service';
3+
4+
export default class SandboxRoute extends Route {
5+
@service store;
26

3-
export default Route.extend({
47
model() {
58
return this.store.findRecord('project', 'sandbox');
6-
},
7-
});
9+
}
10+
}

tests/helpers/destroy-app.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

tests/helpers/module-for-acceptance.js

Lines changed: 0 additions & 22 deletions
This file was deleted.

tests/helpers/start-app.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

yarn.lock

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2902,11 +2902,6 @@ babel-plugin-filter-imports@^4.0.0:
29022902
"@babel/types" "^7.7.2"
29032903
lodash "^4.17.15"
29042904

2905-
babel-plugin-htmlbars-inline-precompile@^3.2.0:
2906-
version "3.2.0"
2907-
resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-3.2.0.tgz#c4882ea875d0f5683f0d91c1f72e29a4f14b5606"
2908-
integrity sha512-IUeZmgs9tMUGXYu1vfke5I18yYJFldFGdNFQOWslXTnDWXzpwPih7QFduUqvT+awDpDuNtXpdt5JAf43Q1Hhzg==
2909-
29102905
babel-plugin-htmlbars-inline-precompile@^5.0.0:
29112906
version "5.3.0"
29122907
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:
37403735
rimraf "^2.3.4"
37413736
symlink-or-copy "^1.1.8"
37423737

3743-
broccoli-plugin@^3.0.0, broccoli-plugin@^3.1.0:
3738+
broccoli-plugin@^3.0.0:
37443739
version "3.1.0"
37453740
resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-3.1.0.tgz#54ba6dd90a42ec3db5624063292610e326b1e542"
37463741
integrity sha512-7w7FP8WJYjLvb0eaw27LO678TGGaom++49O1VYIuzjhXjK5kn2+AMlDm7CaUFw4F7CLGoVQeZ84d8gICMJa4lA==
@@ -5619,7 +5614,7 @@ elliptic@^6.5.3:
56195614
ember-compatibility-helpers "^1.1.2"
56205615
ember-destroyable-polyfill "^2.0.2"
56215616

5622-
ember-auto-import@^1.10.1, ember-auto-import@^1.11.3, ember-auto-import@^1.2.19, ember-auto-import@^1.5.3:
5617+
ember-auto-import@^1.10.1, ember-auto-import@^1.11.3, ember-auto-import@^1.2.19:
56235618
version "1.12.0"
56245619
resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.12.0.tgz#52246b04891090e2608244e65c4c6af7710df12b"
56255620
integrity sha512-fzMGnyHGfUNFHchpLbJ98Vs/c5H2wZBMR9r/XwW+WOWPisZDGLUPPyhJQsSREPoUQ+o8GvyLaD/rkrKqW8bmgw==
@@ -5703,12 +5698,12 @@ ember-cli-autoprefixer@^1.0.2:
57035698
broccoli-autoprefixer "^8.0.0"
57045699
ember-cli-htmlbars "^5.0.0"
57055700

5706-
ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0, ember-cli-babel-plugin-helpers@^1.1.1:
5701+
ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.1:
57075702
version "1.1.1"
57085703
resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
57095704
integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
57105705

5711-
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:
5706+
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:
57125707
version "7.26.6"
57135708
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.6.tgz#322fbbd3baad9dd99e3276ff05bc6faef5e54b39"
57145709
integrity sha512-040svtfj2RC35j/WMwdWJFusZaXmNoytLAMyBDGLMSlRvznudTxZjGlPV6UupmtTBApy58cEF8Fq4a+COWoEmQ==
@@ -5755,16 +5750,15 @@ ember-cli-blueprint-test-helpers@^0.19.2:
57555750
testdouble "^3.2.6"
57565751
tmp-sync "^1.0.0"
57575752

5758-
ember-cli-clipboard@^0.15.0:
5753+
ember-cli-clipboard@jkusa/ember-cli-clipboard#e27143fe91c486baa4fe2abf654f73ef594b5216:
57595754
version "0.15.0"
5760-
resolved "https://registry.yarnpkg.com/ember-cli-clipboard/-/ember-cli-clipboard-0.15.0.tgz#3704baaeab1f0a2df13b3d77632dea7266aabe54"
5761-
integrity sha512-gcjm2ofr3NOGH6/MFp+2AVqEKTYkdRUvRsVovTg45Iy414jKyWwxu9l3jWM0ZZkRc2IqjE0V2ta9JJe2/HRPUA==
5755+
resolved "https://codeload.github.com/jkusa/ember-cli-clipboard/tar.gz/e27143fe91c486baa4fe2abf654f73ef594b5216"
57625756
dependencies:
57635757
"@ember/render-modifiers" "^1.0.1"
57645758
clipboard "^2.0.6"
5765-
ember-auto-import "^1.5.3"
5766-
ember-cli-babel "^7.20.2"
5767-
ember-cli-htmlbars "^4.2.3"
5759+
ember-auto-import "^1.10.1"
5760+
ember-cli-babel "^7.23.1"
5761+
ember-cli-htmlbars "^5.3.2"
57685762

57695763
ember-cli-dependency-checker@^3.2.0:
57705764
version "3.2.0"
@@ -5840,27 +5834,7 @@ ember-cli-htmlbars@^3.0.1:
58405834
json-stable-stringify "^1.0.1"
58415835
strip-bom "^3.0.0"
58425836

5843-
ember-cli-htmlbars@^4.2.3:
5844-
version "4.5.0"
5845-
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.5.0.tgz#d299e4f7eba6f30dc723ee086906cc550beb252e"
5846-
integrity sha512-bYJpK1pqFu9AadDAGTw05g2LMNzY8xTCIqQm7dMJmKEoUpLRFbPf4SfHXrktzDh7Q5iggl6Skzf1M0bPlIxARw==
5847-
dependencies:
5848-
"@ember/edition-utils" "^1.2.0"
5849-
babel-plugin-htmlbars-inline-precompile "^3.2.0"
5850-
broccoli-debug "^0.6.5"
5851-
broccoli-persistent-filter "^2.3.1"
5852-
broccoli-plugin "^3.1.0"
5853-
common-tags "^1.8.0"
5854-
ember-cli-babel-plugin-helpers "^1.1.0"
5855-
fs-tree-diff "^2.0.1"
5856-
hash-for-dep "^1.5.1"
5857-
heimdalljs-logger "^0.1.10"
5858-
json-stable-stringify "^1.0.1"
5859-
semver "^6.3.0"
5860-
strip-bom "^4.0.0"
5861-
walk-sync "^2.0.2"
5862-
5863-
ember-cli-htmlbars@^5.0.0, ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.6.3, ember-cli-htmlbars@^5.7.1:
5837+
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:
58645838
version "5.7.1"
58655839
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.7.1.tgz#eb5b88c7d9083bc27665fb5447a9b7503b32ce4f"
58665840
integrity sha512-9laCgL4tSy48orNoQgQKEHp93MaqAs9ZOl7or5q+8iyGGJHW6sVXIYrVv5/5O9HfV6Ts8/pW1rSoaeKyLUE+oA==

0 commit comments

Comments
 (0)