Skip to content

Commit ec85fdb

Browse files
ember-cli-update to latest
1 parent 59f0cbf commit ec85fdb

16 files changed

+1315
-323
lines changed

.ember-cli

-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
{
2-
/**
3-
Ember CLI sends analytics information by default. The data is completely
4-
anonymous, but there are times when you might want to disable this behavior.
5-
6-
Setting `disableAnalytics` to true will prevent any data from being sent.
7-
*/
8-
"disableAnalytics": false,
9-
102
/**
113
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
124
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.

.eslintignore

-12
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
65
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
126

137
# misc
148
/coverage/
159
!.*
1610
.*/
17-
.eslintcache
1811

1912
# ember-try
2013
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/npm-shrinkwrap.json.ember-try
23-
/package.json.ember-try
24-
/package-lock.json.ember-try
25-
/yarn.lock.ember-try

.github/workflows/ci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Install Node
2323
uses: actions/setup-node@v3
2424
with:
25-
node-version: 14.x
25+
node-version: 18
2626
cache: yarn
2727
- name: Install Dependencies
2828
run: yarn install --frozen-lockfile
@@ -40,7 +40,7 @@ jobs:
4040
- uses: actions/checkout@v3
4141
- uses: actions/setup-node@v3
4242
with:
43-
node-version: 14.x
43+
node-version: 18
4444
cache: yarn
4545
- name: Install Dependencies
4646
run: yarn install --no-lockfile
@@ -57,8 +57,8 @@ jobs:
5757
fail-fast: false
5858
matrix:
5959
try-scenario:
60-
- ember-lts-4.4
6160
- ember-lts-4.8
61+
- ember-lts-4.12
6262
- ember-release
6363
- ember-beta
6464
- ember-canary
@@ -70,7 +70,7 @@ jobs:
7070
- name: Install Node
7171
uses: actions/setup-node@v3
7272
with:
73-
node-version: 14.x
73+
node-version: 18
7474
cache: yarn
7575
- name: Install Dependencies
7676
run: yarn install --frozen-lockfile

.gitignore

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,21 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
2-
31
# compiled output
42
/dist/
5-
/tmp/
3+
/declarations/
64

75
# dependencies
8-
/bower_components/
96
/node_modules/
107

118
# misc
129
/.env*
1310
/.pnp*
14-
/.sass-cache
1511
/.eslintcache
16-
/connect.lock
1712
/coverage/
18-
/libpeerconnection.log
1913
/npm-debug.log*
2014
/testem.log
2115
/yarn-error.log
2216

2317
# ember-try
2418
/.node_modules.ember-try/
25-
/bower.json.ember-try
2619
/npm-shrinkwrap.json.ember-try
2720
/package.json.ember-try
2821
/package-lock.json.ember-try

.npmignore

-6
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
/dist/
33
/tmp/
44

5-
# dependencies
6-
/bower_components/
7-
85
# misc
9-
/.bowerrc
106
/.editorconfig
117
/.ember-cli
128
/.env*
@@ -23,7 +19,6 @@
2319
/.template-lintrc.js
2420
/.travis.yml
2521
/.watchmanconfig
26-
/bower.json
2722
/CONTRIBUTING.md
2823
/ember-cli-build.js
2924
/testem.js
@@ -34,7 +29,6 @@
3429

3530
# ember-try
3631
/.node_modules.ember-try/
37-
/bower.json.ember-try
3832
/npm-shrinkwrap.json.ember-try
3933
/package.json.ember-try
4034
/package-lock.json.ember-try

.prettierignore

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
65
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
126

137
# misc
148
/coverage/
159
!.*
16-
.eslintcache
17-
.lint-todo/
10+
.*/
1811

1912
# ember-try
2013
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/npm-shrinkwrap.json.ember-try
23-
/package.json.ember-try
24-
/package-lock.json.ember-try
25-
/yarn.lock.ember-try

.watchmanconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"ignore_dirs": ["tmp", "dist"]
2+
"ignore_dirs": ["dist"]
33
}

CONTRIBUTING.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313

1414
## Running tests
1515

16-
* `ember test` – Runs the test suite on the current Ember version
17-
* `ember test --server` – Runs the test suite in "watch mode"
18-
* `ember try:each` – Runs the test suite against multiple Ember versions
16+
* `yarn test` – Runs the test suite on the current Ember version
17+
* `yarn test:ember --server` – Runs the test suite in "watch mode"
18+
* `yarn test:ember-compatibility` – Runs the test suite against multiple Ember versions
1919

2020
## Running the dummy application
2121

22-
* `ember serve`
22+
* `yarn start`
2323
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2424

2525
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

README.md

+8-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@ This is an experimental package integrating [TypeDoc](https://typedoc.org/) with
55

66
You're welcome to try this package out, but caveat emptor: I can't make any promises that it will meet your needs, and it's thoroughly undocumented and has no automated testing.
77

8-
Installation
9-
------------------------------------------------------------------------------
8+
## Compatibility
9+
10+
* Ember.js v4.8 or above
11+
* Ember CLI v4.8 or above
12+
* Node.js v18 or above
13+
14+
15+
## Installation
1016

1117
```
1218
yarn add --dev ember-cli-addon-docs-typedoc

package.json

+31-30
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@
3131
"postpack": "ember ts:clean"
3232
},
3333
"dependencies": {
34+
"@babel/core": "^7.24.0",
3435
"broccoli-plugin": "^4.0.3",
3536
"ember-auto-import": "^2.7.2",
36-
"ember-cli-babel": "^7.26.11",
37-
"ember-cli-htmlbars": "^6.2.0",
37+
"ember-cli-babel": "^8.2.0",
38+
"ember-cli-htmlbars": "^6.3.0",
3839
"ember-cli-typescript": "^5.2.1",
3940
"ensure-posix-path": "^1.1.1",
4041
"fs-extra": "^11.2.0",
@@ -44,12 +45,11 @@
4445
"typedoc": "^0.25.8"
4546
},
4647
"devDependencies": {
47-
"@babel/eslint-parser": "^7.21.3",
48-
"@babel/plugin-proposal-decorators": "^7.21.0",
49-
"@ember/optional-features": "^2.0.0",
50-
"@ember/string": "^3.0.1",
51-
"@ember/test-helpers": "^2.9.3",
52-
"@embroider/test-setup": "^2.1.1",
48+
"@babel/eslint-parser": "^7.23.10",
49+
"@babel/plugin-proposal-decorators": "^7.24.0",
50+
"@ember/optional-features": "^2.1.0",
51+
"@ember/test-helpers": "^3.3.0",
52+
"@embroider/test-setup": "^3.0.3",
5353
"@glimmer/component": "^1.1.2",
5454
"@glimmer/tracking": "^1.1.2",
5555
"@tsconfig/ember": "^3.0.3",
@@ -83,44 +83,45 @@
8383
"@types/qunit": "^2.19.10",
8484
"@types/rsvp": "^4.0.9",
8585
"broccoli-asset-rev": "^3.0.0",
86-
"concurrently": "^8.0.1",
87-
"ember-cli": "~4.12.1",
86+
"concurrently": "^8.2.2",
87+
"ember-cli": "~5.7.0",
8888
"ember-cli-addon-docs": "^7.0.1",
89-
"ember-cli-dependency-checker": "^3.3.1",
89+
"ember-cli-clean-css": "^3.0.0",
90+
"ember-cli-dependency-checker": "^3.3.2",
9091
"ember-cli-inject-live-reload": "^2.1.0",
9192
"ember-cli-sri": "^2.1.1",
9293
"ember-cli-terser": "^4.0.2",
9394
"ember-data": "^4.12.0",
9495
"ember-load-initializers": "^2.1.2",
95-
"ember-page-title": "^7.0.0",
96-
"ember-qunit": "^6.2.0",
97-
"ember-resolver": "^10.0.0",
98-
"ember-source": "~4.12.0",
96+
"ember-page-title": "^8.2.2",
97+
"ember-qunit": "^8.0.2",
98+
"ember-resolver": "^11.0.1",
99+
"ember-source": "~5.7.0",
99100
"ember-source-channel-url": "^3.0.0",
100-
"ember-template-lint": "^5.7.2",
101-
"ember-try": "^2.0.0",
102-
"eslint": "^8.37.0",
103-
"eslint-config-prettier": "^8.8.0",
104-
"eslint-plugin-ember": "^11.5.0",
105-
"eslint-plugin-n": "^15.7.0",
106-
"eslint-plugin-prettier": "^4.2.1",
107-
"eslint-plugin-qunit": "^7.3.4",
101+
"ember-template-lint": "^5.13.0",
102+
"ember-try": "^3.0.0",
103+
"eslint": "^8.57.0",
104+
"eslint-config-prettier": "^9.1.0",
105+
"eslint-plugin-ember": "^11.12.0",
106+
"eslint-plugin-n": "^16.6.2",
107+
"eslint-plugin-prettier": "^5.1.3",
108+
"eslint-plugin-qunit": "^8.1.1",
108109
"loader.js": "^4.7.0",
109-
"prettier": "^2.8.7",
110-
"qunit": "^2.19.4",
110+
"prettier": "^3.2.5",
111+
"qunit": "^2.20.1",
111112
"qunit-dom": "^2.0.0",
112-
"stylelint": "^15.4.0",
113-
"stylelint-config-standard": "^32.0.0",
114-
"stylelint-prettier": "^3.0.0",
113+
"stylelint": "^15.11.0",
114+
"stylelint-config-standard": "^34.0.0",
115+
"stylelint-prettier": "^4.1.0",
115116
"typescript": "^5.3.3",
116-
"webpack": "^5.89.0"
117+
"webpack": "^5.90.3"
117118
},
118119
"peerDependencies": {
119120
"ember-source": "^4.0.0",
120121
"typescript": ">= 4.6"
121122
},
122123
"engines": {
123-
"node": "16.* || >= 18"
124+
"node": ">= 18"
124125
},
125126
"ember": {
126127
"edition": "octane"

0 commit comments

Comments
 (0)