Skip to content

Commit d07c93c

Browse files
author
Robert Jackson
committed
Upgrade to latest [email protected] blueprint
1 parent f542fbc commit d07c93c

30 files changed

+438
-220
lines changed

‎.editorconfig

-1
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

‎.ember-cli

+7-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55

66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
8-
"disableAnalytics": false
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.
13+
*/
14+
"isTypeScriptProject": false
915
}

‎.eslintignore

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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+
.*/
17+
.eslintcache
18+
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

‎.eslintrc.js

+34-26
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,53 @@
1+
'use strict';
2+
13
module.exports = {
24
root: true,
5+
parser: 'babel-eslint',
36
parserOptions: {
47
ecmaVersion: 2018,
5-
sourceType: 'module'
8+
sourceType: 'module',
9+
ecmaFeatures: {
10+
legacyDecorators: true,
11+
},
612
},
7-
extends: 'eslint:recommended',
13+
plugins: ['ember'],
14+
extends: [
15+
'eslint:recommended',
16+
'plugin:ember/recommended',
17+
'plugin:prettier/recommended',
18+
],
819
env: {
9-
browser: true
10-
},
11-
rules: {
20+
browser: true,
1221
},
22+
rules: {},
1323
overrides: [
1424
// node files
1525
{
1626
files: [
17-
'.eslintrc.js',
18-
'.template-lintrc.js',
19-
'ember-cli-build.js',
20-
'index.js',
21-
'testem.js',
22-
'blueprints/*/index.js',
23-
'config/**/*.js',
24-
'tests/dummy/config/**/*.js'
25-
],
26-
excludedFiles: [
27-
'addon/**',
28-
'addon-test-support/**',
29-
'app/**',
30-
'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',
3136
],
3237
parserOptions: {
33-
sourceType: 'script'
38+
sourceType: 'script',
3439
},
3540
env: {
3641
browser: false,
37-
node: true
42+
node: true,
3843
},
3944
plugins: ['node'],
40-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
41-
// add your custom rules and overrides for node files here
42-
})
43-
}
44-
]
45+
extends: ['plugin:node/recommended'],
46+
},
47+
{
48+
// test files
49+
files: ['tests/**/*-test.{js,ts}'],
50+
extends: ['plugin:qunit/recommended'],
51+
},
52+
],
4553
};

‎.github/workflows/ci.yml

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

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@ testem.log
2121
.node_modules.ember-try/
2222
bower.json.ember-try
2323
package.json.ember-try
24+
25+
# broccoli-debug
26+
/DEBUG/

‎.npmignore

+40-17
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,41 @@
1-
/bower_components
2-
/config
3-
/dist
4-
/.git
5-
/tests
6-
/node-tests
7-
/tmp
1+
# compiled output
2+
/dist/
3+
/tmp/
4+
5+
# dependencies
6+
/bower_components/
7+
8+
# misc
9+
/.bowerrc
10+
/.editorconfig
11+
/.ember-cli
12+
/.env*
13+
/.eslintcache
14+
/.eslintignore
15+
/.eslintrc.js
16+
/.git/
17+
/.github/
18+
/.gitignore
19+
/.prettierignore
20+
/.prettierrc.js
21+
/.template-lintrc.js
22+
/.travis.yml
23+
/.watchmanconfig
24+
/bower.json
25+
/config/ember-try.js
26+
/CONTRIBUTING.md
27+
/ember-cli-build.js
28+
/testem.js
29+
/tests/
30+
/node-tests/
31+
/yarn-error.log
32+
/yarn.lock
833
**/.gitkeep
9-
.bowerrc
10-
.editorconfig
11-
.ember-cli
12-
.gitignore
13-
.eslintrc.js
14-
.watchmanconfig
15-
.travis.yml
16-
bower.json
17-
ember-cli-build.js
18-
testem.js
34+
35+
# ember-try
36+
/.node_modules.ember-try/
37+
/bower.json.ember-try
38+
/npm-shrinkwrap.json.ember-try
39+
/package.json.ember-try
40+
/package-lock.json.ember-try
41+
/yarn.lock.ember-try

‎.prettierignore

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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+
.lint-todo/
18+
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

‎.prettierrc.js

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

‎.template-lintrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: 'recommended',
5+
};

‎.travis.yml

-60
This file was deleted.

‎CONTRIBUTING.md

+25
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-asset-loader`
7+
* `yarn install`
8+
9+
## Linting
10+
11+
* `yarn lint`
12+
* `yarn 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://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

0 commit comments

Comments
 (0)