Skip to content

Commit b438b42

Browse files
authored
Merge pull request #997 from ember-learn/kg-update-blueprint
2 parents 2ab1fb3 + 2c94911 commit b438b42

57 files changed

Lines changed: 2389 additions & 3509 deletions

Some content is hidden

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

.ember-cli

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
{
22
/**
3-
Ember CLI sends analytics information by default. The data is completely
4-
anonymous, but there are times when you might want to disable this behavior.
3+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
4+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
5+
*/
6+
"isTypeScriptProject": false,
57

6-
Setting `disableAnalytics` to true will prevent any data from being sent.
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.
711
*/
8-
"disableAnalytics": false,
12+
"componentAuthoringFormat": "loose",
913

1014
/**
11-
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12-
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
15+
Setting `routeAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
16+
or GTS templates for routes. "loose" is the default
1317
*/
14-
"isTypeScriptProject": false
18+
"routeAuthoringFormat": "loose"
1519
}

.eslintignore

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

.eslintrc.js

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

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ jobs:
3030
cache: pnpm
3131
node-version: ${{ env.NODE_VERSION }}
3232
- name: Install Dependencies
33-
run: pnpm install
33+
run: pnpm install --frozen-lockfile
3434
- name: Lint
35-
run: pnpm run lint
35+
run: pnpm lint
3636

3737
test:
3838
name: "Test"
@@ -46,7 +46,7 @@ jobs:
4646
with:
4747
cache: pnpm
4848
node-version: ${{ env.NODE_VERSION }}
49-
- run: pnpm install
49+
- run: pnpm install --frozen-lockfile
5050
- run: pnpm run clone
5151
- name: Run Tests
5252
env:

.gitignore

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,22 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
2-
3-
/concat-stats-for
4-
5-
# Terraform
6-
terraform.tfstate
7-
terraform.tfstate.backup
8-
.env
9-
.envrc
10-
111
# compiled output
122
/dist/
13-
/tmp/
3+
/declarations/
144

155
# dependencies
16-
/bower_components/
176
/node_modules/
187

198
# misc
20-
/.projectile
219
/.env*
2210
/.pnp*
23-
/.sass-cache
2411
/.eslintcache
25-
/connect.lock
2612
/coverage/
27-
/libpeerconnection.log
2813
/npm-debug.log*
2914
/testem.log
15+
/yarn-error.log
16+
17+
# broccoli-debug
18+
/DEBUG/
19+
3020

3121
public/json-docs/
3222
public/rev-index/
@@ -39,14 +29,3 @@ local.log
3929
# ember-api-docs-data checkout
4030
/ember-api-docs-data/
4131
/ember-api-docs-data
42-
43-
# ember-try
44-
/.node_modules.ember-try/
45-
/bower.json.ember-try
46-
/npm-shrinkwrap.json.ember-try
47-
/package.json.ember-try
48-
/package-lock.json.ember-try
49-
/yarn.lock.ember-try
50-
51-
# broccoli-debug
52-
/DEBUG/

.prettierignore

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,21 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
65
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
126

137
# misc
148
/coverage/
159
!.*
10+
.*/
11+
/pnpm-lock.yaml
12+
ember-cli-update.json
13+
*.html
14+
15+
1616
.eslintcache
1717
.lint-todo/
1818

19-
# ember-try
20-
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/npm-shrinkwrap.json.ember-try
23-
/package.json.ember-try
24-
/package-lock.json.ember-try
25-
/yarn.lock.ember-try
26-
2719
# Misc files
2820
*.md
2921
pnpm-lock.yaml

.prettierrc.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ module.exports = {
44
plugins: ['prettier-plugin-ember-template-tag'],
55
overrides: [
66
{
7-
files: '*.{js,ts,gjs,gts}',
7+
files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
88
options: {
99
singleQuote: true,
10+
templateSingleQuote: false,
1011
},
1112
},
1213
],

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

.watchmanconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"ignore_dirs": ["tmp", "dist"]
2+
"ignore_dirs": ["dist"]
33
}

app/adapters/application.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { inject as service } from '@ember/service';
1+
import { service } from '@ember/service';
22
import JSONAPIAdapter from '@ember-data/adapter/json-api';
33
import { pluralize } from 'ember-inflector';
44
import { isBlank } from '@ember/utils';

0 commit comments

Comments
 (0)