Skip to content

Commit

Permalink
Bump Ember CLI to 3.8 and update other dependencies (#696)
Browse files Browse the repository at this point in the history
* bump ember cli to lts 3.8 update other dev dependencies

also apply some ember add-on blueprint changes

* fix handlebar lint errors

Note - unsure why 'no-inline-styles' config isn’t being applied. For now I’ve manually disabled the rule in applicable templates

* disable js no-observer rule

* update eslint-plugin-ember-suave and fix lint errors

* upgrade ember-mirage (used for dummy app)

* upgrade remaining addons
  • Loading branch information
fran-worley authored May 29, 2019
1 parent f57dbf3 commit e0b6e2e
Show file tree
Hide file tree
Showing 75 changed files with 2,575 additions and 3,840 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
21 changes: 19 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,54 +1,71 @@
module.exports = {
root: true,

parserOptions: {
ecmaVersion: 2017,

sourceType: 'module'
},

plugins: [
'ember'
'ember',
'ember-suave'
],

extends: [
'eslint:recommended',
'plugin:ember/recommended',
'plugin:ember-suave/recommended'
],

env: {
browser: true
},

rules: {
'generator-star-spacing': ['error', { before: false, after: false }],
'ember/closure-actions': 'off',
'ember/no-observers': 'off',
'ember-suave/require-access-in-comments': 'off',
'ember-suave/no-const-outside-module-scope': 'off'
},

overrides: [
// node files
{
files: [
'.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',

ecmaVersion: 2015
},

env: {
browser: false,
node: true
},

plugins: ['node'],

rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here
'ember-suave/lines-between-object-properties': 'off'
})
}
]
Expand Down
24 changes: 13 additions & 11 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

# VS Code
.vscodeignore
Expand Down
47 changes: 29 additions & 18 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,22 +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
/config/release.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
10 changes: 10 additions & 0 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
'use strict';

module.exports = {
extends: 'recommended',
rules: {
'no-inline-styles': {
allowDynamicStyles: true
}
}
};
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 https://github.com/offirgolan/ember-light-table`
* `cd ember-light-table`
* `yarn install`

## Linting

* `yarn run lint:hbs`
* `yarn run lint:js`
* `yarn run 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/).
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 – 2018
Copyright (c) 2016 - 2019

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@
- Contextual component for header, body, and footer, as well as loading, no data, and expanded row
- **EXPERIMENTAL** Occlusion rendering leveraging [vertical-collection](https://github.com/html-next/vertical-collection). See [Demo](http://offirgolan.github.io/ember-light-table/#/cookbook/occlusion-rendering).


Compatibility
------------------------------------------------------------------------------

* Ember.js v2.18 or above
* Ember CLI v2.13 or above


Installation
------------------------------------------------------------------------------

Expand Down
1 change: 1 addition & 0 deletions addon/classes/Table.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ export default class Table extends EmberObject.extend({
if (c.get('isVisibleGroupColumn') || (!c.get('isGroupColumn') && !c.get('isHidden'))) {
arr.pushObject(c);
}

return arr;
}, emberArray([]));
}).readOnly(),
Expand Down
1 change: 1 addition & 0 deletions addon/components/cells/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ const Cell = Component.extend({
if (format && typeof format === 'function') {
return format.call(this, rawValue);
}

return rawValue;
})
});
Expand Down
1 change: 1 addition & 0 deletions addon/components/lt-body.js
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,7 @@ export default Component.extend({
this.set('isInViewport', true);
}
},

/**
* lt-infinity action to determine if component has exited the viewport
* @event exitViewport
Expand Down
2 changes: 1 addition & 1 deletion addon/components/lt-column-resizer.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Component from '@ember/component';
import { computed } from '@ember/object';
import closest from 'ember-light-table/utils/closest';
import layout from '../templates/components/lt-column-resizer';
import closest from '../utils/closest';

const TOP_LEVEL_CLASS = '.ember-light-table';

Expand Down
3 changes: 3 additions & 0 deletions addon/components/lt-infinity.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,16 @@ export default Component.extend({

const options = {
viewportSpy: true,

viewportTolerance: {
bottom: this.get('scrollBuffer')
},

scrollableArea: this.get('scrollableContent')
};

const { onEnter, onExit } = this.get('inViewport').watchElement(get(this, 'element'), options);

onEnter(this.didEnterViewport.bind(this));
onExit(this.didExitViewport.bind(this));
},
Expand Down
2 changes: 2 additions & 0 deletions addon/mixins/table-header.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,11 @@ export default Mixin.create({
if (!this.get('multiColumnSort')) {
this.get('table.sortedColumns').setEach('sorted', false);
}

column.set('sorted', true);
}
}

this.onColumnClick && this.onColumnClick(...arguments);
},

Expand Down
6 changes: 3 additions & 3 deletions addon/templates/components/light-table.hbs
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{{yield (hash
head=(component 'lt-head'
head=(component "lt-head"
tableId=elementId
table=table
tableActions=tableActions
extra=extra
tableClassNames=tableClassNames
sharedOptions=sharedOptions
)
body=(component 'lt-body'
body=(component "lt-body"
tableId=elementId
table=table
tableActions=tableActions
extra=extra
tableClassNames=tableClassNames
sharedOptions=sharedOptions
)
foot=(component 'lt-foot'
foot=(component "lt-foot"
tableId=elementId
table=table
tableActions=tableActions
Expand Down
Loading

0 comments on commit e0b6e2e

Please sign in to comment.