Skip to content

Commit 946725e

Browse files
donaldwassermandonaldwasserman
authored
Merge pull request #14 from donaldwasserman/upgrade
Updated via ember-cli-update
2 parents 20cab87 + 397492b commit 946725e

15 files changed

+238
-169
lines changed

‎.eslintignore

+20-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,20 @@
1-
/blueprints/*/files/**/*.js
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

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
module.exports = {
22
root: true,
3+
parser: 'babel-eslint',
34
parserOptions: {
4-
ecmaVersion: 2017,
5+
ecmaVersion: 2018,
56
sourceType: 'module'
67
},
78
plugins: ['ember'],
89
extends: ['eslint:recommended', 'prettier', 'plugin:ember/recommended'],
910
env: {
1011
browser: true
1112
},
12-
rules: {},
13+
rules: {
14+
'ember/no-jquery': 'error'
15+
},
1316
overrides: [
1417
// node files
1518
{
1619
files: [
20+
'.eslintrc.js',
21+
'.template-lintrc.js',
1722
'ember-cli-build.js',
1823
'index.js',
1924
'testem.js',
@@ -28,8 +33,7 @@ module.exports = {
2833
'tests/dummy/app/**'
2934
],
3035
parserOptions: {
31-
sourceType: 'script',
32-
ecmaVersion: 2015
36+
sourceType: 'script'
3337
},
3438
env: {
3539
browser: false,

‎.gitignore

+13-11
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
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
12+
/.env*
13+
/.pnp*
1214
/.sass-cache
1315
/connect.lock
14-
/coverage/*
16+
/coverage/
1517
/libpeerconnection.log
16-
npm-debug.log*
17-
yarn-error.log
18-
testem.log
18+
/npm-debug.log*
19+
/testem.log
20+
/yarn-error.log
1921

2022
# ember-try
21-
.node_modules.ember-try/
22-
bower.json.ember-try
23-
package.json.ember-try
23+
/.node_modules.ember-try/
24+
/bower.json.ember-try
25+
/package.json.ember-try

‎.npmignore

+29-18
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,32 @@
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+
/.git/
16+
/.gitignore
17+
/.template-lintrc.js
18+
/.travis.yml
19+
/.watchmanconfig
20+
/bower.json
221
/config/ember-try.js
3-
/dist
4-
/tests
5-
/tmp
6-
**/.gitkeep
7-
.bowerrc
8-
.editorconfig
9-
.ember-cli
10-
.eslintrc.js
11-
.gitignore
12-
.watchmanconfig
13-
.travis.yml
14-
bower.json
15-
ember-cli-build.js
16-
testem.js
22+
/CONTRIBUTING.md
23+
/ember-cli-build.js
24+
/testem.js
25+
/tests/
26+
/yarn.lock
27+
.gitkeep
1728

1829
# ember-try
19-
.node_modules.ember-try/
20-
bower.json.ember-try
21-
package.json.ember-try
30+
/.node_modules.ember-try/
31+
/bower.json.ember-try
32+
/package.json.ember-try

‎.template-lintrc.js

+5
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

+28-22
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,37 @@ env:
2020
global:
2121
# See https://git.io/vdao3 for details.
2222
- JOBS=1
23-
matrix:
24-
# we recommend new addons test the current and previous LTS
25-
# as well as latest stable release (bonus points to beta/canary)
26-
- EMBER_TRY_SCENARIO=ember-lts-2.12
27-
- EMBER_TRY_SCENARIO=ember-lts-2.16
28-
- EMBER_TRY_SCENARIO=ember-lts-2.18
29-
- EMBER_TRY_SCENARIO=ember-release
30-
- EMBER_TRY_SCENARIO=ember-beta
31-
- EMBER_TRY_SCENARIO=ember-canary
32-
- EMBER_TRY_SCENARIO=ember-default
33-
34-
matrix:
35-
fast_finish: true
23+
24+
branches:
25+
only:
26+
- master
27+
# npm version tags
28+
- /^v\d+\.\d+\.\d+/
29+
30+
jobs:
31+
fail_fast: true
3632
allow_failures:
3733
- env: EMBER_TRY_SCENARIO=ember-canary
3834

39-
before_install:
40-
- curl -o- -L https://yarnpkg.com/install.sh | bash
41-
- export PATH=$HOME/.yarn/bin:$PATH
35+
include:
36+
# runs linting and tests with current locked deps
4237

43-
install:
44-
- yarn install --no-lockfile --non-interactive
38+
- stage: "Tests"
39+
name: "Tests"
40+
script:
41+
- npm run lint:hbs
42+
- npm run lint:js
43+
- npm test
44+
45+
# we recommend new addons test the current and previous LTS
46+
# as well as latest stable release (bonus points to beta/canary)
47+
- stage: "Additional Tests"
48+
env: EMBER_TRY_SCENARIO=ember-lts-3.4
49+
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
50+
- env: EMBER_TRY_SCENARIO=ember-release
51+
- env: EMBER_TRY_SCENARIO=ember-beta
52+
- env: EMBER_TRY_SCENARIO=ember-canary
53+
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
4554

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

‎CONTRIBUTING.md

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# How To Contribute
2+
3+
## Installation
4+
5+
* `git clone <repository-url>`
6+
* `cd my-addon`
7+
* `npm install`
8+
9+
## Linting
10+
11+
* `npm run lint:hbs`
12+
* `npm run lint:js`
13+
* `npm run lint:js -- --fix`
14+
15+
## Running tests
16+
17+
* `ember test` – Runs the test suite on the current Ember version
18+
* `ember test --server` – Runs the test suite in "watch mode"
19+
* `ember try:each` – Runs the test suite against multiple Ember versions
20+
21+
## Running the dummy application
22+
23+
* `ember serve`
24+
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
25+
26+
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).

‎LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2018
3+
Copyright (c) 2019
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

+10-22
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@ Add calendar entries with comfort and style.
66

77
[![npm version](https://badge.fury.io/js/ember-add-calendar-button.svg)](https://badge.fury.io/js/ember-add-calendar-button)
88

9+
10+
Compatibility
11+
------------------------------------------------------------------------------
12+
13+
* Ember.js v3.4 or above
14+
* Ember CLI v2.13 or above
15+
* Node.js v8 or above
16+
17+
918
Installation
1019
------------------------------------------------------------------------------
1120

@@ -48,29 +57,8 @@ The `event` object can be an EmberObject or pojo.
4857
Contributing
4958
------------------------------------------------------------------------------
5059

51-
### Installation
52-
53-
* `git clone <repository-url>`
54-
* `cd my-addon`
55-
* `npm install`
56-
57-
### Linting
58-
59-
* `npm run lint:js`
60-
* `npm run lint:js -- --fix`
61-
62-
### Running tests
63-
64-
* `ember test` – Runs the test suite on the current Ember version
65-
* `ember test --server` – Runs the test suite in "watch mode"
66-
* `ember try:each` – Runs the test suite against multiple Ember versions
67-
68-
### Running the dummy application
69-
70-
* `ember serve`
71-
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
60+
See the [Contributing](CONTRIBUTING.md) guide for details.
7261

73-
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
7462

7563
License
7664
------------------------------------------------------------------------------

0 commit comments

Comments
 (0)