Skip to content

Commit 6216711

Browse files
authored
Merge pull request #501 from ember-learn/revive
[lts-v3] basic updates to get it running again
2 parents 3d52103 + f348b07 commit 6216711

File tree

126 files changed

+19353
-16349
lines changed

Some content is hidden

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

126 files changed

+19353
-16349
lines changed

.editorconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
root = true
66

7-
87
[*]
98
end_of_line = lf
109
charset = utf-8

.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
17+
.eslintcache
1618

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

.eslintrc.js

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,53 @@
1+
'use strict';
2+
13
module.exports = {
24
root: true,
5+
parser: 'babel-eslint',
36
parserOptions: {
4-
ecmaVersion: 2017,
5-
sourceType: 'module'
7+
ecmaVersion: 2018,
8+
sourceType: 'module',
9+
ecmaFeatures: {
10+
legacyDecorators: true,
11+
},
612
},
7-
plugins: [
8-
'ember'
9-
],
13+
plugins: ['ember'],
1014
extends: [
1115
'eslint:recommended',
12-
'plugin:ember/recommended'
16+
'plugin:ember/recommended',
17+
'plugin:prettier/recommended',
1318
],
1419
env: {
15-
browser: true
16-
},
17-
rules: {
18-
'no-useless-escape': 'off'
20+
browser: true,
1921
},
22+
rules: {},
2023
overrides: [
2124
// node files
2225
{
2326
files: [
24-
'.eslintrc.js',
25-
'.stylelintrc.js',
26-
'.template-lintrc.js',
27-
'ember-cli-build.js',
28-
'index.js',
29-
'testem.js',
30-
'blueprints/*/index.js',
31-
'config/**/*.js',
32-
'tests/dummy/config/**/*.js'
33-
],
34-
excludedFiles: [
35-
'addon/**',
36-
'addon-test-support/**',
37-
'app/**',
38-
'tests/dummy/app/**'
27+
'./.eslintrc.js',
28+
'./.prettierrc.js',
29+
'./.template-lintrc.js',
30+
'./ember-cli-build.js',
31+
'./index.js',
32+
'./testem.js',
33+
'./blueprints/*/index.js',
34+
'./config/**/*.js',
35+
'./tests/dummy/config/**/*.js',
3936
],
4037
parserOptions: {
4138
sourceType: 'script',
42-
ecmaVersion: 2015
4339
},
4440
env: {
4541
browser: false,
46-
node: true
42+
node: true,
4743
},
4844
plugins: ['node'],
49-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
50-
// add your custom rules and overrides for node files here
51-
})
52-
}
53-
]
45+
extends: ['plugin:node/recommended'],
46+
},
47+
{
48+
// Test files:
49+
files: ['tests/**/*-test.{js,ts}'],
50+
extends: ['plugin:qunit/recommended'],
51+
},
52+
],
5453
};

.github/workflows/ci.yml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- lts-v3
7+
pull_request: {}
8+
9+
concurrency:
10+
group: ci-${{ github.head_ref || github.ref }}
11+
cancel-in-progress: true
12+
13+
jobs:
14+
test:
15+
name: "Tests"
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- uses: actions/checkout@v4
20+
- uses: pnpm/action-setup@v2
21+
with:
22+
version: 8
23+
- uses: actions/setup-node@v4
24+
with:
25+
node-version: 18.x
26+
cache: pnpm
27+
- run: pnpm i --frozen-lockfile
28+
- run: pnpm run test:ember
29+
30+
floating:
31+
name: "Floating Dependencies"
32+
runs-on: ubuntu-latest
33+
34+
steps:
35+
- uses: actions/checkout@v4
36+
- uses: pnpm/action-setup@v2
37+
with:
38+
version: 8
39+
- uses: actions/setup-node@v4
40+
with:
41+
node-version: 18.x
42+
cache: pnpm
43+
- run: pnpm install --no-lockfile
44+
- run: pnpm run test:ember
45+
46+
try-scenarios:
47+
name: ${{ matrix.try-scenario }}
48+
runs-on: ubuntu-latest
49+
needs: 'test'
50+
51+
strategy:
52+
fail-fast: false
53+
matrix:
54+
try-scenario:
55+
- ember-lts-3.28
56+
- embroider-safe
57+
- embroider-optimized
58+
59+
steps:
60+
- uses: actions/checkout@v4
61+
- uses: pnpm/action-setup@v2
62+
with:
63+
version: 8
64+
- uses: actions/setup-node@v4
65+
with:
66+
node-version: 18.x
67+
cache: pnpm
68+
- run: pnpm i --frozen-lockfile
69+
- name: Run Tests
70+
run: pnpm ember try:one ${{ matrix.try-scenario }}

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
/node_modules/
1010

1111
# misc
12+
/.env*
13+
/.pnp*
1214
/.sass-cache
15+
/.eslintcache
1316
/connect.lock
1417
/coverage/
1518
/libpeerconnection.log

.npmignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,24 @@
99
/.bowerrc
1010
/.editorconfig
1111
/.ember-cli
12+
/.env*
13+
/.eslintcache
1214
/.eslintignore
1315
/.eslintrc.js
16+
/.git/
1417
/.gitignore
18+
/.prettierignore
19+
/.prettierrc.js
1520
/.template-lintrc.js
1621
/.travis.yml
1722
/.watchmanconfig
1823
/bower.json
1924
/config/ember-try.js
25+
/CONTRIBUTING.md
2026
/ember-cli-build.js
2127
/testem.js
2228
/tests/
29+
/yarn-error.log
2330
/yarn.lock
2431
.gitkeep
2532

.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+
};

.travis.yml

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

CONTRIBUTING.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# How To Contribute
2+
3+
## Installation
4+
5+
* `git clone <repository-url>`
6+
* `cd ember-styleguide`
7+
* `npm install`
8+
9+
## Linting
10+
11+
* `npm run lint`
12+
* `npm run lint:fix`
13+
14+
## Running tests
15+
16+
* `ember test` – Runs the test suite on the current Ember version
17+
* `ember test --server` – Runs the test suite in "watch mode"
18+
* `ember try:each` – Runs the test suite against multiple Ember versions
19+
20+
## Running the dummy application
21+
22+
* `ember serve`
23+
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
24+
25+
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).

0 commit comments

Comments
 (0)