Skip to content

Commit 31873ef

Browse files
Merge branch 'master' into new-emberData/finding-records
2 parents 10ab3aa + 2164479 commit 31873ef

File tree

1,215 files changed

+184932
-74371
lines changed

Some content is hidden

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

1,215 files changed

+184932
-74371
lines changed

.ember-cli

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
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.
5-
6-
Setting `disableAnalytics` to true will prevent any data from being sent.
7-
*/
8-
"disableAnalytics": false,
9-
10-
/**
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.
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.
135
*/
146
"isTypeScriptProject": false
157
}

.eslintignore

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,15 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
5+
/declarations/
66
/dist/
7-
/tmp/
87
/public/assets/
98

10-
# dependencies
11-
/bower_components/
12-
/node_modules/
13-
149
# misc
1510
/coverage/
1611
!.*
1712
.*/
18-
.eslintcache
1913

2014
# ember-try
2115
/.node_modules.ember-try/
22-
/bower.json.ember-try
23-
/npm-shrinkwrap.json.ember-try
24-
/package.json.ember-try
25-
/package-lock.json.ember-try
26-
/yarn.lock.ember-try

.eslintrc.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
module.exports = {
44
root: true,
5-
parser: 'babel-eslint',
5+
parser: '@babel/eslint-parser',
66
parserOptions: {
7-
ecmaVersion: 2018,
7+
ecmaVersion: 'latest',
88
sourceType: 'module',
9-
ecmaFeatures: {
10-
legacyDecorators: true,
9+
requireConfigFile: false,
10+
babelOptions: {
11+
plugins: [
12+
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
13+
],
1114
},
1215
},
1316
plugins: ['ember'],
@@ -26,6 +29,7 @@ module.exports = {
2629
files: [
2730
'./.eslintrc.js',
2831
'./.prettierrc.js',
32+
'./.stylelintrc.js',
2933
'./.template-lintrc.js',
3034
'./ember-cli-build.js',
3135
'./testem.js',
@@ -42,18 +46,15 @@ module.exports = {
4246
browser: false,
4347
node: true,
4448
},
45-
plugins: ['node'],
46-
extends: ['plugin:node/recommended'],
47-
rules: {
48-
// this can be removed once the following is fixed
49-
// https://github.com/mysticatea/eslint-plugin-node/issues/77
50-
'node/no-unpublished-require': 'off',
51-
},
49+
extends: ['plugin:n/recommended'],
5250
},
5351
{
5452
// test files
5553
files: ['tests/**/*-test.{js,ts}'],
5654
extends: ['plugin:qunit/recommended'],
55+
rules: {
56+
'qunit/require-expect': 'off',
57+
},
5758
},
5859
{
5960
// Node tests

.github/actions/setup/action.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Setup node and pnpm
2+
description: Setup node and install dependencies using pnpm
3+
inputs:
4+
use_lockfile:
5+
description: 'Whether to use the lockfile vs latest floating dependencies'
6+
required: false
7+
default: 'true'
8+
use_pinned_node:
9+
description: 'Whether to use the node version defined in .npmrc'
10+
required: false
11+
default: 'false'
12+
runs:
13+
using: 'composite'
14+
steps:
15+
- uses: pnpm/action-setup@v4
16+
name: Install pnpm
17+
with:
18+
run_install: false
19+
- uses: actions/setup-node@v4
20+
with:
21+
node-version: 20
22+
cache: pnpm
23+
- run: pnpm install ${{ fromJSON('{"false":"--no-lockfile", "true":"--frozen-lockfile"}')[inputs.use_lockfile] }}
24+
shell: bash

.github/workflows/ci.yml

Lines changed: 9 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ on:
77
pull_request:
88

99
env:
10-
NODE_VERSION: 20
1110
NODE_OPTIONS: '--max_old_space_size=4096'
1211

1312
jobs:
@@ -17,41 +16,23 @@ jobs:
1716
timeout-minutes: 7
1817
steps:
1918
- name: Check out a copy of the repo
20-
uses: actions/checkout@v3
21-
22-
- name: Use Node.js ${{ env.NODE_VERSION }}
23-
uses: actions/setup-node@v3
24-
with:
25-
cache: 'npm'
26-
node-version: ${{ env.NODE_VERSION }}
27-
28-
- run: npm i -g npm@9
29-
- run: npm ci
30-
19+
uses: actions/checkout@v4
20+
- uses: ./.github/actions/setup
3121
- name: Lint
32-
run: npm run lint
22+
run: pnpm run lint
3323

3424
test-app:
3525
name: Test app
3626
runs-on: ubuntu-latest
3727
timeout-minutes: 7
3828
steps:
3929
- name: Check out a copy of the repo
40-
uses: actions/checkout@v3
41-
42-
- name: Use Node.js ${{ env.NODE_VERSION }}
43-
uses: actions/setup-node@v3
44-
with:
45-
cache: 'npm'
46-
node-version: ${{ env.NODE_VERSION }}
47-
48-
- run: npm i -g npm@9
49-
- run: npm ci
50-
30+
uses: actions/checkout@v4
31+
- uses: ./.github/actions/setup
5132
- name: Test
5233
uses: percy/[email protected]
5334
with:
54-
custom-command: npm run test:ember
35+
custom-command: pnpm run test:ember
5536
env:
5637
PERCY_TOKEN: 877df6aad8486060f69a34864b6cd33f870633743b23411343737c46a875a762
5738

@@ -61,16 +42,7 @@ jobs:
6142
timeout-minutes: 7
6243
steps:
6344
- name: Check out a copy of the repo
64-
uses: actions/checkout@v2
65-
66-
- name: Use Node.js ${{ env.NODE_VERSION }}
67-
uses: actions/setup-node@v2
68-
with:
69-
cache: 'npm'
70-
node-version: ${{ env.NODE_VERSION }}
71-
72-
- run: npm i -g npm@9
73-
- run: npm ci
74-
45+
uses: actions/checkout@v4
46+
- uses: ./.github/actions/setup
7547
- name: Test
76-
run: npm run test:node
48+
run: pnpm run test:node

.gitignore

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,22 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
2-
31
# compiled output
42
/dist/
5-
/tmp/
3+
/declarations/
64

75
# dependencies
8-
/bower_components/
96
/node_modules/
107

118
# misc
129
/.env*
1310
/.pnp*
14-
/.sass-cache
1511
/.eslintcache
16-
/connect.lock
1712
/coverage/
18-
/libpeerconnection.log
1913
/npm-debug.log*
2014
/testem.log
2115
/yarn-error.log
2216
.DS_Store
2317

2418
# ember-try
2519
/.node_modules.ember-try/
26-
/bower.json.ember-try
2720
/npm-shrinkwrap.json.ember-try
2821
/package.json.ember-try
2922
/package-lock.json.ember-try

.local.dic

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,21 @@ autotracking
1818
aXe
1919
backticks
2020
beforeEach
21+
BelongsTo
2122
blockquote
2223
blogPost
2324
bookmarklet
2425
Browserlist
2526
callouts
2627
camelize
28+
centric
2729
Chai
2830
chainable
2931
cheatsheet
3032
checkboxes
3133
Checkboxes
3234
coc-ember
35+
CodeLobster
3336
CoffeeScript
3437
ColorSafe
3538
componentized
@@ -99,6 +102,7 @@ hackable
99102
HammerJS
100103
hardcode
101104
hashchange
105+
HasMany
102106
Hm
103107
Hoc
104108
htmlbars
@@ -173,6 +177,7 @@ repos
173177
rerender
174178
rerendering
175179
rerenders
180+
RequestManager
176181
routable
177182
RunDOC
178183
runnable
@@ -213,6 +218,7 @@ TextMate
213218
todo
214219
todos
215220
tooltip
221+
tooltips
216222
trackable
217223
Trackable
218224
Treeshaking
@@ -241,6 +247,7 @@ VoiceOver
241247
voilà
242248
Voilà
243249
vscode-glimmer-syntax
250+
WarpDrive
244251
websocket
245252
working-with-html-css-and-javascript
246253
yay

.prettierignore

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
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
!.*
16-
.eslintcache
17-
.lint-todo/
10+
.*/
1811

1912
# ember-try
2013
/.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

.prettierrc.js

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

33
module.exports = {
4-
singleQuote: true,
4+
overrides: [
5+
{
6+
files: '*.{js,ts}',
7+
options: {
8+
singleQuote: true,
9+
},
10+
},
11+
],
512
};

.stylelintignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# unconventional files
2+
/blueprints/*/files/
3+
4+
# compiled output
5+
/dist/
6+
/public/assets
7+
8+
# addons
9+
/.node_modules.ember-try/

0 commit comments

Comments
 (0)