Skip to content

Commit 9a48fa8

Browse files
committed
update ember-cli-fastboot to v6.12.0 with ember-cli-update
# Conflicts: # packages/ember-cli-fastboot/.eslintrc.js # packages/ember-cli-fastboot/.github/workflows/ci.yml # packages/ember-cli-fastboot/README.md # packages/ember-cli-fastboot/tests/dummy/app/templates/application.hbs # packages/ember-cli-fastboot/tests/dummy/config/ember-try.js
1 parent a54e578 commit 9a48fa8

39 files changed

Lines changed: 3721 additions & 1855 deletions

.github/workflows/ci.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,15 @@
11
name: CI
22

33
on:
4-
workflow_dispatch:
5-
pull_request: {}
64
push:
7-
# Filtering branches here prevents duplicate builds from pull_request and push
85
branches:
6+
- main
97
- master
10-
- beta
11-
- 'v*'
12-
- /^greenkeeper.*$/
13-
14-
# Always run CI for tags
15-
tags:
16-
- '*'
8+
pull_request: {}
179

18-
# Early issue detection: run CI weekly on Sundays
19-
schedule:
20-
- cron: '0 6 * * 0'
10+
concurrency:
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
2113

2214
jobs:
2315
lint-all-packages:

packages/ember-cli-fastboot/.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. "strict" 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. "strict" is the default
17+
*/
18+
"routeAuthoringFormat": "strict"
719
}

packages/ember-cli-fastboot/.eslintignore

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

packages/ember-cli-fastboot/.eslintrc.js

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

packages/ember-cli-fastboot/.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/

packages/ember-cli-fastboot/.npmignore

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
/.ember-cli
88
/.env*
99
/.eslintcache
10-
/.eslintignore
11-
/.eslintrc.js
1210
/.git/
1311
/.github/
1412
/.gitignore
@@ -17,10 +15,10 @@
1715
/.stylelintignore
1816
/.stylelintrc.js
1917
/.template-lintrc.js
20-
/.travis.yml
2118
/.watchmanconfig
2219
/CONTRIBUTING.md
2320
/ember-cli-build.js
21+
/eslint.config.mjs
2422
/testem.js
2523
/test/
2624
/tests/
@@ -29,10 +27,3 @@
2927
/yarn-error.log
3028
/yarn.lock
3129
.gitkeep
32-
33-
# ember-try
34-
/.node_modules.ember-try/
35-
/npm-shrinkwrap.json.ember-try
36-
/package.json.ember-try
37-
/package-lock.json.ember-try
38-
/yarn.lock.ember-try

packages/ember-cli-fastboot/.prettierignore

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

packages/ember-cli-fastboot/.prettierrc.js

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

33
module.exports = {
4+
plugins: ['prettier-plugin-ember-template-tag'],
45
overrides: [
56
{
6-
files: '*.{js,ts}',
7+
files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
78
options: {
89
singleQuote: true,
10+
templateSingleQuote: false,
911
},
1012
},
1113
],

packages/ember-cli-fastboot/.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/
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
};

0 commit comments

Comments
 (0)