Skip to content

Commit c29e233

Browse files
authored
Merge pull request #531 from ember-learn/update
update to v5.12 with ember-cli-update
2 parents fa716fe + c1c5338 commit c29e233

18 files changed

+826
-546
lines changed

.ember-cli

Lines changed: 0 additions & 8 deletions
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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
/vendor/
44

55
# compiled output
6+
/declarations/
67
/dist/
78
/tmp/
89
/dist-*

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ jobs:
8686
- ember-lts-3.28
8787
- ember-lts-4.4
8888
- ember-lts-4.8
89+
- ember-lts-4.12
90+
- ember-lts-5.4
91+
- ember-lts-5.8
8992
- ember-release
9093
- ember-beta
9194
- embroider-safe

.gitignore

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,23 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
2-
31
# compiled output
42
/dist/
53
/dist-*
64
/tmp/
5+
/declarations/
76

87
# dependencies
9-
/bower_components/
108
/node_modules/
119

1210
# misc
1311
/.env*
1412
/.pnp*
15-
/.sass-cache
1613
/.eslintcache
17-
/connect.lock
1814
/coverage/
19-
/libpeerconnection.log
2015
/npm-debug.log*
2116
/testem.log
2217
/yarn-error.log
2318

2419
# ember-try
2520
/.node_modules.ember-try/
26-
/bower.json.ember-try
2721
/npm-shrinkwrap.json.ember-try
2822
/package.json.ember-try
2923
/package-lock.json.ember-try

.npmignore

Lines changed: 2 additions & 6 deletions
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,18 +19,18 @@
2319
/.template-lintrc.js
2420
/.travis.yml
2521
/.watchmanconfig
26-
/bower.json
2722
/CONTRIBUTING.md
2823
/ember-cli-build.js
2924
/testem.js
3025
/tests/
26+
/tsconfig.declarations.json
27+
/tsconfig.json
3128
/yarn-error.log
3229
/yarn.lock
3330
.gitkeep
3431

3532
# ember-try
3633
/.node_modules.ember-try/
37-
/bower.json.ember-try
3834
/npm-shrinkwrap.json.ember-try
3935
/package.json.ember-try
4036
/package-lock.json.ember-try

.prettierignore

Lines changed: 1 addition & 13 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,24 @@
22

33
## Installation
44

5-
* `git clone <repository-url>`
6-
* `cd my-addon`
7-
* `pnpm install`
5+
- `git clone <repository-url>`
6+
- `cd ember-styleguide`
7+
- `pnpm install`
88

99
## Linting
1010

11-
* `pnpm run lint`
12-
* `pnpm run lint:fix`
11+
- `pnpm lint`
12+
- `pnpm lint:fix`
1313

1414
## Running tests
1515

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

2120
## Running the dummy application
2221

23-
* `ember serve`
24-
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
22+
- `pnpm start`
23+
- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2524

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

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
This addon is intended to provide basic components for easier style coordination among the Ember family of websites, although the original intent is to support the emberjs.com website. We are committed to the goal of meeting WCAG 2.0 AA conformance standards.
99

10-
1110
## Compatibility
1211

1312
* Ember.js v3.24 or above

addon/components/es-header-navbar-link.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* eslint-disable ember/no-classic-components, ember/no-classic-classes, ember/require-tagless-components, prettier/prettier, ember/no-get, ember/no-component-lifecycle-hooks, ember/require-super-in-lifecycle-hooks */
1+
/* eslint-disable ember/no-classic-classes, ember/no-classic-components, ember/no-component-lifecycle-hooks, ember/no-get, ember/no-runloop, ember/no-tracked-properties-from-args, ember/require-super-in-lifecycle-hooks, ember/require-tagless-components, prettier/prettier */
22
import Component from '@glimmer/component';
33
import { inject as service } from '@ember/service';
44
import { schedule, next } from '@ember/runloop';

addon/components/es-icon.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable prettier/prettier */
12
import Component from '@glimmer/component';
23
import { assert } from '@ember/debug';
34

addon/styles/components/es-header.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* stylelint-disable alpha-value-notation, color-function-notation, media-feature-range-notation, no-descending-specificity, scale-unlimited/declaration-strict-value */
1+
/* stylelint-disable alpha-value-notation, color-function-notation, media-feature-range-notation, no-descending-specificity, prettier/prettier, scale-unlimited/declaration-strict-value */
22
.es-header {
33
display: flex;
44
justify-content: center;

addon/styles/typography.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* stylelint-disable prettier/prettier */
12
@font-face {
23
font-family: "Inter web";
34
font-style: normal;

package.json

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,31 @@
1818
},
1919
"scripts": {
2020
"build": "bottled-ember build --ember-version 5.12 --deps field-guide,field-guide-default-template,ember-cli-fastboot,prember --links docs,public,docs-styles:app/styles,config/fastboot.js --no-overlay --environment=production",
21-
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
21+
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
2222
"lint:css": "stylelint \"**/*.css\"",
23-
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
24-
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
23+
"lint:css:fix": "concurrently \"pnpm:lint:css -- --fix\"",
24+
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
2525
"lint:hbs": "ember-template-lint .",
2626
"lint:hbs:fix": "ember-template-lint . --fix",
2727
"lint:js": "eslint . --cache",
2828
"lint:js:fix": "eslint . --fix",
2929
"start": "concurrently \"npm:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow",
3030
"start:tests": "ember serve -p 0",
3131
"start:docs": "bottled-ember serve --ember-version 5.12 --output-path dist-bottled-docs --deps field-guide,field-guide-default-template,ember-cli-fastboot,prember,@percy/cli,@percy/ember --links docs,public,percy-test:tests/acceptance,docs-styles:app/styles,config/fastboot.js --cache-name docs --no-overlay",
32-
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
32+
"test": "concurrently \"pnpm:lint\" \"pnpm:test:*\" --names \"lint,test:\"",
3333
"test:docs": "bottled-ember test --ember-version 5.12 --output-path dist-bottled-docs --deps field-guide,field-guide-default-template,ember-cli-fastboot,prember,@percy/cli,@percy/ember --links docs,public,percy-test:tests/acceptance,docs-styles:app/styles,config/fastboot.js --cache-name docs --no-overlay",
3434
"test:ember": "ember test",
3535
"ember-compatibility-tests": "ember try:all"
3636
},
3737
"dependencies": {
38+
"@babel/core": "^7.25.2",
3839
"@ember/render-modifiers": "^2.0.2",
3940
"@glimmer/component": "^1.1.2",
4041
"broccoli-funnel": "^3.0.2",
4142
"broccoli-merge-trees": "^4.2.0",
4243
"ember-auto-import": "^2.10.0",
43-
"ember-cli-babel": "^7.26.11",
44-
"ember-cli-htmlbars": "^6.2.0",
44+
"ember-cli-babel": "^8.2.0",
45+
"ember-cli-htmlbars": "^6.3.0",
4546
"ember-cli-postcss": "^8.2.0",
4647
"ember-concurrency": "^2.2.0",
4748
"ember-named-blocks-polyfill": "^0.2.5",
@@ -54,21 +55,21 @@
5455
"static-postcss-addon-tree": "^2.0.0"
5556
},
5657
"devDependencies": {
57-
"@babel/eslint-parser": "^7.21.3",
58-
"@babel/plugin-proposal-decorators": "^7.21.0",
59-
"@ember/optional-features": "^2.0.0",
60-
"@ember/string": "^3.0.1",
61-
"@ember/test-helpers": "^2.9.3",
62-
"@embroider/test-setup": "^3.0.0",
58+
"@babel/eslint-parser": "^7.25.1",
59+
"@babel/plugin-proposal-decorators": "^7.24.7",
60+
"@ember/optional-features": "^2.1.0",
61+
"@ember/test-helpers": "^3.3.1",
62+
"@embroider/test-setup": "^4.0.0",
6363
"@glimmer/tracking": "^1.1.2",
6464
"@percy/cli": "^1.27.7",
6565
"@percy/ember": "^4.2.0",
6666
"bottled-ember": "^1.1.0",
6767
"broccoli-asset-rev": "^3.0.0",
68-
"concurrently": "^8.0.1",
68+
"concurrently": "^8.2.2",
6969
"ember-array-helper": "^5.1.0",
70-
"ember-cli": "~4.12.3",
71-
"ember-cli-dependency-checker": "^3.3.1",
70+
"ember-cli": "~5.12.0",
71+
"ember-cli-clean-css": "^3.0.0",
72+
"ember-cli-dependency-checker": "^3.3.2",
7273
"ember-cli-fastboot": "^4.1.2",
7374
"ember-cli-inject-live-reload": "^2.1.0",
7475
"ember-cli-netlify": "^0.4.1",
@@ -78,38 +79,38 @@
7879
"ember-fetch": "^8.1.1",
7980
"ember-load-initializers": "^2.1.2",
8081
"ember-native-dom-helpers": "^0.6.2",
81-
"ember-page-title": "^7.0.0",
82-
"ember-qunit": "^6.2.0",
83-
"ember-resolver": "^10.0.0",
82+
"ember-page-title": "^8.2.3",
83+
"ember-qunit": "^8.1.0",
84+
"ember-resolver": "^12.0.1",
8485
"ember-scroll": "^1.0.3",
8586
"ember-sinon": "^2.2.0",
86-
"ember-source": "~4.12.0",
87+
"ember-source": "~5.12.0",
8788
"ember-source-channel-url": "^3.0.0",
8889
"ember-template-lint": "^7.7.0",
8990
"ember-try": "^3.0.0",
90-
"eslint": "^8.37.0",
91-
"eslint-config-prettier": "^8.8.0",
92-
"eslint-plugin-ember": "^11.5.0",
93-
"eslint-plugin-n": "^15.7.0",
94-
"eslint-plugin-prettier": "^4.2.1",
95-
"eslint-plugin-qunit": "^7.3.4",
91+
"eslint": "^8.57.1",
92+
"eslint-config-prettier": "^9.1.0",
93+
"eslint-plugin-ember": "^12.2.1",
94+
"eslint-plugin-n": "^16.6.2",
95+
"eslint-plugin-prettier": "^5.2.1",
96+
"eslint-plugin-qunit": "^8.1.2",
9697
"lint-to-the-future": "^2.6.3",
9798
"lint-to-the-future-ember-template": "^3.1.0",
9899
"lint-to-the-future-eslint": "^3.1.0",
99100
"lint-to-the-future-stylelint": "^2.1.0",
100101
"loader.js": "^4.7.0",
101102
"pnpm": "^7.0.0",
102103
"prember": "^2.0.0",
103-
"prettier": "^2.8.7",
104-
"qunit": "^2.19.4",
105-
"qunit-dom": "^2.0.0",
104+
"prettier": "^3.3.3",
105+
"qunit": "^2.22.0",
106+
"qunit-dom": "^3.2.1",
106107
"release-plan": "^0.16.0",
107-
"stylelint": "^15.4.0",
108-
"stylelint-config-standard": "^32.0.0",
108+
"stylelint": "^15.11.0",
109+
"stylelint-config-standard": "^34.0.0",
109110
"stylelint-declaration-strict-value": "^1.8.0",
110111
"stylelint-order": "^4.0.0",
111-
"stylelint-prettier": "^3.0.0",
112-
"webpack": "^5.78.0"
112+
"stylelint-prettier": "^4.1.0",
113+
"webpack": "^5.95.0"
113114
},
114115
"packageManager": "pnpm@10.11.0+sha512.6540583f41cc5f628eb3d9773ecee802f4f9ef9923cc45b69890fb47991d4b092964694ec3a4f738a420c918a333062c8b925d312f42e4f0c263eb603551f977",
115116
"engines": {

0 commit comments

Comments
 (0)