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

Update to ember-cli 2.16.2 to fix babel deprecation warnings #29

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
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
4 changes: 0 additions & 4 deletions .bowerrc

This file was deleted.

20 changes: 20 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module'
},
extends: 'eslint:recommended',
env: {
browser: true
},
"globals": {
"Proxy": true,
"saveAs": true,
"XLSX": true,
"ArrayBuffer": true,
"Uint8Array": true
},
rules: {
}
};
11 changes: 8 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
Expand All @@ -13,6 +13,11 @@
/connect.lock
/coverage/*
/libpeerconnection.log
npm-debug.log
npm-debug.log*
yarn-error.log
testem.log
.idea/

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
34 changes: 0 additions & 34 deletions .jshintrc

This file was deleted.

47 changes: 31 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,49 @@
---
language: node_js
node_js:
- "0.12"
# we recommend testing addons with the same minimum supported node version as Ember CLI
# so that your addon works for all apps
- "4"

sudo: false
sudo: required
dist: trusty

addons:
chrome: stable

cache:
directories:
- node_modules
- $HOME/.npm

env:
- EMBER_TRY_SCENARIO=default
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
global:
# See https://git.io/vdao3 for details.
- JOBS=1
matrix:
# 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-lts-2.8
- EMBER_TRY_SCENARIO=ember-lts-2.12
- 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:
- env: EMBER_TRY_SCENARIO=ember-canary

before_install:
- export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
- "npm config set spin false"
- "npm install -g npm@^2"
before_script:
- "sudo chown root /opt/google/chrome/chrome-sandbox"
- "sudo chmod 4755 /opt/google/chrome/chrome-sandbox"

install:
- npm install -g bower
- npm install
- bower install
before_install:
- npm config set spin false
- npm install -g npm@4
- npm --version

script:
- ember try $EMBER_TRY_SCENARIO test
# 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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Addon that encapsulates ability to render a data set as either excel or csv.

## Installation

- ember install ember-cli-data-export
* `ember install ember-cli-data-export`

## Usage

Expand All @@ -27,4 +27,4 @@ Addon that encapsulates ability to render a data set as either excel or csv.
} else if (type === 'CSV') {
this.get('csv').export(data, {fileName: 'test.csv'});
}
```
```
4 changes: 2 additions & 2 deletions addon/components/export-selector-onselect.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Ember from 'ember';
import Component from '@ember/component';
import layout from '../templates/components/export-selector-onselect';

export default Ember.Component.extend({
export default Component.extend({
layout: layout,
selectPrompt: 'Export File',

Expand Down
7 changes: 4 additions & 3 deletions addon/components/export-selector.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import Ember from 'ember';
import { computed } from '@ember/object';
import Component from '@ember/component';
import layout from '../templates/components/export-selector';

export default Ember.Component.extend({
export default Component.extend({
layout: layout,
types: Ember.computed(function() {
types: computed(function() {
return [this.get('selectPrompt'), 'Excel', 'CSV'];
}),
selectedType : null,
Expand Down
4 changes: 2 additions & 2 deletions addon/services/csv.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from "ember";
import Service from '@ember/service';
import optionize from "../utils/utils";

const defaultConfig = {
Expand All @@ -7,7 +7,7 @@ const defaultConfig = {
withSeparator: true
};

export default Ember.Service.extend({
export default Service.extend({

export: function (data, options) {
options = optionize(options, defaultConfig);
Expand Down
4 changes: 2 additions & 2 deletions addon/services/excel.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import Ember from "ember";
import Service from '@ember/service';
import optionize from "../utils/utils";

const defaultConfig = {
sheetName: 'Sheet1',
fileName: 'export.xlsx'
};

export default Ember.Service.extend({
export default Service.extend({

export : function(data, options) {

Expand Down
6 changes: 0 additions & 6 deletions blueprints/.jshintrc

This file was deleted.

1 change: 1 addition & 0 deletions blueprints/ember-cli-data-export/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-env node */
module.exports = {
description: 'Installs the underlying xlsx component using bower',

Expand Down
8 changes: 0 additions & 8 deletions bower.json

This file was deleted.

76 changes: 62 additions & 14 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,34 +1,82 @@
/* eslint-env node */
module.exports = {
scenarios: [
{
name: 'default',
dependencies: { }
name: 'ember-lts-2.8',
bower: {
dependencies: {
'ember': 'components/ember#lts-2-8'
},
resolutions: {
'ember': 'lts-2-8'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-lts-2.12',
npm: {
devDependencies: {
'ember-source': '~2.12.0'
}
}
},
{
name: 'ember-release',
dependencies: {
'ember': 'components/ember#release'
bower: {
dependencies: {
'ember': 'components/ember#release'
},
resolutions: {
'ember': 'release'
}
},
resolutions: {
'ember': 'release'
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-beta',
dependencies: {
'ember': 'components/ember#beta'
bower: {
dependencies: {
'ember': 'components/ember#beta'
},
resolutions: {
'ember': 'beta'
}
},
resolutions: {
'ember': 'beta'
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-canary',
dependencies: {
'ember': 'components/ember#canary'
bower: {
dependencies: {
'ember': 'components/ember#canary'
},
resolutions: {
'ember': 'canary'
}
},
resolutions: {
'ember': 'canary'
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-default',
npm: {
devDependencies: {}
}
}
]
Expand Down
10 changes: 6 additions & 4 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
/* global require, module */
var EmberApp = require('ember-cli/lib/broccoli/ember-addon');
/* eslint-env node */
'use strict';

const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function(defaults) {
var app = new EmberApp(defaults, {
let app = new EmberAddon(defaults, {
// Add options here
});

/*
This build file specifes the options for the dummy test app of this
This build file specifies the options for the dummy test app of this
addon, located in `/tests/dummy`
This build file does *not* influence how the addon or the app using it
behave. You most likely want to be modifying `./index.js` or app's build file
Expand Down
4 changes: 2 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* jshint node: true */
/* eslint-env node */
'use strict';

module.exports = {
name: 'ember-cli-data-export',

included: function(app) {
included(app) {
this._super.included(app);
app.import('vendor/Blob.js');
app.import('vendor/FileSaver-1.3.3.js');
Expand Down
Loading