Skip to content

Commit c207675

Browse files
author
github-actions[bot]
committed
v6.9.0-beta.1-ember-cli
1 parent 0068698 commit c207675

27 files changed

+320
-161
lines changed

.ember-cli

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,17 @@
33
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
44
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
55
*/
6-
"isTypeScriptProject": false
6+
"isTypeScriptProject": false,
7+
8+
/**
9+
Setting `componentAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
10+
or GTS files for the component and the component rendering test. "loose" is the default.
11+
*/
12+
"componentAuthoringFormat": "strict",
13+
14+
/**
15+
Setting `routeAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
16+
or GTS templates for routes. "loose" is the default
17+
*/
18+
"routeAuthoringFormat": "strict"
719
}

.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/

.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+
};

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ You will need the following things properly installed on your computer.
99

1010
- [Git](https://git-scm.com/)
1111
- [Node.js](https://nodejs.org/) (with npm)
12-
- [Ember CLI](https://cli.emberjs.com/release/)
1312
- [Google Chrome](https://google.com/chrome/)
1413

1514
## Installation
@@ -26,12 +25,11 @@ You will need the following things properly installed on your computer.
2625

2726
### Code Generators
2827

29-
Make use of the many generators for code, try `ember help generate` for more details
28+
Make use of the many generators for code, try `npm exec ember help generate` for more details
3029

3130
### Running Tests
3231

3332
- `npm run test`
34-
- `npm run test:ember -- --server`
3533

3634
### Linting
3735

@@ -40,7 +38,7 @@ Make use of the many generators for code, try `ember help generate` for more det
4038

4139
### Building
4240

43-
- `npm exec ember build` (development)
41+
- `npm exec vite build --mode development` (development)
4442
- `npm run build` (production)
4543

4644
### Deploying
@@ -50,7 +48,7 @@ Specify what it takes to deploy your app.
5048
## Further Reading / Useful Links
5149

5250
- [ember.js](https://emberjs.com/)
53-
- [ember-cli](https://cli.emberjs.com/release/)
51+
- [Vite](https://vite.dev)
5452
- Development Browser Extensions
5553
- [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
5654
- [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)

app/app.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +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 'my-app/config/environment';
56
import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
7+
import setupInspector from '@embroider/legacy-inspector-support/ember-source-4.12';
68

79
if (macroCondition(isDevelopingApp())) {
810
importSync('./deprecation-workflow');
@@ -11,7 +13,8 @@ if (macroCondition(isDevelopingApp())) {
1113
export default class App extends Application {
1214
modulePrefix = config.modulePrefix;
1315
podModulePrefix = config.podModulePrefix;
14-
Resolver = Resolver;
16+
Resolver = Resolver.withModules(compatModules);
17+
inspector = setupInspector(this);
1518
}
1619

17-
loadInitializers(App, config.modulePrefix);
20+
loadInitializers(App, config.modulePrefix, compatModules);

0 commit comments

Comments
 (0)