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 ember cli 2.18.2 #9

Merged
merged 3 commits into from
Apr 14, 2018
Merged
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
50 changes: 47 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,57 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 6,
ecmaVersion: 2017,
sourceType: 'module'
},
extends: 'eslint:recommended',
plugins: [
'ember'
],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
],
env: {
browser: true
},
rules: {
}
},
overrides: [
// node files
{
files: [
'index.js',
'testem.js',
'ember-cli-build.js',
'config/**/*.js',
'tests/dummy/config/**/*.js'
],
excludedFiles: [
'app/**',
'addon/**',
'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
})
},

// test files
{
files: ['tests/**/*.js'],
excludedFiles: ['tests/dummy/**/*.js'],
env: {
embertest: true
}
}
]
};
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,10 @@
/coverage/*
/libpeerconnection.log
npm-debug.log*
yarn-error.log
testem.log
/docs

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
7 changes: 6 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,15 @@
.bowerrc
.editorconfig
.ember-cli
.gitignore
.eslintrc.js
.gitignore
.watchmanconfig
.travis.yml
bower.json
ember-cli-build.js
testem.js

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
43 changes: 25 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,47 @@
---
language: node_js
node_js:
- "6"
# 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
dist: trusty

addons:
chrome: stable

cache:
directories:
- $HOME/.npm
- $HOME/.cache # includes bowers cache
yarn: true

env:
# we recommend testing LTS's and latest stable release (bonus points to beta/canary)
- EMBER_TRY_SCENARIO=ember-lts-2.4
- EMBER_TRY_SCENARIO=ember-lts-2.8
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
- EMBER_TRY_SCENARIO=ember-default
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.12
- EMBER_TRY_SCENARIO=ember-lts-2.16
- 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:
- npm config set spin false
- npm install -g bower phantomjs-prebuilt
- bower --version
- phantomjs --version
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH

install:
- npm install
- bower 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 test --skip-cleanup
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
4 changes: 1 addition & 3 deletions addon/components/filter-drop-shadow.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/**
@module ember-svg-shapes
*/
import Ember from 'ember';
import Component from '@ember/component';
import layout from '../templates/components/filter-drop-shadow';

const { Component } = Ember;

/**
# FilterDropShadowComponent

Expand Down
8 changes: 4 additions & 4 deletions addon/components/svg-circle.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/**
@module ember-svg-shapes
*/
import Ember from 'ember';
import Component from '@ember/component';
import SvgMixin from 'ember-svg-shapes/mixins/svg';
import FilterMixin from 'ember-svg-shapes/mixins/filter';
import layout from '../templates/components/svg-circle';

const { assert, computed, Component } = Ember;
const { alias } = computed;
import { computed } from '@ember/object';
import { alias } from '@ember/object/computed';
import { assert } from '@ember/debug';

/**
# SvgCircleComponent
Expand Down
6 changes: 2 additions & 4 deletions addon/components/svg-filters.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/**
@module ember-svg-shapes
*/
import Ember from 'ember';
import Component from '@ember/component';
import layout from '../templates/components/svg-filters';

const { Component } = Ember;

/**
# SvgFiltersComponent

Expand Down Expand Up @@ -54,5 +52,5 @@ export default Component.extend({
@default ['ember-svg-shapes', 'svg-filters']
@private
*/
classNames: ['ember-svg-shapes', 'svg-filters'],
classNames: ['ember-svg-shapes', 'svg-filters']
});
4 changes: 1 addition & 3 deletions addon/components/svg-rectangle.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
/**
@module ember-svg-shapes
*/
import Ember from 'ember';
import Component from '@ember/component';
import SvgMixin from 'ember-svg-shapes/mixins/svg';
import RectMixin from 'ember-svg-shapes/mixins/rect';
import FilterMixin from 'ember-svg-shapes/mixins/filter';
import layout from '../templates/components/svg-rectangle';

const { Component } = Ember;

/**

# SvgRectangleComponent
Expand Down
8 changes: 4 additions & 4 deletions addon/components/svg-square.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/**
@module ember-svg-shapes
*/
import Ember from 'ember';
import Component from '@ember/component';
import SvgMixin from 'ember-svg-shapes/mixins/svg';
import RectMixin from 'ember-svg-shapes/mixins/rect';
import FilterMixin from 'ember-svg-shapes/mixins/filter';
import layout from '../templates/components/svg-square';

const { assert, computed, Component } = Ember;
const { alias } = computed;
import { computed } from '@ember/object';
import { alias } from '@ember/object/computed';
import { assert } from '@ember/debug';

/**

Expand Down
7 changes: 3 additions & 4 deletions addon/components/svg-star.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
/**
@module ember-svg-shapes
*/
import Ember from 'ember';
import Component from '@ember/component';
import SvgMixin from 'ember-svg-shapes/mixins/svg';
import FilterMixin from 'ember-svg-shapes/mixins/filter';
import layout from '../templates/components/svg-star';

const { assert, computed, Component } = Ember;

import { computed } from '@ember/object';
import { assert } from '@ember/debug';
/**
# SvgStarComponent

Expand Down
6 changes: 3 additions & 3 deletions addon/components/svg-triangle.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/**
@module ember-svg-shapes
*/
import Ember from 'ember';
import Component from '@ember/component';
import SvgMixin from 'ember-svg-shapes/mixins/svg';
import FilterMixin from 'ember-svg-shapes/mixins/filter';
import layout from '../templates/components/svg-triangle';

const { assert, computed, Component } = Ember;
import { computed } from '@ember/object';
import { assert } from '@ember/debug';

/**
# SvgTriangleComponent
Expand Down
5 changes: 2 additions & 3 deletions addon/mixins/filter.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/**
@module ember-svg-shapes
*/
import Ember from 'ember';

const { computed, Mixin } = Ember;
import Mixin from '@ember/object/mixin';
import { computed } from '@ember/object';

/**
# Filter Mixin
Expand Down
7 changes: 4 additions & 3 deletions addon/mixins/rect.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/**
@module ember-svg-shapes
*/
import Ember from 'ember';

const { assert, computed, Mixin, String: { htmlSafe} } = Ember;
import Mixin from '@ember/object/mixin';
import { htmlSafe } from '@ember/string';
import { computed } from '@ember/object';
import { assert } from '@ember/debug';

/**
@class RectMixin
Expand Down
7 changes: 4 additions & 3 deletions addon/mixins/svg.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/**
@module ember-svg-shapes
*/
import Ember from 'ember';

const { assert, computed, Mixin, String: { htmlSafe} } = Ember;
import Mixin from '@ember/object/mixin';
import { htmlSafe } from '@ember/string';
import { computed } from '@ember/object';
import { assert } from '@ember/debug';

/**
@class SvgMixin
Expand Down
42 changes: 5 additions & 37 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,51 +1,19 @@
/* eslint-env node */
module.exports = {
useYarn: true,
scenarios: [
{
name: 'ember-1.13',
bower: {
dependencies: {
'ember': '~1.13.0'
},
resolutions: {
'ember': '~1.13.0'
}
},
name: 'ember-lts-2.12',
npm: {
devDependencies: {
'ember-source': null
'ember-source': '~2.12.0'
}
}
},
{
name: 'ember-lts-2.4',
bower: {
dependencies: {
'ember': 'components/ember#lts-2-4'
},
resolutions: {
'ember': 'lts-2-4'
}
},
name: 'ember-lts-2.16',
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-lts-2.8',
bower: {
dependencies: {
'ember': 'components/ember#lts-2-8'
},
resolutions: {
'ember': 'lts-2-8'
}
},
npm: {
devDependencies: {
'ember-source': null
'ember-source': '~2.16.0'
}
}
},
Expand Down
1 change: 0 additions & 1 deletion config/environment.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-env node */
'use strict';

module.exports = function(/* environment, appConfig */) {
Expand Down
5 changes: 3 additions & 2 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/* eslint-env node */
'use strict';

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

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

Expand Down
1 change: 0 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-env node */
'use strict';

module.exports = {
Expand Down
Loading