Skip to content

Commit addef76

Browse files
author
github-actions[bot]
committed
v6.3.0-beta.1
1 parent 8f7c3de commit addef76

File tree

10 files changed

+47
-18
lines changed

10 files changed

+47
-18
lines changed

.npmignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
/.stylelintignore
1616
/.stylelintrc.js
1717
/.template-lintrc.js
18-
/.travis.yml
1918
/.watchmanconfig
2019
/CONTRIBUTING.md
2120
/ember-cli-build.js

.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
/coverage/
99
!.*
1010
.*/
11+
/pnpm-lock.yaml
12+
ember-cli-update.json
13+
*.html
1114

1215
# ember-try
1316
/.node_modules.ember-try/

.prettierrc.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ module.exports = {
55
overrides: [
66
{
77
files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
8-
options: {
9-
singleQuote: true,
10-
},
11-
},
12-
{
13-
files: '*.{gjs,gts}',
148
options: {
159
singleQuote: true,
1610
templateSingleQuote: false,

.stylelintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
4+
extends: ['stylelint-config-standard'],
55
};

eslint.config.mjs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import globals from 'globals';
1616
import js from '@eslint/js';
1717

1818
import ember from 'eslint-plugin-ember/recommended';
19-
import prettier from 'eslint-plugin-prettier/recommended';
19+
import eslintConfigPrettier from 'eslint-config-prettier';
2020
import qunit from 'eslint-plugin-qunit';
2121
import n from 'eslint-plugin-n';
2222

@@ -35,7 +35,7 @@ const esmParserOptions = {
3535

3636
export default [
3737
js.configs.recommended,
38-
prettier,
38+
eslintConfigPrettier,
3939
ember.configs.base,
4040
ember.configs.gjs,
4141
/**
@@ -81,8 +81,10 @@ export default [
8181
files: [
8282
'**/*.cjs',
8383
'config/**/*.js',
84+
'tests/dummy/config/**/*.js',
8485
'testem.js',
8586
'testem*.js',
87+
'index.js',
8688
'.prettierrc.js',
8789
'.stylelintrc.js',
8890
'.template-lintrc.js',

package.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
1414
},
1515
"scripts": {
1616
"build": "ember build --environment=production",
17+
"format": "prettier . --cache --write",
1718
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\" --prefixColors auto",
1819
"lint:css": "stylelint \"**/*.css\"",
1920
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
20-
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\" --prefixColors auto",
21+
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\" --prefixColors auto && npm run format",
22+
"lint:format": "prettier . --cache --check",
2123
"lint:hbs": "ember-template-lint .",
2224
"lint:hbs:fix": "ember-template-lint . --fix",
2325
"lint:js": "eslint . --cache",
@@ -37,33 +39,34 @@
3739
"@babel/eslint-parser": "^7.26.5",
3840
"@babel/plugin-proposal-decorators": "^7.25.9",
3941
"@ember/optional-features": "^2.2.0",
40-
"@ember/test-helpers": "^4.0.5",
42+
"@ember/test-helpers": "^5.1.0",
43+
"@embroider/macros": "^1.16.10",
4144
"@embroider/test-setup": "^4.0.0",
4245
"@eslint/js": "^9.19.0",
43-
"@glimmer/component": "^1.1.2",
46+
"@glimmer/component": "^2.0.0",
4447
"@glimmer/tracking": "^1.1.2",
4548
"broccoli-asset-rev": "^3.0.0",
4649
"concurrently": "^9.1.2",
4750
"ember-auto-import": "^2.10.0",
48-
"ember-cli": "~6.2.1",
51+
"ember-cli": "~6.3.0-beta.1",
4952
"ember-cli-clean-css": "^3.0.0",
5053
"ember-cli-dependency-checker": "^3.3.3",
54+
"ember-cli-deprecation-workflow": "^3.1.0",
5155
"ember-cli-inject-live-reload": "^2.1.0",
5256
"ember-cli-sri": "^2.1.1",
5357
"ember-cli-terser": "^4.0.2",
5458
"ember-load-initializers": "^3.0.1",
5559
"ember-page-title": "^8.2.3",
5660
"ember-qunit": "^9.0.1",
5761
"ember-resolver": "^13.1.0",
58-
"ember-source": "~6.2.0",
62+
"ember-source": "~6.3.0-beta.1",
5963
"ember-source-channel-url": "^3.0.0",
6064
"ember-template-lint": "^6.1.0",
6165
"ember-try": "^3.0.0",
6266
"eslint": "^9.19.0",
6367
"eslint-config-prettier": "^9.1.0",
6468
"eslint-plugin-ember": "^12.5.0",
6569
"eslint-plugin-n": "^17.15.1",
66-
"eslint-plugin-prettier": "^5.2.3",
6770
"eslint-plugin-qunit": "^8.1.2",
6871
"globals": "^15.14.0",
6972
"loader.js": "^4.7.0",
@@ -73,7 +76,6 @@
7376
"qunit-dom": "^3.4.0",
7477
"stylelint": "^16.14.1",
7578
"stylelint-config-standard": "^36.0.1",
76-
"stylelint-prettier": "^5.0.3",
7779
"webpack": "^5.97.1"
7880
},
7981
"peerDependencies": {

tests/dummy/app/app.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ import Application from '@ember/application';
22
import Resolver from 'ember-resolver';
33
import loadInitializers from 'ember-load-initializers';
44
import config from 'dummy/config/environment';
5+
import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
6+
7+
if (macroCondition(isDevelopingApp())) {
8+
importSync('./deprecation-workflow');
9+
}
510

611
export default class App extends Application {
712
modulePrefix = config.modulePrefix;
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import setupDeprecationWorkflow from 'ember-cli-deprecation-workflow';
2+
3+
/**
4+
* Docs: https://github.com/ember-cli/ember-cli-deprecation-workflow
5+
*/
6+
setupDeprecationWorkflow({
7+
/**
8+
false by default, but if a developer / team wants to be more aggressive about being proactive with
9+
handling their deprecations, this should be set to "true"
10+
*/
11+
throwOnUnhandled: false,
12+
workflow: [
13+
/* ... handlers ... */
14+
/* to generate this list, run your app for a while (or run the test suite),
15+
* and then run in the browser console:
16+
*
17+
* deprecationWorkflow.flushDeprecations()
18+
*
19+
* And copy the handlers here
20+
*/
21+
/* example: */
22+
/* { handler: 'silence', matchId: 'template-action' }, */
23+
],
24+
});

tests/dummy/app/models/.gitkeep

Whitespace-only changes.

tests/dummy/config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "6.2.1",
6+
"version": "6.3.0-beta.1",
77
"blueprints": [
88
{
99
"name": "addon",

0 commit comments

Comments
 (0)