Skip to content

Commit 05d255b

Browse files
authored
Merge pull request #110 from BBVAEngineering/feature-update
Update to ember 4.1
2 parents 971a511 + 35d6c01 commit 05d255b

52 files changed

Lines changed: 6423 additions & 5063 deletions

Some content is hidden

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

.commitlintrc.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
'use strict';
2-
31
module.exports = {
4-
extends: ['@commitlint/config-conventional']
2+
extends: ['@commitlint/config-conventional'],
53
};

.editorconfig

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# EditorConfig helps developers define and maintain consistent
2+
# coding styles between different editors and IDEs
3+
# editorconfig.org
4+
5+
root = true
6+
17
[*]
28
end_of_line = lf
39
charset = utf-8
@@ -6,11 +12,6 @@ insert_final_newline = true
612
indent_style = space
713
indent_size = 2
814

9-
[*.{html,css,hbs,js}]
10-
indent_style = tab
11-
indent_size = tab
12-
tab_width = 4
13-
1415
[*.hbs]
1516
insert_final_newline = false
1617

.ember-cli

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
/**
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+
}

.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: 52 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,56 @@
11
'use strict';
22

33
module.exports = {
4-
root: true,
5-
parser: 'babel-eslint',
6-
parserOptions: {
7-
ecmaVersion: 2018,
8-
sourceType: 'module',
9-
ecmaFeatures: {
10-
legacyDecorators: true
11-
}
12-
},
13-
plugins: [
14-
'ember',
15-
'bbva'
16-
],
17-
extends: [
18-
'eslint:recommended',
19-
'plugin:ember/recommended',
20-
'eslint-config-bbva'
21-
],
22-
env: {
23-
browser: true
24-
},
25-
rules: {
26-
'ember/no-jquery': 'error'
27-
},
28-
overrides: [{
29-
files: [
30-
'.huskyrc.js',
31-
'.commitlintrc.js',
32-
'.eslintrc.js',
33-
'.template-lintrc.js',
34-
'ember-cli-build.js',
35-
'index.js',
36-
'testem.js',
37-
'blueprints/*/index.js',
38-
'config/**/*.js',
39-
'lib/**/*.js',
40-
'node-tests/**/*.js',
41-
'tests/dummy/config/**/*.js'
42-
],
43-
excludedFiles: [
44-
'addon/**',
45-
'addon-test-support/**',
46-
'app/**',
47-
'tests/dummy/app/**'
48-
],
49-
parserOptions: {
50-
sourceType: 'script'
51-
},
52-
env: {
53-
browser: false,
54-
node: true
55-
},
56-
plugins: ['node'],
57-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
58-
'no-process-env': 0,
59-
'ember/avoid-leaking-state-in-ember-objects': 0
60-
})
61-
}]
4+
root: true,
5+
parser: 'babel-eslint',
6+
parserOptions: {
7+
ecmaVersion: 2018,
8+
sourceType: 'module',
9+
ecmaFeatures: {
10+
legacyDecorators: true,
11+
},
12+
},
13+
plugins: ['ember'],
14+
extends: [
15+
'eslint:recommended',
16+
'plugin:ember/recommended',
17+
'plugin:prettier/recommended',
18+
],
19+
env: {
20+
browser: true,
21+
},
22+
rules: {},
23+
overrides: [
24+
// node files
25+
{
26+
files: [
27+
'./.commitlintrc.js',
28+
'./.eslintrc.js',
29+
'./.prettierrc.js',
30+
'./.template-lintrc.js',
31+
'./ember-cli-build.js',
32+
'./index.js',
33+
'./testem.js',
34+
'./blueprints/*/index.js',
35+
'./config/**/*.js',
36+
'./lib/**/*.js',
37+
'./node-tests/**/*.js',
38+
'./tests/dummy/config/**/*.js',
39+
],
40+
parserOptions: {
41+
sourceType: 'script',
42+
},
43+
env: {
44+
browser: false,
45+
node: true,
46+
},
47+
plugins: ['node'],
48+
extends: ['plugin:node/recommended'],
49+
},
50+
{
51+
// Test files:
52+
files: ['tests/**/*-test.{js,ts}'],
53+
extends: ['plugin:qunit/recommended'],
54+
},
55+
],
6256
};

.github/workflows/ci.yml

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
name: CI
2+
on: [push, pull_request]
3+
jobs:
4+
test:
5+
runs-on: ubuntu-latest
6+
name: Test
7+
steps:
8+
- name: Checkout
9+
uses: actions/checkout@v2
10+
- name: Set up node
11+
uses: actions/setup-node@v2
12+
with:
13+
node-version: 16
14+
cache: yarn
15+
- name: Install dependencies
16+
run: yarn install
17+
- name: Test
18+
run: yarn test
19+
- name: Release dry-run
20+
run: yarn test:release
21+
env:
22+
GH_TOKEN: ${{ secrets.GH_TOKEN }}
23+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
24+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
25+
- name: Upload codecov
26+
uses: codecov/codecov-action@v1
27+
with:
28+
token: ${{ secrets.CODECOV_TOKEN }}
29+
files: ./coverage/ember/lcov.info,./coverage/node/lcov.info
30+
fail_ci_if_error: true
31+
regression:
32+
if: github.ref != 'refs/heads/master'
33+
needs: test
34+
runs-on: ubuntu-latest
35+
name: Regression test - ${{ matrix.ember_try_scenario }} - Experimental ${{ matrix.experimental }}
36+
strategy:
37+
matrix:
38+
ember_try_scenario:
39+
- ember-lts-3.24
40+
- ember-lts-3.28
41+
- ember-release
42+
- ember-beta
43+
- ember-classic
44+
experimental: [false]
45+
include:
46+
- ember_try_scenario: ember-canary
47+
experimental: true
48+
- ember_try_scenario: embroider-safe
49+
experimental: true
50+
- ember_try_scenario: embroider-optimized
51+
experimental: true
52+
continue-on-error: ${{ matrix.experimental }}
53+
timeout-minutes: 5
54+
steps:
55+
- name: Checkout
56+
uses: actions/checkout@v2
57+
- name: Set up node
58+
uses: actions/setup-node@v2
59+
with:
60+
node-version: 16
61+
cache: yarn
62+
- name: Install dependencies
63+
run: yarn install
64+
- name: Test
65+
run: yarn ember try:one ${{ matrix.ember_try_scenario }}
66+
release:
67+
if: github.ref == 'refs/heads/master'
68+
needs: [test]
69+
runs-on: ubuntu-latest
70+
name: Release
71+
steps:
72+
- name: Checkout
73+
uses: actions/checkout@v2
74+
with:
75+
fetch-depth: 0
76+
token: ${{ secrets.GH_TOKEN }}
77+
- name: Set up node
78+
uses: actions/setup-node@v2
79+
with:
80+
node-version: 16
81+
registry-url: 'https://registry.npmjs.org'
82+
- name: Configure CI Git User
83+
run: |
84+
git config --global user.email adrigzr@users.noreply.github.com
85+
git config --global user.name adrigzr
86+
- name: Install dependencies
87+
run: yarn install
88+
- name: Release
89+
run: yarn semantic-release
90+
env:
91+
HUSKY: 0
92+
GH_TOKEN: ${{ secrets.GH_TOKEN }}
93+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
94+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.gitignore

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
1+
# See https://help.github.com/ignore-files/ for more about ignoring files.
2+
13
# compiled output
2-
/dist
3-
/tmp
4+
/dist/
5+
/tmp/
46

57
# dependencies
6-
/node_modules
7-
/bower_components
8+
/bower_components/
9+
/node_modules/
810

911
# misc
12+
.DS_Store
13+
/.env*
14+
/.pnp*
1015
/.sass-cache
16+
/.eslintcache
17+
/.nyc_output/
1118
/connect.lock
12-
/coverage/*
19+
/coverage/
1320
/libpeerconnection.log
14-
npm-debug.log*
15-
testem.log
16-
tags*
17-
/.nyc_output
21+
/npm-debug.log*
22+
/testem.log
23+
/yarn-error.log
24+
25+
# ember-try
26+
/.node_modules.ember-try/
27+
/bower.json.ember-try
28+
/package.json.ember-try

.husky/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_

.husky/commit-msg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
yarn commitlint --edit "$1"

.husky/pre-commit

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
yarn lint-staged

0 commit comments

Comments
 (0)