Skip to content

Commit 402429d

Browse files
Ember Upgrade to 3.8 (#21)
1 parent 086a72b commit 402429d

21 files changed

+519
-470
lines changed

.eslintignore

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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
21+
22+
.eslintrc.js

.eslintrc.js

+6-11
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,19 @@ module.exports = {
2020
// node files
2121
{
2222
files: [
23+
'.eslintrc.js',
24+
'.template-lintrc.js',
25+
'ember-cli-build.js',
2326
'index.js',
2427
'testem.js',
25-
'ember-cli-build.js',
28+
'blueprints/*/index.js',
2629
'config/**/*.js',
2730
'tests/dummy/config/**/*.js'
2831
],
2932
excludedFiles: [
30-
'app/**',
3133
'addon/**',
34+
'addon-test-support/**',
35+
'app/**',
3236
'tests/dummy/app/**'
3337
],
3438
parserOptions: {
@@ -43,15 +47,6 @@ module.exports = {
4347
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
4448
// add your custom rules and overrides for node files here
4549
})
46-
},
47-
48-
// test files
49-
{
50-
files: ['tests/**/*.js'],
51-
excludedFiles: ['tests/dummy/**/*.js'],
52-
env: {
53-
embertest: true
54-
}
5550
}
5651
]
5752
};

.gitignore

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
# See http://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
1618
npm-debug.log*
1719
yarn-error.log
1820
testem.log
1921
package-lock.json
2022

2123
# ember-try
22-
.node_modules.ember-try/
23-
bower.json.ember-try
24-
package.json.ember-try
24+
/.node_modules.ember-try/
25+
/bower.json.ember-try
26+
/package.json.ember-try

.npmignore

+28-18
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,31 @@
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
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
21+
/CONTRIBUTING.md
22+
/ember-cli-build.js
23+
/testem.js
24+
/tests/
25+
/yarn.lock
26+
.gitkeep
1727

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

.template-lintrc.js

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: 'recommended',
5+
rules: {
6+
quotes: 'single'
7+
}
8+
};

.travis.yml

+28-16
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,37 @@ env:
2020
global:
2121
# See https://git.io/vdao3 for details.
2222
- JOBS=1
23-
matrix:
23+
24+
branches:
25+
only:
26+
- master
27+
# npm version tags
28+
- /^v\d+\.\d+\.\d+/
29+
30+
jobs:
31+
fail_fast: true
32+
allow_failures:
33+
- env: EMBER_TRY_SCENARIO=ember-canary
34+
35+
include:
36+
# runs linting and tests with current locked deps
37+
38+
- stage: "Tests"
39+
name: "Tests"
40+
script:
41+
- npm run lint:hbs
42+
- npm run lint:js
43+
- npm test
44+
2445
# we recommend new addons test the current and previous LTS
2546
# 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-release
29-
- EMBER_TRY_SCENARIO=ember-beta
30-
- EMBER_TRY_SCENARIO=ember-canary
31-
- EMBER_TRY_SCENARIO=ember-default
32-
33-
matrix:
34-
fast_finish: true
35-
allow_failures:
36-
- env: EMBER_TRY_SCENARIO=ember-lts-2.12
47+
- stage: "Additional Tests"
48+
env: EMBER_TRY_SCENARIO=ember-lts-2.18
49+
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
50+
- env: EMBER_TRY_SCENARIO=ember-release
3751
- env: EMBER_TRY_SCENARIO=ember-beta
3852
- env: EMBER_TRY_SCENARIO=ember-canary
53+
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
3954

4055
before_install:
4156
- npm config set spin false
@@ -48,7 +63,4 @@ install:
4863
- bower install
4964

5065
script:
51-
- npm run lint:js
52-
# Usually, it's ok to finish the test scenario without reverting
53-
# to the addon's original dependency state, skipping "cleanup".
54-
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
66+
- npm run test

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,4 +1,4 @@
1-
Copyright 2017, Yahoo Inc.
1+
Copyright (c) 2019, Yahoo Inc.
22

33
Redistribution and use in source and binary forms, with or without
44
modification, are permitted provided that the following conditions are met:

README.md

+9-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,15 @@
33

44
Ember components to build drag-and-drop multi-column grids powered by [gridstack.js](https://troolee.github.io/gridstack.js/)
55

6-
## Installation
6+
7+
Compatibility
8+
------------------------------------------------------------------------------
9+
10+
* Ember.js v2.18 or above
11+
* Ember CLI v2.13 or above
12+
13+
14+
Installation
715

816
```
917
ember install ember-gridstack
@@ -167,6 +175,5 @@ module.exports = function(environment) {
167175
};
168176
```
169177
170-
171178
[build-badge]: https://travis-ci.org/yahoo/ember-gridstack.svg?branch=master
172179
[build]: https://travis-ci.org/yahoo/ember-gridstack

0 commit comments

Comments
 (0)