Skip to content

Commit 82645d8

Browse files
authored
Merge pull request #1717 from ember-learn/website-redesign
Update to the new website redesign template
2 parents 5c17687 + 1fa1d3c commit 82645d8

Some content is hidden

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

48 files changed

+27065
-19583
lines changed

.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
# misc
1515
/coverage/
1616
!.*
17+
.*/
18+
.eslintcache
1719

1820
# ember-try
1921
/.node_modules.ember-try/

.eslintrc.js

Lines changed: 40 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,60 +7,68 @@ module.exports = {
77
ecmaVersion: 2018,
88
sourceType: 'module',
99
ecmaFeatures: {
10-
legacyDecorators: true
11-
}
10+
legacyDecorators: true,
11+
},
1212
},
13-
plugins: [
14-
'ember'
15-
],
13+
plugins: ['ember'],
1614
extends: [
1715
'eslint:recommended',
18-
'plugin:ember/recommended'
16+
'plugin:ember/recommended',
17+
'plugin:prettier/recommended',
1918
],
2019
env: {
21-
browser: true
22-
},
23-
rules: {
24-
'ember/no-jquery': 'error'
20+
browser: true,
2521
},
22+
rules: {},
2623
overrides: [
2724
// node files
2825
{
2926
files: [
30-
'.eslintrc.js',
31-
'.template-lintrc.js',
32-
'ember-cli-build.js',
33-
'testem.js',
34-
'blueprints/*/index.js',
35-
'config/**/*.js',
36-
'lib/*/index.js',
37-
'server/**/*.js'
27+
'./.eslintrc.js',
28+
'./.prettierrc.js',
29+
'./.template-lintrc.js',
30+
'./ember-cli-build.js',
31+
'./testem.js',
32+
'./blueprints/*/index.js',
33+
'./config/**/*.js',
34+
'./lib/*/index.js',
35+
'./server/**/*.js',
3836
],
3937
parserOptions: {
40-
sourceType: 'script'
38+
sourceType: 'script',
4139
},
4240
env: {
4341
browser: false,
44-
node: true
45-
}
42+
node: true,
43+
},
44+
plugins: ['node'],
45+
extends: ['plugin:node/recommended'],
46+
rules: {
47+
// this can be removed once the following is fixed
48+
// https://github.com/mysticatea/eslint-plugin-node/issues/77
49+
'node/no-unpublished-require': 'off',
50+
},
4651
},
47-
// node tests
4852
{
49-
files: [
50-
'node-tests/**/*.js'
51-
],
53+
// Test files:
54+
files: ['tests/**/*-test.{js,ts}'],
55+
extends: ['plugin:qunit/recommended'],
56+
},
57+
{
58+
// Node tests
59+
files: ['node-tests/**/*.js'],
5260
env: {
5361
node: true,
54-
mocha: true
62+
mocha: true,
5563
},
5664
parserOptions: {
57-
ecmaVersion: 2018
65+
ecmaVersion: 2018,
5866
},
5967
rules: {
60-
"func-names": 0,
61-
"prefer-arrow-callback": 0,
62-
"no-unused-expressions": 0
68+
'func-names': 0,
69+
'prefer-arrow-callback': 0,
70+
'no-unused-expressions': 0,
6371
},
64-
}
65-
]
72+
},
73+
],
6674
};

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
cache: 'npm'
2626
node-version: ${{ env.NODE_VERSION }}
2727

28-
- name: Install dependencies
29-
run: npm install
28+
- run: npm i -g npm@9
29+
- run: npm ci
3030

3131
- name: Lint
3232
run: npm run lint
@@ -46,8 +46,8 @@ jobs:
4646
cache: 'npm'
4747
node-version: ${{ env.NODE_VERSION }}
4848

49-
- name: Install dependencies
50-
run: npm install
49+
- run: npm i -g npm@9
50+
- run: npm ci
5151

5252
- name: Test
5353
uses: percy/[email protected]
@@ -71,8 +71,8 @@ jobs:
7171
cache: 'npm'
7272
node-version: ${{ env.NODE_VERSION }}
7373

74-
- name: Install dependencies
75-
run: npm install
74+
- run: npm i -g npm@9
75+
- run: npm ci
7676

7777
- name: Test
7878
run: npm run test:node

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/.env*
1313
/.pnp*
1414
/.sass-cache
15+
/.eslintcache
1516
/connect.lock
1617
/coverage/
1718
/libpeerconnection.log

.prettierignore

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
.eslintcache
17+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try

.prettierrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
singleQuote: true,
5+
};

.remarkrc.js

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
// .remarkrc.js
22
/* eslint-env node */
3-
const unified = require("unified");
4-
const read = require("fs").readFileSync;
5-
const ember = require("ember-dictionary");
3+
const unified = require('unified');
4+
const read = require('fs').readFileSync;
5+
const ember = require('ember-dictionary');
66

77
exports.plugins = [
88
[
9-
require("remark-retext"),
9+
require('remark-retext'),
1010
unified().use({
1111
plugins: [
12-
[require("retext-contractions"), { straight: true }],
13-
require("retext-english"),
14-
require("retext-indefinite-article"),
15-
require("retext-repeated-words"),
16-
require("retext-syntax-urls"),
12+
[require('retext-contractions'), { straight: true }],
13+
require('retext-english'),
14+
require('retext-indefinite-article'),
15+
require('retext-repeated-words'),
16+
require('retext-syntax-urls'),
1717
[
18-
require("retext-spell"),
18+
require('retext-spell'),
1919
{
2020
dictionary: ember,
21-
personal: read("./.local.dic")
22-
}
23-
]
24-
]
25-
})
21+
personal: read('./.local.dic'),
22+
},
23+
],
24+
],
25+
}),
2626
],
27-
"remark-preset-lint-consistent",
28-
"remark-preset-lint-recommended",
29-
["remark-lint-list-item-indent", "space"],
30-
["remark-lint-list-item-bullet-indent", false],
31-
["remark-lint-code-block-style", false]
27+
'remark-preset-lint-consistent',
28+
'remark-preset-lint-recommended',
29+
['remark-lint-list-item-indent', 'space'],
30+
['remark-lint-list-item-bullet-indent', false],
31+
['remark-lint-code-block-style', false],
3232
];

.template-lintrc.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'octane',
5-
rules: {
6-
'no-implicit-this': false,
7-
'no-curly-component-invocation': false
8-
}
4+
extends: 'recommended',
95
};

app/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Application from '@ember/application';
22
import Resolver from 'ember-resolver';
33
import loadInitializers from 'ember-load-initializers';
4-
import config from './config/environment';
4+
import config from 'ember-guides/config/environment';
55

66
export default class App extends Application {
77
modulePrefix = config.modulePrefix;

app/components/table-of-contents.hbs

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

0 commit comments

Comments
 (0)