Skip to content

Commit 1d55722

Browse files
committed
Merge branch 'master' into zach-screen
2 parents 66d4dea + 38b99a3 commit 1d55722

33 files changed

+9594
-13533
lines changed

.bowerrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

.eslintignore

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,18 @@
1-
/tests/dummy/public/js/materialize.js
1+
/tests/dummy/public/js/materialize.js
2+
3+
# unconventional js
4+
/blueprints/*/files/
5+
/vendor/
6+
7+
# compiled output
8+
/dist/
9+
/tmp/
10+
11+
# dependencies
12+
/bower_components/
13+
14+
# misc
15+
/coverage/
16+
17+
# ember-try
18+
/.node_modules.ember-try/

.eslintrc.js

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,24 @@ module.exports = {
1515
browser: true
1616
},
1717
rules: {
18+
'ember/no-jquery': 2
1819
},
1920
overrides: [
2021
// node files
2122
{
2223
files: [
24+
'ember-cli-build.js',
2325
'index.js',
2426
'testem.js',
25-
'ember-cli-build.js',
27+
'blueprints/*/index.js',
2628
'config/**/*.js',
2729
'tests/dummy/config/**/*.js'
2830
],
2931
excludedFiles: [
32+
'addon/**',
33+
'addon-test-support/**',
3034
'app/**',
31-
'addon/**'
35+
'tests/dummy/app/**'
3236
],
3337
parserOptions: {
3438
sourceType: 'script',
@@ -42,15 +46,6 @@ module.exports = {
4246
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
4347
// add your custom rules and overrides for node files here
4448
})
45-
},
46-
47-
// test files
48-
{
49-
files: ['tests/**/*.js'],
50-
excludedFiles: ['tests/dummy/**/*.js'],
51-
env: {
52-
embertest: true
53-
}
5449
}
5550
]
5651
};

.gitignore

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
4-
/dist
5-
/tmp
4+
/dist/
5+
/tmp/
66

77
# dependencies
8-
/node_modules
9-
/bower_components
8+
/bower_components/
9+
/node_modules/
1010

1111
# misc
1212
/.sass-cache
1313
/connect.lock
14-
/coverage/*
14+
/coverage/
1515
/libpeerconnection.log
16-
npm-debug.log*
17-
yarn-error.log
18-
testem.log
16+
/npm-debug.log*
17+
/testem.log
18+
/yarn-error.log
1919

2020
# ember-try
21-
.node_modules.ember-try/
22-
bower.json.ember-try
23-
package.json.ember-try
21+
/.node_modules.ember-try/
22+
/bower.json.ember-try
23+
/package.json.ember-try

.jscsrc

Lines changed: 0 additions & 5 deletions
This file was deleted.

.jshintrc

Lines changed: 0 additions & 32 deletions
This file was deleted.

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
bower.json
1515
ember-cli-build.js
1616
testem.js
17+
yarn.lock
1718

1819
# ember-try
1920
.node_modules.ember-try/

.travis.yml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
---
22
language: node_js
33
node_js:
4-
- "4"
4+
- "8"
55

6-
sudo: false
6+
sudo: required
77
dist: trusty
88

99
addons:
1010
chrome: stable
1111

1212
cache:
13-
directories:
14-
- $HOME/.npm
13+
yarn: true
14+
15+
before_script:
16+
- sudo chmod 4755 /opt/google/chrome/chrome-sandbox
17+
- sudo chown root /opt/google/chrome/chrome-sandbox
1518

1619
env:
1720
global:
@@ -22,6 +25,7 @@ env:
2225
# as well as latest stable release (bonus points to beta/canary)
2326
- EMBER_TRY_SCENARIO=ember-lts-2.12
2427
- EMBER_TRY_SCENARIO=ember-lts-2.16
28+
- EMBER_TRY_SCENARIO=ember-lts-2.18
2529
- EMBER_TRY_SCENARIO=ember-release
2630
- EMBER_TRY_SCENARIO=ember-beta
2731
- EMBER_TRY_SCENARIO=ember-canary
@@ -34,25 +38,24 @@ matrix:
3438
allow_failures:
3539
- env: ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-canary
3640

41+
install:
42+
- yarn install --no-lockfile --non-interactive
43+
3744
before_install:
38-
- npm config set spin false
39-
- npm install -g npm@4
40-
- npm --version
45+
- curl -o- -L https://yarnpkg.com/install.sh | bash
46+
- export PATH=$HOME/.yarn/bin:$PATH
4147

4248
script:
43-
- npm run lint:js
49+
- yarn lint:js
4450
# Usually, it's ok to finish the test scenario without reverting
4551
# to the addon's original dependency state, skipping "cleanup".
4652
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
4753

4854
# after_script:
4955
# - ember sauce:disconnect
5056

51-
deploy:
52-
provider: npm
53-
54-
api_key:
55-
secure: hcFfd5SfBqVbyS1NP2MM6u+B6fK6uVD1zzUrmOPqFczEJ02NNXI3W+x7XHeX3OFYiN27iIpdzMtF1/VUV4+GUc4YotABYzcPi4+DED9Ns6O6dEYQ0SX1CcPyrB0jlsEl8QOJJErQP0LJ7XN24xbtEoXqgxbiknId1Mg2OS9++vlMK+ny6SoBwJrWUTWEvHW3a6Gl/aaNFUSJTTGIyG/iChnB18s949AV4qMfslrdBmos9Gnn5Po90Vq0bj38P8Z0zEHh4o2Z6cwliX2qOAa4jzHzoXAb3CNXzX1EiVbqEn9Ph9MjR8p7l2zm3T/K9Rc3fUnz8nHeIOlT15w/1BOzCrY85QC/R1pdx+cdA6GOVR2yX+MeeawzTbjXtaP6gsdvNSvv7t6VhqbmoQJWMPccO473bfuwPM+qvW4X22/Z7cxdYbfbAhwtukbcXUoY8W9hPzqwTJueqNyfDjpaEfcNh8wuv+UnhmlDXiqVdonkFdh0b2Ac+RuLsicYvoLdGQMIgenTb88kdGy30EKJTO1kA3WzKQKm24uqADH7ZnHd2HvCeasWE18JXWOFNViNzMbnfS732ApALY0of7giZ0P3J1LY9OxoXxJA77hfsKfyU1u2vPxTKPakYamlca5g93p0H2kBJJedZru6az+O8BZhK2v0EyKwsEbUdXtC+fIIeFM=
56-
on:
57-
tags: true
58-
repo: mike-north/ember-resize
57+
after_success:
58+
- npm run travis-deploy-once "npm run semantic-release"
59+
branches:
60+
except:
61+
- /^v\d+\.\d+\.\d+$/

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
## [0.0.17](https://github.com/mike-north/ember-resize/compare/v0.0.16...v0.0.17) (2018-08-22)
2+
3+
4+
### Bug Fixes
5+
6+
* semantic-release ([2b3c864](https://github.com/mike-north/ember-resize/commit/2b3c864))
7+
* semantic-release in travis-ci ([245e2a2](https://github.com/mike-north/ember-resize/commit/245e2a2))
8+
* upgrade ember ([e191fed](https://github.com/mike-north/ember-resize/commit/e191fed))
9+
110
# Change Log
211

312
## [v0.0.7](https://github.com/truenorth/ember-resize/tree/v0.0.7) (2015-07-23)

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016 Mike North
3+
Copyright (c) 2018 Mike North
44

55
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:
66

0 commit comments

Comments
 (0)