Skip to content

Commit de9d752

Browse files
RobbieTheWagnerRobbieTheWagner
authored
Run ember-cli-update to 6.4, pin ember-source to 5.12 (#2280)
* Update to Ember 6.4 * Update some TS things * Update deprecation workflow * Tweak some TS things * More TS fixes * Update owners * Fix more types * Fix more types * More TS fixes * Another one * Finish fixing types * Fix some lint * Fix some lint * Fix more lint * Fix some types * TS fixes * Finish fixing JS lint * Run prettier on everything * Get stylelint working * Remove TrackedArray * Fix sorting, revert kuler * Update kuler.ts * Update palettes-test.js
1 parent fe41135 commit de9d752

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1621
-1712
lines changed

‎.eslintignore‎

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

‎.eslintrc.js‎

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

‎.gitignore‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,6 @@
1919
/testem.log
2020
/yarn-error.log
2121

22-
# ember-try
23-
/.node_modules.ember-try/
24-
/npm-shrinkwrap.json.ember-try
25-
/package.json.ember-try
26-
/package-lock.json.ember-try
27-
/yarn.lock.ember-try
28-
2922
# broccoli-debug
3023
/DEBUG/
3124

‎.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: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,9 @@ module.exports = {
4747
importOrderSortSpecifiers,
4848
overrides: [
4949
{
50-
files: ['**/*.hbs'],
51-
options: {
52-
singleQuote: false,
53-
},
54-
},
55-
{
56-
files: '*.{js,ts,gjs,gts}',
57-
options: {
58-
singleQuote: true,
59-
},
60-
},
61-
{
62-
files: '*.{yaml,yml}',
63-
options: {
64-
singleQuote: true,
65-
},
50+
files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
51+
options: { singleQuote: true, templateSingleQuote: false },
6652
},
53+
{ files: '*.{yaml,yml}', options: { singleQuote: true } },
6754
],
6855
};

‎.stylelintignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,3 @@
33

44
# compiled output
55
/dist/
6-
7-
# addons
8-
/.node_modules.ember-try/

‎.stylelintrc.js‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
'use strict';
22

33
module.exports = {
4-
extends: ['stylelint-config-standard-scss', 'stylelint-prettier/recommended'],
4+
extends: ['stylelint-config-standard-scss'],
55
rules: {
6-
'scss/at-rule-no-unknown': [
7-
true,
8-
{
9-
ignoreAtRules: ['tailwind'],
10-
},
11-
],
6+
'at-rule-no-deprecated': [true, { ignoreAtRules: ['/^view/', 'apply'] }],
7+
'scss/at-rule-no-unknown': [true, { ignoreAtRules: ['tailwind'] }],
128
},
139
};

‎.template-lintrc.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
module.exports = {
44
extends: ['recommended'],
55
rules: {
6+
'no-at-ember-render-modifiers': false,
7+
'no-builtin-form-components': false,
68
'no-curly-component-invocation': {
79
allow: ['svg-jar', '-with-dynamic-vars'],
810
},

‎CHANGELOG.md‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
## v1.2.15 (2024-01-10)
32

43
## v1.2.14 (2024-01-10)
@@ -32,26 +31,29 @@
3231
## v1.2.0 (2024-01-07)
3332

3433
#### :bug: Bug Fix
35-
* [#1948](https://github.com/shipshapecode/swach/pull/1948) Update ember-animated, fix menu not working on contrast checker screen ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
34+
35+
- [#1948](https://github.com/shipshapecode/swach/pull/1948) Update ember-animated, fix menu not working on contrast checker screen ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
3636

3737
#### :house: Internal
38-
* [#1949](https://github.com/shipshapecode/swach/pull/1949) Update release-it ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
39-
* [#1946](https://github.com/shipshapecode/swach/pull/1946) Add gts support ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
40-
* [#1918](https://github.com/shipshapecode/swach/pull/1918) ember-cli 5.2.0 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
41-
* [#1945](https://github.com/shipshapecode/swach/pull/1945) Update linting deps, fix lint ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
42-
* [#1944](https://github.com/shipshapecode/swach/pull/1944) Node 18 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
43-
* [#1732](https://github.com/shipshapecode/swach/pull/1732) Ember 5 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
44-
* [#1646](https://github.com/shipshapecode/swach/pull/1646) ember-cli 5 beta, switch from yarn to pnpm ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
45-
* [#1644](https://github.com/shipshapecode/swach/pull/1644) Ember 4.12 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
46-
* [#1634](https://github.com/shipshapecode/swach/pull/1634) Run on ubuntu-latest ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
47-
* [#1540](https://github.com/shipshapecode/swach/pull/1540) More glint updates ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
48-
* [#1536](https://github.com/shipshapecode/swach/pull/1536) ember-cli 4.10 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
49-
* [#1504](https://github.com/shipshapecode/swach/pull/1504) Update electron deps ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
50-
* [#1405](https://github.com/shipshapecode/swach/pull/1405) Embroider 2.x ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
51-
* [#1360](https://github.com/shipshapecode/swach/pull/1360) Pin embroider to 1.8.3 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
52-
* [#1329](https://github.com/shipshapecode/swach/pull/1329) Electron 21 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
38+
39+
- [#1949](https://github.com/shipshapecode/swach/pull/1949) Update release-it ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
40+
- [#1946](https://github.com/shipshapecode/swach/pull/1946) Add gts support ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
41+
- [#1918](https://github.com/shipshapecode/swach/pull/1918) ember-cli 5.2.0 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
42+
- [#1945](https://github.com/shipshapecode/swach/pull/1945) Update linting deps, fix lint ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
43+
- [#1944](https://github.com/shipshapecode/swach/pull/1944) Node 18 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
44+
- [#1732](https://github.com/shipshapecode/swach/pull/1732) Ember 5 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
45+
- [#1646](https://github.com/shipshapecode/swach/pull/1646) ember-cli 5 beta, switch from yarn to pnpm ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
46+
- [#1644](https://github.com/shipshapecode/swach/pull/1644) Ember 4.12 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
47+
- [#1634](https://github.com/shipshapecode/swach/pull/1634) Run on ubuntu-latest ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
48+
- [#1540](https://github.com/shipshapecode/swach/pull/1540) More glint updates ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
49+
- [#1536](https://github.com/shipshapecode/swach/pull/1536) ember-cli 4.10 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
50+
- [#1504](https://github.com/shipshapecode/swach/pull/1504) Update electron deps ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
51+
- [#1405](https://github.com/shipshapecode/swach/pull/1405) Embroider 2.x ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
52+
- [#1360](https://github.com/shipshapecode/swach/pull/1360) Pin embroider to 1.8.3 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
53+
- [#1329](https://github.com/shipshapecode/swach/pull/1329) Electron 21 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
5354

5455
#### Committers: 1
56+
5557
- Robbie Wagner ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
5658

5759
## v1.1.13 (2022-08-02)

app/app.js renamed to app/app.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@ import { InitSentryForEmber } from '@sentry/ember';
44
import loadInitializers from 'ember-load-initializers';
55
import Resolver from 'ember-resolver';
66

7+
import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
8+
79
import config from 'swach/config/environment';
810

11+
if (macroCondition(isDevelopingApp())) {
12+
importSync('./deprecation-workflow');
13+
}
14+
915
InitSentryForEmber();
1016

1117
export default class App extends Application {

0 commit comments

Comments
 (0)