Skip to content

Commit

Permalink
Bump some deps, cleanup some unused stuff (#280)
Browse files Browse the repository at this point in the history
* Bump some deps, cleanup some unused stuff

* Try Ember 3.4 update

* Fix template lint

* Ember 3.8

* Update testem.js

* Try closure actions

* Try removing some testing flags

* Try TRAVIS

* Try headless again

* /shrug

* Try to use GUI

* Add jquery for 2.12

* Update testem.js

* Await render

* Try adding some waits

* Test against 1.12

* Fix 1.12

* Fix 2.8

* Add travis_retry for flaky tests

* Retry all the things
  • Loading branch information
RobbieTheWagner authored Aug 4, 2019
1 parent ad8b0a2 commit 09d879b
Show file tree
Hide file tree
Showing 30 changed files with 4,164 additions and 4,459 deletions.
21 changes: 20 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,20 @@
/blueprints/*/files/**/*.js
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
11 changes: 4 additions & 7 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ module.exports = {
],
extends: [
'eslint:recommended',
'plugin:ember/recommended',
'plugin:ember-suave/recommended'
'plugin:ember/recommended'
],
env: {
browser: true
Expand All @@ -22,16 +21,14 @@ module.exports = {
rules: {
'quotes': ['error', 'single', { 'allowTemplateLiterals': true, 'avoidEscape': true }],

'ember/closure-actions': 'off',

'ember-suave/no-const-outside-module-scope': 'off',
'ember-suave/no-direct-property-access': 'error',
'ember-suave/require-access-in-comments': 'off'
'ember/closure-actions': 'off'
},
overrides: [
// node files
{
files: [
'.eslintrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'index.js',
'testem.js',
Expand Down
26 changes: 14 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/dist/
/tmp/

# dependencies
/node_modules
/bower_components
/bower_components/
/node_modules/

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

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try

.idea
.idea/
.DS_Store
48 changes: 30 additions & 18 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,33 @@
/bower_components
# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
/.eslintignore
/.eslintrc.js
/.gitignore
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/config/ember-try.js
/dist
/tests
/tmp
**/.gitkeep
.bowerrc
.editorconfig
.ember-cli
.eslintrc.js
.gitignore
.watchmanconfig
.travis.yml
bower.json
ember-cli-build.js
testem.js
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
/tests/
/yarn.lock
.gitkeep

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try

.idea/
12 changes: 12 additions & 0 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
'use strict';

module.exports = {
extends: 'recommended',
rules: {
'no-attrs-in-components': false,
'no-inline-styles': false,
'no-triple-curlies': false,
'no-unbound': false,
'no-unnecessary-concat': false
}
};
74 changes: 47 additions & 27 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
- "8"

sudo: required
sudo: false
dist: trusty

addons:
Expand All @@ -18,43 +18,63 @@ env:
global:
# See https://git.io/vdao3 for details.
- JOBS=1
matrix:

branches:
only:
- master
# npm version tags
- /^v\d+\.\d+\.\d+/

jobs:
fail_fast: true
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-canary

include:
# runs linting and tests with current locked deps

- stage: "Tests"
name: "Tests"
install:
- travis_retry yarn install --non-interactive
script:
- yarn lint:hbs
- yarn lint:js
- travis_retry yarn test

- name: "Floating Dependencies"
script:
- travis_retry yarn test

# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- EMBER_TRY_SCENARIO=ember-1.11
- EMBER_TRY_SCENARIO=ember-1.13
- EMBER_TRY_SCENARIO=ember-lts-2.4
- EMBER_TRY_SCENARIO=ember-lts-2.8
- EMBER_TRY_SCENARIO=ember-lts-2.12
- EMBER_TRY_SCENARIO=ember-lts-2.16
- EMBER_TRY_SCENARIO=ember-lts-2.18
- EMBER_TRY_SCENARIO=ember-lts-3.4
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
- EMBER_TRY_SCENARIO=ember-default

matrix:
fast_finish: true
allow_failures:
- stage: "Additional Tests"
env: EMBER_TRY_SCENARIO=ember-1.12
- env: EMBER_TRY_SCENARIO=ember-1.13
- env: EMBER_TRY_SCENARIO=ember-lts-2.4
- env: EMBER_TRY_SCENARIO=ember-lts-2.8
- env: EMBER_TRY_SCENARIO=ember-lts-2.12
- env: EMBER_TRY_SCENARIO=ember-lts-2.16
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery

before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH
- yarn global add greenkeeper-lockfile@1

install:
- travis_retry yarn install --no-lockfile --non-interactive

before_script:
- greenkeeper-lockfile-update

script:
- travis_retry node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

after_script:
- greenkeeper-lockfile-upload

install:
- yarn install --no-lockfile --non-interactive

script:
- yarn lint:js
# Usually, it's ok to finish the test scenario without reverting
# to the addon's original dependency state, skipping "cleanup".
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
26 changes: 26 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# How To Contribute

## Installation

* `git clone <repository-url>`
* `cd @html-next/vertical-collection`
* `yarn install`

## Linting

* `yarn lint:hbs`
* `yarn lint:js`
* `yarn lint:js --fix`

## Running tests

* `ember test` – Runs the test suite on the current Ember version
* `ember test --server` – Runs the test suite in "watch mode"
* `ember try:each` – Runs the test suite against multiple Ember versions

## Running the dummy application

* `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/).
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ ember install @html-next/vertical-collection
renderAll=false
renderFromLast=false
idForFirstItem=idForFirstItem
firstReached=firstReached
lastReached=lastReached
firstVisibleChanged=firstVisibleChanged
lastVisibleChanged=lastVisibleChanged
firstReached=(action firstReached)
lastReached=(action lastReached)
firstVisibleChanged=(action firstVisibleChanged)
lastVisibleChanged=(action lastVisibleChanged)
as |item i|}}
<li>
{{item.number}} {{i}}
Expand Down Expand Up @@ -133,4 +133,4 @@ Angular Style commit messages have the full form:

Make sure you register the test waiter from [ember-raf-scheduler](https://github.com/html-next/ember-raf-scheduler). So `ember-test-helpers`'s `wait` is aware of the scheduled updates.

An example can be found [here](https://github.com/html-next/vertical-collection/blob/master/tests/test-helper.js#L2)
An example can be found [here](https://github.com/html-next/vertical-collection/blob/master/tests/test-helper.js#L2)
2 changes: 1 addition & 1 deletion addon/components/vertical-collection/template.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{#each virtualComponents key="id" as |virtualComponent index| ~}}
{{#each virtualComponents key="id" as |virtualComponent| ~}}
{{~unbound virtualComponent.upperBound~}}
{{~#if virtualComponent.isOccludedContent ~}}
{{{unbound virtualComponent.element}}}
Expand Down
23 changes: 0 additions & 23 deletions config/changelog.js

This file was deleted.

Loading

0 comments on commit 09d879b

Please sign in to comment.