Skip to content

File tree

9 files changed

+48
-75
lines changed

9 files changed

+48
-75
lines changed

.gitignore

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,5 @@
1414
/testem.log
1515
/yarn-error.log
1616

17-
# ember-try
18-
/.node_modules.ember-try/
19-
/npm-shrinkwrap.json.ember-try
20-
/package.json.ember-try
21-
/package-lock.json.ember-try
22-
/yarn.lock.ember-try
23-
2417
# broccoli-debug
2518
/DEBUG/

.prettierrc.mjs

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,11 @@
11
export default {
22
plugins: ['prettier-plugin-ember-template-tag'],
3-
singleQuote: true,
43
overrides: [
54
{
6-
files: ['*.js', '*.ts', '*.cjs', '.mjs', '.cts', '.mts', '.cts'],
7-
options: {
8-
trailingComma: 'es5',
9-
},
10-
},
11-
{
12-
files: ['*.html'],
13-
options: {
14-
singleQuote: false,
15-
},
16-
},
17-
{
18-
files: ['*.json'],
19-
options: {
20-
singleQuote: false,
21-
},
22-
},
23-
{
24-
files: ['*.hbs'],
25-
options: {
26-
singleQuote: false,
27-
},
28-
},
29-
{
30-
files: ['*.gjs', '*.gts'],
5+
files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
316
options: {
7+
singleQuote: true,
328
templateSingleQuote: false,
33-
trailingComma: 'es5',
349
},
3510
},
3611
],

app/config/environment.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ const config = loadConfigFromMeta('super-rentals');
55

66
assert(
77
'config is not an object',
8-
typeof config === 'object' && config !== null
8+
typeof config === 'object' && config !== null,
99
);
1010
assert(
1111
'modulePrefix was not detected on your config',
12-
'modulePrefix' in config && typeof config.modulePrefix === 'string'
12+
'modulePrefix' in config && typeof config.modulePrefix === 'string',
1313
);
1414
assert(
1515
'locationType was not detected on your config',
16-
'locationType' in config && typeof config.locationType === 'string'
16+
'locationType' in config && typeof config.locationType === 'string',
1717
);
1818
assert(
1919
'rootURL was not detected on your config',
20-
'rootURL' in config && typeof config.rootURL === 'string'
20+
'rootURL' in config && typeof config.rootURL === 'string',
2121
);
2222
assert(
2323
'APP was not detected on your config',
24-
'APP' in config && typeof config.APP === 'object'
24+
'APP' in config && typeof config.APP === 'object',
2525
);
2626

2727
export default config;

app/styles/app.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* stylelint-disable no-descending-specificity, media-feature-range-notation */
2-
@import url('https://fonts.googleapis.com/css?family=Lato:300,300italic,400,700,700italic');
2+
@import url("https://fonts.googleapis.com/css?family=Lato:300,300italic,400,700,700italic");
33

44
/**
55
* Base Elements
@@ -23,7 +23,7 @@ span,
2323
a,
2424
button {
2525
font-family:
26-
Lato, 'Open Sans', 'Helvetica Neue', 'Segoe UI', Helvetica, Arial,
26+
Lato, "Open Sans", "Helvetica Neue", "Segoe UI", Helvetica, Arial,
2727
sans-serif;
2828
line-height: 1.5;
2929
}
@@ -272,7 +272,7 @@ p {
272272
}
273273

274274
.rental button.image::after {
275-
content: '';
275+
content: "";
276276
position: absolute;
277277
top: 0;
278278
left: 0;
@@ -460,7 +460,7 @@ p {
460460
}
461461

462462
.tomster {
463-
background: url('../assets/images/teaching-tomster.png');
463+
background: url("../assets/images/teaching-tomster.png");
464464
background-size: contain;
465465
background-repeat: no-repeat;
466466
height: 200px;

babel.config.mjs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ export default {
2222
'module:decorator-transforms',
2323
{
2424
runtime: {
25-
import: import.meta.resolve('decorator-transforms/runtime-esm'),
25+
import: fileURLToPath(
26+
import.meta.resolve('decorator-transforms/runtime-esm'),
27+
),
2628
},
2729
},
2830
],

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/app-blueprint",
6-
"version": "6.10.4",
6+
"version": "6.12.0",
77
"blueprints": [
88
{
99
"name": "@ember/app-blueprint",
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
'use strict';
1+
import { dirname } from 'node:path';
2+
import { fileURLToPath } from 'node:url';
3+
import EmberApp from 'ember-cli/lib/broccoli/ember-app.js';
4+
import { compatBuild } from '@embroider/compat';
25

3-
const EmberApp = require('ember-cli/lib/broccoli/ember-app');
4-
const { compatBuild } = require('@embroider/compat');
5-
6-
module.exports = async function (defaults) {
6+
export default async function (defaults) {
77
const { setConfig } = await import('@warp-drive/core/build-config');
88
const { buildOnce } = await import('@embroider/vite');
99

10-
let app = new EmberApp(defaults, {
10+
const app = new EmberApp(defaults, {
1111
// Add options here
1212
});
1313

14-
setConfig(app, __dirname, {
14+
setConfig(app, dirname(fileURLToPath(import.meta.url)), {
1515
// this should be the most recent <major>.<minor> version for
1616
// which all deprecations have been fully resolved
1717
// and should be updated when that changes
@@ -22,4 +22,4 @@ module.exports = async function (defaults) {
2222
});
2323

2424
return compatBuild(app, buildOnce);
25-
};
25+
}

eslint.config.mjs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ export default defineConfig([
6060
},
6161
},
6262
{
63+
...qunit.configs.recommended,
6364
files: ['tests/**/*-test.{js,gjs}'],
6465
plugins: {
6566
qunit,
@@ -69,7 +70,8 @@ export default defineConfig([
6970
* CJS node files
7071
*/
7172
{
72-
files: ['**/*.cjs', 'config/**/*.js', 'ember-cli-build.js'],
73+
...n.configs['flat/recommended-script'],
74+
files: ['**/*.cjs', 'config/**/*.js'],
7375
plugins: {
7476
n,
7577
},
@@ -86,6 +88,7 @@ export default defineConfig([
8688
* ESM node files
8789
*/
8890
{
91+
...n.configs['flat/recommended-module'],
8992
files: ['**/*.mjs'],
9093
plugins: {
9194
n,

package.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@
3030
"test": "vite build --mode development && ember test --path dist"
3131
},
3232
"devDependencies": {
33-
"@babel/core": "^7.28.6",
33+
"@babel/core": "^7.29.0",
3434
"@babel/eslint-parser": "^7.28.6",
35-
"@babel/plugin-transform-runtime": "^7.28.5",
36-
"@babel/runtime": "^7.28.6",
37-
"@ember/optional-features": "^2.3.0",
35+
"@babel/plugin-transform-runtime": "^7.29.0",
36+
"@babel/runtime": "^7.29.2",
37+
"@ember/optional-features": "^3.0.0",
3838
"@ember/string": "^4.0.1",
3939
"@ember/test-helpers": "^5.4.1",
4040
"@ember/test-waiters": "^4.1.1",
41-
"@embroider/compat": "^4.1.12",
41+
"@embroider/compat": "^4.1.17",
4242
"@embroider/config-meta-loader": "^1.0.0",
43-
"@embroider/core": "^4.4.2",
43+
"@embroider/core": "^4.4.7",
4444
"@embroider/legacy-inspector-support": "^0.1.3",
45-
"@embroider/macros": "^1.19.6",
45+
"@embroider/macros": "^1.20.2",
4646
"@embroider/router": "^3.0.6",
47-
"@embroider/vite": "^1.5.0",
48-
"@eslint/js": "^9.39.2",
47+
"@embroider/vite": "^1.7.2",
48+
"@eslint/js": "^9.39.4",
4949
"@glimmer/component": "^2.0.0",
5050
"@rollup/plugin-babel": "^6.1.0",
5151
"@warp-drive/core": "~5.8.1",
@@ -56,35 +56,35 @@
5656
"babel-plugin-ember-template-compilation": "^3.1.0",
5757
"concurrently": "^9.2.1",
5858
"decorator-transforms": "^2.3.1",
59-
"ember-cli": "~6.10.0",
60-
"ember-cli-babel": "^8.2.0",
59+
"ember-cli": "~6.11.2",
60+
"ember-cli-babel": "^8.3.1",
6161
"ember-cli-deprecation-workflow": "^3.4.0",
6262
"ember-load-initializers": "^3.0.1",
63-
"ember-modifier": "^4.2.2",
63+
"ember-modifier": "^4.3.0",
6464
"ember-page-title": "^9.0.3",
6565
"ember-qunit": "^9.0.4",
66-
"ember-resolver": "^13.1.1",
67-
"ember-source": "~6.10.0",
66+
"ember-resolver": "^13.2.0",
67+
"ember-source": "~6.12.0",
6868
"ember-template-lint": "^7.9.3",
6969
"ember-welcome-page": "^8.0.5",
70-
"eslint": "^9.39.2",
70+
"eslint": "^9.39.4",
7171
"eslint-config-prettier": "^10.1.8",
7272
"eslint-plugin-ember": "^12.7.5",
73-
"eslint-plugin-n": "^17.23.2",
74-
"eslint-plugin-qunit": "^8.2.5",
73+
"eslint-plugin-n": "^17.24.0",
74+
"eslint-plugin-qunit": "^8.2.6",
7575
"eslint-plugin-warp-drive": "^5.8.1",
7676
"globals": "^16.5.0",
77-
"prettier": "^3.8.0",
78-
"prettier-plugin-ember-template-tag": "^2.1.2",
77+
"prettier": "^3.8.1",
78+
"prettier-plugin-ember-template-tag": "^2.1.3",
7979
"qunit": "^2.25.0",
8080
"qunit-dom": "^3.5.0",
8181
"stylelint": "^16.26.1",
8282
"stylelint-config-standard": "^38.0.0",
83-
"testem": "^3.17.0",
83+
"testem": "^3.19.1",
8484
"vite": "^7.3.1"
8585
},
8686
"engines": {
87-
"node": ">= 20"
87+
"node": ">= 20.19.0"
8888
},
8989
"ember": {
9090
"edition": "octane"

0 commit comments

Comments
 (0)