Skip to content

Commit eacf482

Browse files
committed
Merge remote-tracking branch 'origin/master' into super-rentals-tutorial
2 parents 3fe2159 + 36d7ff6 commit eacf482

File tree

858 files changed

+117820
-13629
lines changed

Some content is hidden

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

858 files changed

+117820
-13629
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

.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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ autotracking
1818
aXe
1919
backticks
2020
beforeEach
21+
BelongsTo
2122
blockquote
2223
blogPost
2324
bookmarklet
@@ -101,6 +102,7 @@ hackable
101102
HammerJS
102103
hardcode
103104
hashchange
105+
HasMany
104106
Hm
105107
Hoc
106108
htmlbars
@@ -245,6 +247,7 @@ VoiceOver
245247
voilà
246248
Voilà
247249
vscode-glimmer-syntax
250+
WarpDrive
248251
websocket
249252
working-with-html-css-and-javascript
250253
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
};

.remarkrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ exports.plugins = [
2626
],
2727
'remark-preset-lint-consistent',
2828
'remark-preset-lint-recommended',
29+
'remark-lint-heading-increment',
2930
['remark-lint-list-item-indent', 'space'],
3031
['remark-lint-list-item-bullet-indent', false],
3132
['remark-lint-code-block-style', false],

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

.stylelintrc.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
5+
rules: {
6+
'selector-class-pattern': null,
7+
'no-descending-specificity': null,
8+
},
9+
};

0 commit comments

Comments
 (0)