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

Updates add-on to ember-cli 2.16 #55

Open
wants to merge 2 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
14 changes: 0 additions & 14 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,8 @@ insert_final_newline = true
indent_style = space
indent_size = 2

[*.js]
indent_style = space
indent_size = 2

[*.hbs]
insert_final_newline = false
indent_style = space
indent_size = 2

[*.css]
indent_style = space
indent_size = 2

[*.html]
indent_style = space
indent_size = 2

[*.{diff,md}]
trim_trailing_whitespace = false
3 changes: 0 additions & 3 deletions .eslintrc

This file was deleted.

16 changes: 16 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module'
},
extends: [
'eslint:recommended',
'frost-standard'
],
env: {
browser: true
},
rules: {
}
};
10 changes: 8 additions & 2 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 @@ -14,5 +14,11 @@
/connect.lock
/coverage/*
/libpeerconnection.log
npm-debug.log
npm-debug.log*
yarn-error.log
testem.log

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.editorconfig
.ember-cli
.gitignore
.jshintrc
.eslintrc.js
.watchmanconfig
.travis.yml
bower.json
Expand Down
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
language: node_js
sudo: false
node_js:
- '6.11.0'
- 'stable'

sudo: false
dist: trusty

addons:
apt:
sources:
Expand All @@ -17,6 +19,8 @@ cache:

env:
matrix:
- EMBER_TRY_SCENARIO=ember-lts-2.8
- EMBER_TRY_SCENARIO=ember-lts-2.12
- EMBER_TRY_SCENARIO=default
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
Expand Down
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 Ciena Corporation.
Copyright (c) 2017 Ciena Corporation.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
15 changes: 6 additions & 9 deletions addon/components/block-slot.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import Ember from 'ember'
const {
Component,
computed,
defineProperty,
isPresent,
on
} = Ember
import { readOnly } from '@ember/object/computed'
import Component from '@ember/component'
import { defineProperty } from '@ember/object'
import { isPresent } from '@ember/utils'
import { on } from '@ember/object/evented'
import layout from '../templates/components/block-slot'
import { PropTypes } from 'ember-prop-types'
import Slots from '../mixins/slots'
Expand Down Expand Up @@ -71,7 +68,7 @@ const BlockSlot = Component.extend({
// p0 p1 p2...
yieldSlot._blockParams.forEach((param, index) => {
defineProperty(this, `p${index}`,
computed.readOnly(`_yieldSlot._blockParams.${index}`)
readOnly(`_yieldSlot._blockParams.${index}`)
)
})
}
Expand Down
7 changes: 2 additions & 5 deletions addon/components/yield-slot.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import Ember from 'ember'
const {
Component,
computed
} = Ember
import Component from '@ember/component'
import { computed } from '@ember/object'
import layout from '../templates/components/yield-slot'
import { PropTypes } from 'ember-prop-types'
import Slots from '../mixins/slots'
Expand Down
8 changes: 3 additions & 5 deletions addon/helpers/block-params.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
/* eslint valid-jsdoc:0 */
import Ember from 'ember'
const {
A,
Helper
} = Ember
import { A } from '@ember/array'

import Helper from '@ember/component/helper'

/**
* Per yield slot parameters made available to an associated block slot
Expand Down
10 changes: 4 additions & 6 deletions addon/mixins/slots.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
import Ember from 'ember'
const {
Mixin,
computed
} = Ember
import { A } from '@ember/array'
import Mixin from '@ember/object/mixin'
import { computed } from '@ember/object'

/**
* A convenience mixin that provides the necessary interface
* to activate and deactivate a yield-slot/block-slot pairing
*/
export default Mixin.create({
_slots: computed(function () {
return Ember.A()
return A()
}),

_activateSlot (name) {
Expand Down
8 changes: 0 additions & 8 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
{
"name": "ember-block-slots",
"dependencies": {
"ember": "~2.5.0",
"ember-cli-shims": "0.1.1"
},
"devDependencies": {
"blanket": "5e94fc30f2e694bb5c3718ddcbf60d467f4b4d26",
"chai": "~2.3.0",
"ember-cli-test-loader": "0.2.2",
"ember-mocha-adapter": "~0.3.1",
"highlightjs": "^9.2.0",
"lodash": "^4.10.0",
"marked": "^0.3.5",
"mocha": "~2.2.4",
"perfect-scrollbar": ">=0.6.7 <2.0.0"
}
}
48 changes: 38 additions & 10 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
/* jshint node:true*/
/* eslint-env node */
module.exports = {
scenarios: [
{
name: 'default',
bower: {
dependencies: { }
}
},
{
name: 'ember-1-13',
name: 'ember-lts-2.8',
bower: {
dependencies: {
'ember': '~1.13.0'
'ember': 'components/ember#lts-2-8'
},
resolutions: {
'ember': '~1.13.0'
'ember': 'lts-2-8'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-lts-2.12',
npm: {
devDependencies: {
'ember-source': '~2.12.0'
}
}
},
Expand All @@ -27,6 +34,11 @@ module.exports = {
resolutions: {
'ember': 'release'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
Expand All @@ -38,6 +50,11 @@ module.exports = {
resolutions: {
'ember': 'beta'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
Expand All @@ -49,6 +66,17 @@ module.exports = {
resolutions: {
'ember': 'canary'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-default',
npm: {
devDependencies: {}
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion config/environment.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* jshint node:true*/
/* eslint-env node */
'use strict'

module.exports = function (/* environment, appConfig */) {
Expand Down
11 changes: 5 additions & 6 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/* global require, module */
var EmberAddon = 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 EmberAddon(defaults, {
'ember-cli-mocha': {
useLintTree: false
},
let app = new EmberAddon(defaults, {
sassOptions: {
includePaths: [
'node_modules/ember-frost-core/addon/styles'
Expand Down
1 change: 1 addition & 0 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-env node */
'use strict'

module.exports = {
Expand Down
Loading