Skip to content

Commit

Permalink
Merge pull request #125 from BBVAEngineering/update-to-ember-3.26
Browse files Browse the repository at this point in the history
Update to ember 3.28
  • Loading branch information
Angel-M-R authored Nov 29, 2021
2 parents 0583389 + 6d1a8e7 commit 8e3a231
Show file tree
Hide file tree
Showing 44 changed files with 7,297 additions and 4,219 deletions.
2 changes: 1 addition & 1 deletion .commitlintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
extends: ['@commitlint/config-conventional']
extends: ['@commitlint/config-conventional'],
};
7 changes: 1 addition & 6 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,7 @@ insert_final_newline = true
indent_style = space
indent_size = 2

[*.{html,css,hbs,js}]
indent_style = tab
indent_size = tab
tab_width = 4

[*.{hbs,yml,yaml}]
[*.hbs]
insert_final_newline = false

[*.{diff,md}]
Expand Down
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
# misc
/coverage/
!.*
.*/
.eslintcache

# ember-try
/.node_modules.ember-try/
Expand Down
106 changes: 50 additions & 56 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,60 +1,54 @@
'use strict';

module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 2018,
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true
}
},
plugins: [
'ember',
'bbva'
],
extends: [
'eslint:recommended',
'plugin:ember/recommended',
'eslint-config-bbva'
],
env: {
browser: true
},
rules: {
'ember/no-jquery': 'error'
},
overrides: [{
files: [
'.huskyrc.js',
'.commitlintrc.js',
'.eslintrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'index.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'tests/dummy/config/**/*.js'
],
excludedFiles: [
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**'
],
parserOptions: {
sourceType: 'script'
},
env: {
browser: false,
node: true
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
rules: {
'no-process-env': 0
}
}]
root: true,
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 2018,
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true,
},
},
plugins: ['ember'],
extends: [
'eslint:recommended',
'plugin:ember/recommended',
'plugin:prettier/recommended',
],
env: {
browser: true,
},
rules: {},
overrides: [
// node files
{
files: [
'./.commitlintrc.js',
'./.eslintrc.js',
'./.prettierrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./index.js',
'./testem.js',
'./blueprints/*/index.js',
'./config/**/*.js',
'./tests/dummy/config/**/*.js',
],
parserOptions: {
sourceType: 'script',
},
env: {
browser: false,
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
},
{
// Test files:
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
},
],
};
70 changes: 56 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,79 @@ jobs:
runs-on: ubuntu-latest
name: Test
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-node@v2
- name: Checkout
uses: actions/checkout@v2
- name: Set up node
uses: actions/setup-node@v2
with:
node-version: 12
cache: yarn
- name: Install dependencies
run: |
yarn install
run: yarn install
- name: Test
run: |
yarn lint
yarn test
- uses: codecov/codecov-action@v1
run: yarn test
- name: Release dry-run
run: yarn test:release
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Upload codecov
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./coverage/lcov.info
fail_ci_if_error: true
regression:
if: github.ref != 'refs/heads/master'
needs: test
runs-on: ubuntu-latest
name: Regression test - ${{ matrix.ember_try_scenario }} - Experimental ${{ matrix.experimental }}
strategy:
matrix:
ember_try_scenario:
- ember-lts-3.20
- ember-lts-3.24
- ember-release
- ember-beta
- ember-default-with-jquery
- ember-classic
- embroider-safe
- embroider-optimized
experimental: [false]
include:
- ember_try_scenario: ember-canary
experimental: true
continue-on-error: ${{ matrix.experimental }}
timeout-minutes: 5
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up node
uses: actions/setup-node@v2
with:
node-version: 12
cache: yarn
- name: Install dependencies
run: yarn install
- name: Test
run: yarn ember try:one ${{ matrix.ember_try_scenario }}
release:
if: github.ref == 'refs/heads/master'
needs: test
needs: [test]
runs-on: ubuntu-latest
name: Release
steps:
- uses: actions/checkout@v2
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
token: ${{ secrets.GH_TOKEN }}
- uses: actions/setup-node@v2
- name: Set up node
uses: actions/setup-node@v2
with:
node-version: 12
registry-url: "https://registry.npmjs.org"
registry-url: 'https://registry.npmjs.org'
- name: Configure CI Git User
run: |
git config --global user.email [email protected]
Expand All @@ -46,6 +87,7 @@ jobs:
- name: Release
run: yarn semantic-release
env:
HUSKY: 0
GH_TOKEN: ${{ secrets.GH_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
/node_modules/

# misc
.DS_Store
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/.nyc_output/
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log
/tags*
/.nyc_output
.DS_Store

# ember-try
/.node_modules.ember-try/
Expand Down
4 changes: 4 additions & 0 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn commitlint --edit "$1"
4 changes: 4 additions & 0 deletions .husky/pre-comit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn lint-staged
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn lint-staged
4 changes: 4 additions & 0 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn test
6 changes: 0 additions & 6 deletions .huskyrc.js

This file was deleted.

10 changes: 4 additions & 6 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,14 @@
/.editorconfig
/.ember-cli
/.env*
/.eslintcache
/.eslintignore
/.eslintrc.js
/.git/
/.gitignore
/.prettierignore
/.prettierrc.js
/.template-lintrc.js
/.commitlintrc.js
/.huskyrc.js
/.nycrc.json
/.releaserc
/greenkeeper.json
/jsconfig.json
/.travis.yml
/.watchmanconfig
/bower.json
Expand All @@ -29,6 +26,7 @@
/ember-cli-build.js
/testem.js
/tests/
/yarn-error.log
/yarn.lock
.gitkeep

Expand Down
24 changes: 24 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
/.nyc_output/
!.*
.eslintcache
*.html
*.hbs

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
5 changes: 5 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use strict';

module.exports = {
singleQuote: true,
};
42 changes: 20 additions & 22 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
'use strict';

module.exports = {
extends: 'octane',
rules: {
'no-bare-strings': true,
'block-indentation': 'tab',
'no-html-comments': true,
'no-nested-interactive': true,
'self-closing-void-elements': true,
'no-triple-curlies': true,
'deprecated-each-syntax': true,
'link-rel-noopener': true,
'no-invalid-interactive': true,
'require-valid-alt-text': true,
'style-concatenation': true,
'deprecated-inline-view-helper': true,
'no-unused-block-params': true,
'inline-link-to': true,
'no-inline-styles': true,
'simple-unless': false
},
ignore: [
'tests/dummy/**'
]
extends: 'recommended',
rules: {
'no-bare-strings': true,
'block-indentation': 'tab',
'no-html-comments': true,
'no-nested-interactive': true,
'self-closing-void-elements': true,
'no-triple-curlies': true,
'deprecated-each-syntax': true,
'link-rel-noopener': true,
'no-invalid-interactive': true,
'require-valid-alt-text': true,
'style-concatenation': true,
'deprecated-inline-view-helper': true,
'no-unused-block-params': true,
'inline-link-to': true,
'no-inline-styles': true,
'simple-unless': false,
},
ignore: ['tests/dummy/**'],
};
Loading

0 comments on commit 8e3a231

Please sign in to comment.