Skip to content

Some content is hidden

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

67 files changed

+917
-764
lines changed

.ember-cli

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
Setting `componentAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
1010
or GTS files for the component and the component rendering test. "loose" is the default.
1111
*/
12-
"componentAuthoringFormat": "loose",
12+
"componentAuthoringFormat": "strict",
1313

1414
/**
1515
Setting `routeAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
1616
or GTS templates for routes. "loose" is the default
1717
*/
18-
"routeAuthoringFormat": "loose"
18+
"routeAuthoringFormat": "strict"
1919
}

.env.development

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# This file is committed to git and should not contain any secrets.
2+
#
3+
# Vite recommends using .env.local or .env.[mode].local if you need to manage secrets
4+
# SEE: https://vite.dev/guide/env-and-mode.html#env-files for more information.
5+
6+
7+
# Default NODE_ENV with vite build --mode=test is production
8+
NODE_ENV=development

.gitignore

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
11
# compiled output
22
/dist/
33
/declarations/
4+
/tmp/
45

56
# dependencies
67
/node_modules/
78

89
# misc
9-
/.env*
10+
*.local
1011
/.pnp*
1112
/.eslintcache
1213
/coverage/
1314
/npm-debug.log*
1415
/testem.log
1516
/yarn-error.log
1617

18+
# ember-try
19+
/.node_modules.ember-try/
20+
/npm-shrinkwrap.json.ember-try
21+
/package.json.ember-try
22+
/package-lock.json.ember-try
23+
/yarn.lock.ember-try
24+
1725
# broccoli-debug
1826
/DEBUG/

.prettierignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
**/*.hbs
1+
**/*.gjs
22
# unconventional js
33
/blueprints/*/files/
44

.prettierrc.js

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

.prettierrc.mjs

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
export default {
2+
plugins: ['prettier-plugin-ember-template-tag'],
3+
singleQuote: true,
4+
overrides: [
5+
{
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'],
31+
options: {
32+
templateSingleQuote: false,
33+
trailingComma: 'es5',
34+
},
35+
},
36+
],
37+
};
File renamed without changes.

.template-lintrc.js

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

.template-lintrc.mjs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export default {
2+
extends: 'recommended',
3+
};

app/app.js

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,10 @@
11
import Application from '@ember/application';
2+
import compatModules from '@embroider/virtual/compat-modules';
23
import Resolver from 'ember-resolver';
34
import loadInitializers from 'ember-load-initializers';
45
import config from 'super-rentals/config/environment';
56
import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
6-
import { setBuildURLConfig } from '@ember-data/request-utils';
7-
8-
setBuildURLConfig({
9-
namespace: 'api',
10-
});
11-
12-
/* This is to account for a deprecation that shipped in ember-cli 6.4
13-
with ember-data v5.6 which needs a blueprint update to avoid the
14-
deprecation that is otherwise irrelevant for tutorial purposes.
15-
*/
16-
import { registerDeprecationHandler } from '@ember/debug';
17-
registerDeprecationHandler((message, options, next) => {
18-
if (message.includes('Using WarpDrive with EmberJS requires')) {
19-
return;
20-
} else {
21-
next(message, options);
22-
}
23-
});
7+
import setupInspector from '@embroider/legacy-inspector-support/ember-source-4.12';
248

259
if (macroCondition(isDevelopingApp())) {
2610
importSync('./deprecation-workflow');
@@ -29,7 +13,13 @@ if (macroCondition(isDevelopingApp())) {
2913
export default class App extends Application {
3014
modulePrefix = config.modulePrefix;
3115
podModulePrefix = config.podModulePrefix;
32-
Resolver = Resolver;
16+
Resolver = Resolver.withModules(compatModules);
17+
inspector = setupInspector(this);
3318
}
3419

35-
loadInitializers(App, config.modulePrefix);
20+
loadInitializers(App, config.modulePrefix, compatModules);
21+
import { setBuildURLConfig } from '@ember-data/request-utils';
22+
23+
setBuildURLConfig({
24+
namespace: 'api',
25+
});

0 commit comments

Comments
 (0)