Skip to content
This repository was archived by the owner on Feb 11, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions .dependabot/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
version: 1
update_configs:
- package_manager: "javascript"
directory: "/"
update_schedule: "daily"
default_labels:
- "dependencies"
automerged_updates:
- match:
update_type: "in_range"
ignored_updates:
- match:
dependency_name: "ember-cli"
version_requirement_updates: "auto"
6 changes: 3 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

module.exports = {
root: true,
parser: 'babel-eslint',
Expand Down Expand Up @@ -52,9 +54,7 @@ module.exports = {
node: true
},
plugins: ['node'],
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here
})
extends: ['plugin:node/recommended']
}
]
};
64 changes: 64 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: CI Build

on:
pull_request: {}
push:
branches:
- master
tags:
- v*

jobs:
test:
name: Tests
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
with:
node-version: 10.x
- run: yarn install --frozen-lockfile
- run: yarn lint
- run: yarn test:ember

floating-dependencies:
name: "Floating Dependencies"
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
with:
node-version: 10.x
- run: yarn install --no-lockfile
- run: yarn test:ember

try-scenarios:
name: "Try: ${{ matrix.ember-try-scenario }}"

runs-on: ubuntu-latest

needs: test

strategy:
fail-fast: false
matrix:
ember-try-scenario:
- ember-lts-3.16
- ember-lts-3.20
- ember-release
- ember-beta
- ember-canary
- ember-default-with-jquery
- ember-classic

steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
with:
node-version: 12.x
- name: install dependencies
run: yarn install --frozen-lockfile
- name: test
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
15 changes: 15 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
'use strict';

module.exports = {
singleQuote: true,
trailingComma: 'none',
overrides: [
{
files: '**/*.hbs',
options: {
parser: 'glimmer',
singleQuote: false
}
}
]
};
14 changes: 5 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ node_js:
# so that your addon works for all apps
- "10"

dist: trusty
dist: xenial

addons:
chrome: stable
Expand Down Expand Up @@ -37,21 +37,20 @@ jobs:
- stage: "Tests"
name: "Tests"
script:
- yarn lint:hbs
- yarn lint:js
- yarn test
- yarn lint
- yarn test:ember

- stage: "Additional Tests"
name: "Floating Dependencies"
install:
- yarn install --no-lockfile --non-interactive
script:
- yarn test
- yarn test:ember

# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- env: EMBER_TRY_SCENARIO=ember-lts-3.12
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
- env: EMBER_TRY_SCENARIO=ember-lts-3.20
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
Expand All @@ -62,9 +61,6 @@ before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH

install:
- yarn install --non-interactive

script:
- COVERAGE=true node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
* `ember serve`
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).

For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Currently, Bootstrap is bundled with this addon. Eventually, I'd like to just ad
Compatibility
------------------------------------------------------------------------------

* Ember.js v3.12 or above
* Ember.js v3.16 or above
* Ember CLI v2.13 or above
* Node.js v10 or above

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import { get } from '@ember/object';
import { observer } from '@ember/object';
import { run } from '@ember/runloop';
import XBaseComponent from '../x-base/component';
import layout from './template';
import XBaseComponent from '../x-base';

export default XBaseComponent.extend({
layout,
changeUnderlineSize: observer('isEditing', function() {
run.later(() => {
const borderBottom = this.element.querySelector('.borderBottom');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@ import { get, set } from '@ember/object';
import { computed } from '@ember/object';
import { observer } from '@ember/object';
import { run } from '@ember/runloop';
import XBaseComponent from '../x-base/component';
import layout from './template';
import XBaseComponent from '../x-base';

export default XBaseComponent.extend({
layout,

/**
* This is a computed property for adding/removing the is-empty class
* @private
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@ import { get, set } from '@ember/object';
import { computed } from '@ember/object';
import { observer } from '@ember/object';
import { run } from '@ember/runloop';
import XBaseComponent from '../x-base/component';
import layout from './template';
import XBaseComponent from '../x-base';

export default XBaseComponent.extend({
layout,

/**
* This is a computed property for adding/removing the is-empty class
* @private
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-x-editable/components/editable-buttons/component';
export { default } from 'ember-x-editable/components/editable-buttons';
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-x-editable/components/ember-x-editable/component';
export { default } from 'ember-x-editable/components/ember-x-editable';
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-x-editable/components/error-message/component';
export { default } from 'ember-x-editable/components/error-message';
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-x-editable/components/x-editable-text/component';
export { default } from 'ember-x-editable/components/x-editable-select';
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-x-editable/components/x-editable-select/component';
export { default } from 'ember-x-editable/components/x-editable-text';
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-x-editable/components/x-editable-textarea/component';
export { default } from 'ember-x-editable/components/x-editable-textarea';
20 changes: 5 additions & 15 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ module.exports = async function() {
useYarn: true,
scenarios: [
{
name: 'ember-lts-3.12',
name: 'ember-lts-3.16',
npm: {
devDependencies: {
'ember-source': '~3.12.0'
'ember-source': '~3.16.0'
}
}
},
{
name: 'ember-lts-3.16',
name: 'ember-lts-3.20',
npm: {
devDependencies: {
'ember-source': '~3.16.0'
'ember-source': '~3.20.5'
}
}
},
Expand Down Expand Up @@ -46,16 +46,6 @@ module.exports = async function() {
}
}
},
// The default `.travis.yml` runs this scenario via `yarn test`,
// not via `ember try`. It's still included here so that running
// `ember try:each` manually or from a customized CI config will run it
// along with all the other scenarios.
{
name: 'ember-default',
npm: {
devDependencies: {}
}
},
{
name: 'ember-default-with-jquery',
env: {
Expand All @@ -65,7 +55,7 @@ module.exports = async function() {
},
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1'
'@ember/jquery': '^1.1.0'
}
}
},
Expand Down
Loading