Skip to content
This repository has been archived by the owner on Nov 21, 2024. It is now read-only.

Commit

Permalink
Update to Ember 3.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
BryanHuntNV committed Jan 6, 2019
1 parent 1710cce commit 4bb38e6
Show file tree
Hide file tree
Showing 30 changed files with 22,443 additions and 8,364 deletions.
20 changes: 20 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# 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
43 changes: 41 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,49 @@ module.exports = {
ecmaVersion: 2017,
sourceType: 'module'
},
extends: 'eslint:recommended',
plugins: [
'ember'
],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
],
env: {
browser: true
},
rules: {
}
},
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
})
}
]
};
22 changes: 11 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# 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
/.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
44 changes: 29 additions & 15 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,30 @@
/bower_components
# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.eslintignore
/.eslintrc.js
/.gitignore
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/config/ember-try.js
/dist
/tests
/tmp
**/.gitkeep
.bowerrc
.editorconfig
.ember-cli
.gitignore
.eslintrc.js
.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
5 changes: 5 additions & 0 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use strict';

module.exports = {
extends: 'recommended'
};
46 changes: 31 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: node_js
node_js:
# we recommend testing addons with the same minimum supported node version as Ember CLI
# so that your addon works for all apps
- "4"
- "6"

sudo: false
dist: trusty
Expand All @@ -19,27 +19,43 @@ env:
global:
# See https://git.io/vdao3 for details.
- JOBS=1
matrix:

branches:
only:
- master
# npm version tags
- /^v\d+\.\d+\.\d+/

jobs:
fail_fast: true
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-canary

include:
# runs linting and tests with current locked deps

- stage: "Tests"
name: "Tests"
script:
- npm run lint:hbs
- npm run lint:js
- npm test

# 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:
- stage: "Additional Tests"
env: EMBER_TRY_SCENARIO=ember-lts-2.16
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery

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

script:
# 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
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
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 <repository-url>`
* `cd my-addon`
* `npm install`

## Linting

* `npm run lint:hbs`
* `npm run lint:js`
* `npm 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) 2017
Copyright (c) 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
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# ember-split-view
[![Build Status](https://travis-ci.org/BryanHunt/ember-split-view.svg?branch=master)](https://travis-ci.org/BryanHunt/ember-split-view)
================

See it in action: http://bryanhunt.github.io/#/split

Expand Down Expand Up @@ -58,3 +55,4 @@ Horizontal SplitView example:
All donations will support this project and keep the developer supplied with Reese's Minis.

[![Support via Gittip](https://rawgithub.com/twolfson/gittip-badge/0.2.0/dist/gittip.png)](https://www.gittip.com/BryanHunt/)

18 changes: 9 additions & 9 deletions addon/components/split-child.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Ember from 'ember';
import Component from '@ember/component';
import { computed, observer } from '@ember/object';
import { schedule, next, scheduleOnce } from '@ember/runloop'
import splitChildLayout from 'ember-split-view/templates/components/split-child';

const { computed, observer } = Ember;

export default Ember.Component.extend({
export default Component.extend({
layout: splitChildLayout,
classNames: ['split-view-child'],
classNameBindings: [
Expand All @@ -18,7 +18,7 @@ export default Ember.Component.extend({
init() {
this._super();

Ember.run.schedule('afterRender', this, () => {
schedule('afterRender', this, () => {
this.set('register-as', this); // register-as is a new property
});
},
Expand All @@ -27,7 +27,7 @@ export default Ember.Component.extend({
const parent = this.get('parent');

// run next to avoid changing the component during a render iteration
Ember.run.next(this, () => {
next(this, () => {
if (parent && parent.addSplit) {
parent.addSplit(this);
}
Expand Down Expand Up @@ -71,7 +71,7 @@ export default Ember.Component.extend({
}
),

parentSize: computed('anchorSide', 'parent.width', 'parent.height',
parentSize: computed('anchorSide', 'parent.{width,height}',
function () {
const anchorSide = this.get('anchorSide');
if (!anchorSide) {
Expand All @@ -86,7 +86,7 @@ export default Ember.Component.extend({
}
),

anchorOffset: computed('parent.sash.width', 'parent.splitPosition', 'anchorSide', 'parentSize',
anchorOffset: computed('parent.{sash.width,splitPosition}', 'anchorSide', 'parentSize',
function () {
const anchorSide = this.get('anchorSide');

Expand All @@ -112,7 +112,7 @@ export default Ember.Component.extend({
updateChildSplitView: observer('childSplitView', 'anchorOffset', 'parent.width', 'parent.height',
function () {
// must run afterRender so that the size has updated
Ember.run.scheduleOnce('afterRender', this, () => {
scheduleOnce('afterRender', this, () => {
const childSplitView = this.get('childSplitView');

const element = this.$();
Expand Down
9 changes: 5 additions & 4 deletions addon/components/split-sash.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Ember from 'ember';
import Component from '@ember/component';
import { observer } from '@ember/object';
import { next } from '@ember/runloop'

const { run, observer } = Ember;

/**
* This view represents the divider between two views enclosed in a SplitView.
Expand All @@ -11,7 +12,7 @@ const { run, observer } = Ember;
* @cLass SplitSashComponent
* @extends Ember.View
*/
export default Ember.Component.extend({
export default Component.extend({
width: 6,
widthPercentage: null,

Expand All @@ -22,7 +23,7 @@ export default Ember.Component.extend({
this._super();
// run next to avoid changing the component during a render iteration
const parent = this.get('parent');
run.next(this, () => {
next(this, () => {
if (parent) {
this.set('parent.sash', this);
}
Expand Down
Loading

0 comments on commit 4bb38e6

Please sign in to comment.