Skip to content

Commit 74540fc

Browse files
Stevejoshsmith
authored andcommitted
upgrade dependencies (#43)
* fix sinon.stub deprecation * replace deprecated merge() with assign() * add ember-try * bump deps * remove limit to specific branches * remove bower files
1 parent cab2c5c commit 74540fc

File tree

18 files changed

+6977
-3899
lines changed

18 files changed

+6977
-3899
lines changed

.bowerrc

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

.eslintignore

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

.eslintrc.js

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,52 @@
11
module.exports = {
22
root: true,
33
parserOptions: {
4-
ecmaVersion: 2017,
4+
ecmaVersion: 2018,
55
sourceType: 'module'
66
},
7-
extends: 'eslint:recommended',
7+
plugins: [
8+
'ember'
9+
],
10+
extends: [
11+
'eslint:recommended',
12+
'plugin:ember/recommended'
13+
],
814
env: {
915
browser: true
1016
},
1117
rules: {
12-
}
18+
},
19+
overrides: [
20+
// node files
21+
{
22+
files: [
23+
'.eslintrc.js',
24+
'.template-lintrc.js',
25+
'ember-cli-build.js',
26+
'index.js',
27+
'testem.js',
28+
'blueprints/*/index.js',
29+
'config/**/*.js',
30+
'tests/dummy/config/**/*.js'
31+
],
32+
excludedFiles: [
33+
'addon/**',
34+
'addon-test-support/**',
35+
'app/**',
36+
'tests/dummy/app/**'
37+
],
38+
parserOptions: {
39+
sourceType: 'script',
40+
ecmaVersion: 2015
41+
},
42+
env: {
43+
browser: false,
44+
node: true
45+
},
46+
plugins: ['node'],
47+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
48+
// add your custom rules and overrides for node files here
49+
})
50+
}
51+
]
1352
};

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
/bower_components
1010

1111
# misc
12+
/.env*
13+
/.pnp*
1214
/.sass-cache
1315
/connect.lock
1416
/coverage/*

.npmignore

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
1-
/bower_components
1+
# compiled output
2+
/dist/
3+
/tmp/
4+
5+
# dependencies
6+
/bower_components/
7+
8+
# misc
9+
/.bowerrc
10+
/.editorconfig
11+
/.ember-cli
12+
/.env*
13+
/.eslintignore
14+
/.eslintrc.js
15+
/.gitignore
16+
/.template-lintrc.js
17+
/.travis.yml
18+
/.watchmanconfig
19+
/bower.json
220
/config/ember-try.js
3-
/dist
421
/tests
5-
/tmp
622
**/.gitkeep
7-
.bowerrc
8-
.editorconfig
9-
.ember-cli
10-
.gitignore
11-
.eslintrc.js
12-
.watchmanconfig
13-
.travis.yml
14-
bower.json
1523
ember-cli-build.js
1624
testem.js
1725

.template-lintrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: 'recommended'
5+
};

.travis.yml

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ node_js:
55
# so that your addon works for all apps
66
- "8"
77

8-
sudo: required
8+
sudo: false
99
dist: trusty
1010

1111
addons:
@@ -18,38 +18,37 @@ env:
1818
global:
1919
# See https://git.io/vdao3 for details.
2020
- JOBS=1
21-
matrix:
22-
# we recommend new addons test the current and previous LTS
23-
# as well as latest stable release (bonus points to beta/canary)
24-
- EMBER_TRY_SCENARIO=ember-lts-2.12
25-
- EMBER_TRY_SCENARIO=ember-lts-2.16
26-
- EMBER_TRY_SCENARIO=ember-lts-2.18
27-
- EMBER_TRY_SCENARIO=ember-release COVERAGE=true
28-
- EMBER_TRY_SCENARIO=ember-beta
29-
- EMBER_TRY_SCENARIO=ember-canary
30-
- EMBER_TRY_SCENARIO=ember-default
31-
32-
matrix:
33-
fast_finish: true
21+
22+
jobs:
23+
fail_fast: true
3424
allow_failures:
3525
- env: EMBER_TRY_SCENARIO=ember-canary
3626

37-
before_install:
38-
- curl -o- -L https://yarnpkg.com/install.sh | bash
39-
- export PATH=$HOME/.yarn/bin:$PATH
40-
- "sudo chown root /opt/google/chrome/chrome-sandbox"
41-
- "sudo chmod 4755 /opt/google/chrome/chrome-sandbox"
27+
include:
28+
# runs linting and tests with current locked deps
29+
30+
- stage: "Tests"
31+
name: "Tests"
32+
script:
33+
- yarn run lint:hbs
34+
# - yarn run lint:js
35+
- yarn test
4236

43-
install:
44-
- yarn install --no-lockfile --non-interactive
37+
# we recommend new addons test the current and previous LTS
38+
# as well as latest stable release (bonus points to beta/canary)
39+
- stage: "Additional Tests"
40+
env: EMBER_TRY_SCENARIO=ember-lts-2.18
41+
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
42+
- env: EMBER_TRY_SCENARIO=ember-release
43+
- env: EMBER_TRY_SCENARIO=ember-beta
44+
- env: EMBER_TRY_SCENARIO=ember-canary
45+
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
4546

4647
script:
47-
# Usually, it's ok to finish the test scenario without reverting
48-
# to the addon's original dependency state, skipping "cleanup".
49-
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
48+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
5049

5150
after_script:
5251
- cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
5352

5453
after_success:
55-
- npm run travis-deploy-once "npm run semantic-release"
54+
- npm run travis-deploy-once "npm run semantic-release"

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) 2017 Code Corps PBC
3+
Copyright (c) 2019 Code Corps PBC
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

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ A simple Ember wrapper for [Stripe Elements](https://stripe.com/docs/elements).
3535
$ ember install ember-stripe-elements
3636
```
3737

38+
## Compatibility
39+
40+
* Ember.js v2.18 or above
41+
* Ember CLI v2.13 or above
42+
* Node.js v8 or above
43+
3844
## Configuration
3945

4046
### Stripe Publishable Key

bower.json

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

0 commit comments

Comments
 (0)