Skip to content

Commit

Permalink
Merge pull request #183 from juwara0/updateDependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
juwara0 committed Mar 23, 2018
2 parents 2d64680 + 4652b59 commit e4ccecd
Show file tree
Hide file tree
Showing 16 changed files with 18,923 additions and 72 deletions.
107 changes: 107 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
Are you opening a **BUG REPORT** or a **FEATURE REQUEST / CODE CHANGE**?

There is a section for each below. Please complete the appropriate section and remove the other one.

We realize there is a lot of data requested here. We ask only that you do your best to provide as much information as possible so we can better help you.


# BUG REPORT

* [ ] I have ensured that the issue isn't already reported
* [ ] I have confirmed that the issue is reproducible with the latest released version
* [ ] I have deleted the **FEATURE REQUEST / CODE CHANGE** section

## Summary
* Provide a general summary of the issue in the title above

## Expected Behavior
* What should happen?

## Actual Behavior
* What happens instead of the expected behavior?
* Is something broken, or not behaving as you expected?
* Attach a screenshot or recording as appropriate.

## Possible Solution
* Not obligatory, but suggest a fix/reason for the bug

## Steps to Reproduce
* How would you describe your issue to someone who doesn’t know you or your project?
* Try to write a sequence of steps that anybody can repeat to see the issue.
* Be specific! If the bug cannot be reproduced, your issue may be closed.
* Provide a link to a live example, include code to reproduce, or direct us to any relevant files as applicable
* This guide has some additional good information: https://stackoverflow.com/help/mcve

---

* [ ] Include the contents of your _package.json_ file
* [ ] Steps to reproduce:
1.
2.
3.
4.
...


## Context
* How has this issue affected you? What are you trying to accomplish?
* Providing context helps us come up with a solution that is most useful in the real world.

## Environment

(answer all that are applicable)

* [ ] I am using the latest released version (can check with `npm ls <package-name>`)
* I am using these browsers:
* [ ] Latest Chrome
* [ ] Latest Firefox
* [ ] My version of `Node` is:
* [ ] My version of `npm` is:
* [ ] My OS is:
* [ ] Include the contents of your _package.json_ file




# FEATURE REQUEST / CODE CHANGE

* [ ] I have deleted the **BUG REPORT** section

## Summary
* [ ] Provide a general summary of the requested feature in the title above
* [ ] Provide a one-paragraph explanation of the requested feature:


## Motivation
* Describe the big picture of your feature to communicate why it should be added.
* Why are we doing this?
* What use cases does it support?
* What is the expected outcome?

## Detailed design
This is the bulk of the Feature Request / Code Change.

Explain the design in enough detail for somebody familiar with this addon, the UI Platform ecosystem, and Ember.js to understand, and for somebody familiar with the implementation to implement. This should get into specifics and corner-cases, and include examples of how the feature is used. Any new terminology should be defined here.

## How we teach this

* What names and terminology work best for these concepts and why?
* How should this feature be introduced and taught to existing users?

## Drawbacks

* Why should we ***not*** do this? Please consider the impact...
* ...on teaching this
* ...on the integration of this feature with other existing and planned features
* ...on the impact of the API churn on existing apps
* ...etc.
* There are tradeoffs to choosing any path, please attempt to identify them here.

## Alternatives

* What other designs have been considered? What is the impact of not doing this?
* This section could also include prior art, that is, how other addons or libraries in the same domain have solved this problem.

## Unresolved questions

* Optional, but suggested for first drafts. What parts of the design are still TBD?
70 changes: 65 additions & 5 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,69 @@
### This project uses [semver](semver.org), please check the scope of this pr:
# Overview

- [ ] #none# - documentation fixes and/or test additions
- [ ] #patch# - backwards-compatible bug fix
- [ ] #minor# - adding functionality in a backwards-compatible manner
- [ ] #major# - incompatible API change
## Does this PR close an existing issue?
No PR should be opened without opening an issue first. Any change needs to be discussed before proceeding.

## Summary
Provide a general summary of the issue addressed in the title above

## Issue Number(s)
Which issue(s) does this PR address?

Put `Closes #XXXX` below to auto-close the issue that this PR addresses:

* Closes #

## Screenshots or recordings
Please provide screenshots or recordings if this PR is modifying the visual UI or UX.

## Checklist
* [ ] I have added tests that prove my fix is effective or that my feature works
* [ ] I have evaluated if the _README.md_ documentation needs to be updated
* [ ] I have evaluated if the _/tests/dummy/_ app needs to be modified
* [ ] I have evaluated if DocBlock headers needed to be added or updated
* [ ] I have verified that lint and tests pass locally with my changes
* [ ] If a fork of a dependent package had to be made to address the issue this PR closes:
* [ ] I noted in the fork's _README.md_ the reason the fork was created
* [ ] I have opened an upstream issue detailing what was deficient about the dependency
* [ ] I have opened an upstream PR addressing this deficiency
* [ ] I have opened an issue in this repository to track this PR and schedule the removal of the usage of the fork


# Semver

**This project uses [semver](http://semver.org), please check the scope of this PR:**

- [ ] #none#
- [ ] #patch#
- [ ] #minor#
- [ ] #major#

Examples:
* **NONE**
* _README.md_ changes
* test additions
* changes to files that are not used by a consuming application (_.travis.yml_, _.gitignore_, etc)
* **PATCH**
* backwards-compatible bug fix
* nothing about how to use the code has changed
* nothing about the outcome of the code has changed (though it likely corrected it)
* changes to demo app (_/tests/dummy/_)
* **MINOR**
* adding functionality in a backwards-compatible manner
* nothing about how used to use the code has changed but using it in a new way will do new things
* nothing about the outcome of the code has changed without having to first use it in a new way
* addition of new CSS selectors
* addition of new `ember-hook` selectors
* **MAJOR**
* incompatible API change
* using the code how used to will cease working
* using the code how used to will have a different outcome
* any changes to CSS selector names
* any removal of CSS selectors
* any changes to `ember-hook` selectors
* possibly changes to test helpers (depends on the changes made)
* any changes to the **_dependencies_** entry in the _package.json_ file

# CHANGELOG

Please add a description of your change here, it will be automatically prepended to the `CHANGELOG.md` file.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
/coverage/*
/libpeerconnection.log
npm-debug.log*
package-lock.json
testem.log
.DS_Store
.idea
Expand Down
9 changes: 8 additions & 1 deletion .pr-bumper.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
{
"dependencySnapshotFile": ""
"features": {
"changelog": {
"enabled": true
},
"coverage": {
"enabled": true
}
}
}
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ dist: trusty
language: node_js

node_js:
- '6.9.1'
- '8.1.2'
- 'stable'

cache:
Expand Down Expand Up @@ -35,11 +35,12 @@ matrix:

before_install:
- npm config set spin false
- npm install -g coveralls pr-bumper@^1.0.0
- npm install -g coveralls pr-bumper@^3.7.0 ciena-devops@^1.0.0
- $(npm root -g)/pr-bumper/.travis/maybe-check-scope.sh

install:
- $(npm root -g)/pr-bumper/.travis/maybe-install.sh
- bower install

before_script:
- "export DISPLAY=:99.0"
Expand All @@ -64,9 +65,12 @@ deploy:
on:
all_branches: true
condition: "$EMBER_TRY_SCENARIO = 'ember-default'"
node: '6.9.1'
node: '8.1.2'
tags: true

after_deploy:
- $(npm root -g)/ciena-devops/scripts/slack/incoming-webhooks/send-message.sh

notifications:
slack:
secure: QsOyC3h7qByRTLjoQGpV5126jylRYABcg+yEaIpMBRuXJITLPadVmxea3uC3Me1UOyvmuFaT0qP+RwmUm6h6VVocGJ7RCSdSJVu5fCwsOhVhP+JxF9lYoxzaC+Yfc/O1/yGpWR5YIFOs2fikMLsrdDcBgJzadoOi3/T/u/oCLikqAR1mDtCcB5XQ6/Q+BT7RoT7xVSPHsaeQ8fqeGSOLSPZhjYZ3DZDdcZwKyLhdauxdkM3iWRTzSxyCw4M1XIlufvB+FKPTRmearAW7L8BJmsmJSTrhaY4Hl1imS/quxhN10ZlcTFPZKibOWwjCXmccZS/hn+GGDj8KvpyKNkQL8KBcVxdT1CpDzupWc8p6KMsOrHZZKaT7dFzqypeoknUKYpbNPm+PdcDueOl1LAdDivWTe5YBmwjAduP9LgeutSYozloAZgYs/69VQ91s4BdTUtNYPBWwHn8QUqX7LS3edbXVpx7al6qFjrbYv2k85dbYeQ3F8to9WnCO9lgKzvRPhn8YsLoR1a7ffb8bXY7/EsXnk5F1MU+c7Ka0KSJ76UTCUyLxM23kA7xPlFmJ8Z4aghaOzYfoyxayNpucV0ma8Cc06MvPbBJTxZwojloivH8ROMjXJNgdd3myu3Q94S+tuqlyrPmgHPxWdUk4y+Q+YtHHaTJgihPrpuYee9hbqOE=
6 changes: 3 additions & 3 deletions .travis/maybe-bump-version.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/bin/bash

if [ "$TRAVIS_NODE_VERSION" != "6.9.1" ]
if [[ ! "${PUBLISH_NODE_VERSION:-8.1.2}" =~ ^$TRAVIS_NODE_VERSION ]]
then
echo "Skipping version bump for TRAVIS_NODE_VERSION ${TRAVIS_NODE_VERSION}"
echo "Skipping pr-bumper bump step for TRAVIS_NODE_VERSION [${TRAVIS_NODE_VERSION}]"
exit 0
fi

if [ "$EMBER_TRY_SCENARIO" != "ember-default" ]
then
echo "Skipping version bump for EMBER_TRY_SCENARIO ${EMBER_TRY_SCENARIO}"
echo "Skipping pr-bumper bump step for EMBER_TRY_SCENARIO [${EMBER_TRY_SCENARIO}]"
exit 0
fi

Expand Down
6 changes: 3 additions & 3 deletions .travis/maybe-check-coverage.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/bin/bash

if [ "$TRAVIS_NODE_VERSION" != "6.9.1" ]
if [[ ! "${PUBLISH_NODE_VERSION:-8.1.2}" =~ ^$TRAVIS_NODE_VERSION ]]
then
echo "Skipping version bump for TRAVIS_NODE_VERSION ${TRAVIS_NODE_VERSION}"
echo "Skipping pr-bumper check-coverage step for TRAVIS_NODE_VERSION [${TRAVIS_NODE_VERSION}]"
exit 0
fi

if [ "$EMBER_TRY_SCENARIO" != "ember-default" ]
then
echo "Skipping version bump for EMBER_TRY_SCENARIO ${EMBER_TRY_SCENARIO}"
echo "Skipping pr-bumper check-coverage step for EMBER_TRY_SCENARIO [${EMBER_TRY_SCENARIO}]"
exit 0
fi

Expand Down
8 changes: 4 additions & 4 deletions .travis/maybe-publish-coverage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ source $(npm root -g)/pr-bumper/.travis/is-bump-commit.sh

if isBumpCommit
then
echo "Skipping coverage publish for version bump commit"
echo "Skipping pr-bumper coverage publish step for version bump commit"
exit 0
fi

if [ "$TRAVIS_NODE_VERSION" != "6.9.1" ]
if [[ ! "${PUBLISH_NODE_VERSION:-8.1.2}" =~ ^$TRAVIS_NODE_VERSION ]]
then
echo "Skipping coverage publish for TRAVIS_NODE_VERSION ${TRAVIS_NODE_VERSION}"
echo "Skipping pr-bumper coverage publish step for TRAVIS_NODE_VERSION [${TRAVIS_NODE_VERSION}]"
exit 0
fi

if [ "$EMBER_TRY_SCENARIO" != "ember-default" ]
then
echo "Skipping coverage publish for EMBER_TRY_SCENARIO ${EMBER_TRY_SCENARIO}"
echo "Skipping pr-bumper coverage publish step for EMBER_TRY_SCENARIO [${EMBER_TRY_SCENARIO}]"
exit 0
fi

Expand Down
6 changes: 3 additions & 3 deletions .travis/maybe-publish-gh-pages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source $(npm root -g)/pr-bumper/.travis/is-bump-commit.sh

if isBumpCommit
then
echo "Skipping gh-pages publish for version bump commit"
echo "Skipping pr-bumper gh-pages publish step for version bump commit"
exit 0
fi

Expand All @@ -14,7 +14,7 @@ TMP_GH_PAGES_DIR=.gh-pages-demo
# We only want to deploy to gh-pages from "master"
if [ "${TRAVIS_BRANCH}" != "master" ]
then
echo "Skipping gh-pages publish for branch ${TRAVIS_BRANCH}"
echo "Skipping pr-bumper gh-pages publish step for branch [${TRAVIS_BRANCH}]"
exit 0
fi

Expand All @@ -25,5 +25,5 @@ git checkout gh-pages
git rm -rf *
cp -r ../dist/* .
git add --all
git commit -m "[ci skip] Automated gh-pages commit of ${VERSION}"
git commit -m "[pr-bumper] Automated gh-pages commit of [${VERSION}]"
git push origin gh-pages > /dev/null 2>&1
21 changes: 21 additions & 0 deletions addon/helpers/get-typed-component-name.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
import Ember from 'ember'
const {Helper, get} = Ember

/**
* @typedef componentKeyNamesForTypes
* @type {Object}
* @property {Object} default - The itemName and itemExpansionName to use if one is not defined
* @property {...Object} [componentKeyNamesForTypes] - The optionally defined itemName(s) and itemExpansionName(s)
*/

/**
* Determines which list-item template should be used
*
* If no template is defined it provides for the lookup of a `default` set of templates for a list-item and
* expanded list-item
*
* @param {componentKeyNamesForTypes} componentKeyNamesForTypes - The object containing the templates to use
* @param {String} itemTypeKey - The key used to in the model data which lists the type template
* @param {Object} model - The model so the itemTypeKey property's value can be looked up
* @param {String} componentKey - The key used to look for the template under. Defaults to itemName and
* itemExpansionName defined in frost-list.js defaultProps componentKeyNames object.
* @param {String} defaultKey - the default templates to use if specific ones are not defined
* @returns {String} - the template name to use for the list-item
*/
export function getTypedComponentName ([componentKeyNamesForTypes, itemTypeKey, model, componentKey, defaultKey]) {
const type = get(model, itemTypeKey)

Expand Down
14 changes: 14 additions & 0 deletions addon/helpers/get-with-default.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
import Ember from 'ember'
const {Helper, getWithDefault: emberGetWithDefault} = Ember

/**
* Sets a default value for an object's property in a template
*
* This is being used to remove the setting of `itemExpansion` in frost-list.hbs when
* the usage is not for a "typed" list-item. In the case when this is a "typed"
* list-item and there is more than one template definition defined in
* `itemExpansionDefinitions` then the template in the `name`d property will be returned.
*
* @param {Object} object - An object containing the component objects
* @param {String} name - The component object name in which to set the default value
* @param {undefined} defaultValue - The default value to set
* @returns {Object|undefined} - The passed in object with name property value set to
* undefined or if name is not defined `undefined` is returned
*/
export function getWithDefault ([object, name, defaultValue]) {
if (name) {
return emberGetWithDefault(object, name, defaultValue)
Expand Down
24 changes: 0 additions & 24 deletions addon/helpers/is-lead-selection.js

This file was deleted.

Loading

0 comments on commit e4ccecd

Please sign in to comment.