Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/ember upgrade #153

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
d5bec8f
feat: wait until modal is destroyed
next-joserepresa Nov 23, 2021
e1ce8f5
docs: update README
next-joserepresa Nov 23, 2021
d4d6687
test: fix coverage
next-joserepresa Nov 23, 2021
d575196
feat: upgrade Ember version v3.21.2...v3.28.4
next-joserepresa Nov 23, 2021
32f9fb8
style: prettier
next-joserepresa Nov 23, 2021
49a8d69
style: test prettier rules
next-joserepresa Nov 23, 2021
d9b5963
feat: bound resolve and reject to be called as actions
next-joserepresa Nov 23, 2021
03e8fef
refactor(db-254623): more Octane upgrades
next-joserepresa Nov 24, 2021
b813884
ci(db-254623): github actions and upgrade husky hooks
next-joserepresa Nov 24, 2021
d1f5fae
ci(db-254623): upgrade husky version
josex2r Nov 24, 2021
32a1e96
feat: remove deprecations by upgrading babel
josex2r Nov 25, 2021
604a3cd
Merge remote-tracking branch 'origin/master' into feature/ember-upgrade
josex2r Nov 25, 2021
eda7cfa
test: remove runloop functions
josex2r Nov 25, 2021
c16d5fd
feat: upgrade ember-auto-import to v2
josex2r Nov 29, 2021
f6d262a
feat(octane): migrate to Glimmer components
josex2r Dec 1, 2021
c9be982
feat(octane): remove deprecation by using component class instead of …
josex2r Dec 1, 2021
1673529
feat: upgrade ember-task-scheduler
josex2r Dec 1, 2021
fa52cdb
feat: add test-waiters to deps to work with ember-embroider-safe
josex2r Dec 1, 2021
7b0cd04
feat: wait close animation to change promise state
josex2r Dec 9, 2021
1377735
feat: move test-waiters to deps
josex2r Dec 9, 2021
fe36e11
test: do not wait for click
josex2r Dec 14, 2021
9a64965
feat: remove ember-task-scheduler
josex2r Dec 14, 2021
31d319b
fix: update DOM when closing modal via service
josex2r Dec 23, 2021
4ebec8f
refactor: add some PR #153 suggestions
josex2r Dec 23, 2021
45448aa
Merge remote-tracking branch 'origin/master' into feature/ember-upgrade
josex2r Dec 23, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
107 changes: 51 additions & 56 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,58 +1,53 @@
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,
},
overrides: [
// node files
{
files: [
'./.commitlintrc.js',
'./.eslintrc.js',
'./.huskyrc.js',
'./.prettierrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./index.js',
'./testem.js',
'./blueprints/*/index.js',
'./config/**/*.js',
'./tests/dummy/config/**/*.js',
'./tests/.eslintrc.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'],
},
],
};
93 changes: 93 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
name: CI
on: [push, pull_request]
jobs:
test:
runs-on: ubuntu-latest
name: Test
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 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]
runs-on: ubuntu-latest
name: Release
steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
token: ${{ secrets.GH_TOKEN }}
- name: Set up node
uses: actions/setup-node@v2
with:
node-version: 12
registry-url: 'https://registry.npmjs.org'
- name: Configure CI Git User
run: |
git config --global user.email [email protected]
git config --global user.name adrigzr
- name: Install dependencies
run: yarn install
- 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
1 change: 1 addition & 0 deletions .husky/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_
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-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
8 changes: 4 additions & 4 deletions .huskyrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
hooks: {
'commit-msg': 'commitlint -E HUSKY_GIT_PARAMS',
'pre-push': 'yarn test'
}
hooks: {
'commit-msg': 'commitlint -E HUSKY_GIT_PARAMS',
'pre-push': 'yarn test',
},
};
13 changes: 7 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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jsconfig.json probably should be kept as it should not be published to npm

/.travis.yml
/.watchmanconfig
/bower.json
Expand All @@ -29,7 +26,11 @@
/ember-cli-build.js
/testem.js
/tests/
/yarn-error.log
/yarn.lock
/.releaserc
/jsconfig.json
/greenkeeper.json
.gitkeep

# ember-try
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,
};
25 changes: 3 additions & 22 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,5 @@
'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',
};
Loading