Skip to content

Commit 9354f72

Browse files
RobbieTheWagnerRobbieTheWagner
committed
Ember 3.6
1 parent b0b87d1 commit 9354f72

File tree

13 files changed

+3055
-814
lines changed

13 files changed

+3055
-814
lines changed

‎.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: 6 additions & 2 deletions
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: {

‎.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

‎.npmignore‎

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
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+
/.eslintignore
13+
/.eslintrc.js
14+
/.gitignore
15+
/.template-lintrc.js
16+
/.travis.yml
17+
/.watchmanconfig
18+
/bower.json
219
/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
20+
/CONTRIBUTING.md
21+
/ember-cli-build.js
22+
/testem.js
23+
/tests/
24+
/yarn.lock
25+
.gitkeep
1726

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

‎.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: 37 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: node_js
33
node_js:
44
# we recommend testing addons with the same minimum supported node version as Ember CLI
55
# so that your addon works for all apps
6-
- "4"
6+
- "6"
77

88
sudo: false
99
dist: trusty
@@ -19,29 +19,49 @@ env:
1919
global:
2020
# See https://git.io/vdao3 for details.
2121
- JOBS=1
22-
matrix:
22+
23+
branches:
24+
only:
25+
- master
26+
# npm version tags
27+
- /^v\d+\.\d+\.\d+/
28+
29+
jobs:
30+
fail_fast: true
31+
allow_failures:
32+
- env: EMBER_TRY_SCENARIO=ember-canary
33+
34+
include:
35+
# runs linting and tests with current locked deps
36+
37+
- stage: "Tests"
38+
name: "Tests"
39+
install:
40+
- yarn install --non-interactive
41+
script:
42+
- yarn lint:hbs
43+
- yarn lint:js
44+
- yarn test
45+
46+
- name: "Floating Dependencies"
47+
script:
48+
- yarn test
49+
2350
# we recommend new addons test the current and previous LTS
2451
# as well as latest stable release (bonus points to beta/canary)
25-
- EMBER_TRY_SCENARIO=ember-lts-2.12
26-
- EMBER_TRY_SCENARIO=ember-lts-2.16
27-
- EMBER_TRY_SCENARIO=ember-lts-2.18
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:
52+
- stage: "Additional Tests"
53+
env: EMBER_TRY_SCENARIO=ember-lts-2.16
54+
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
55+
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
56+
- env: EMBER_TRY_SCENARIO=ember-release
57+
- env: EMBER_TRY_SCENARIO=ember-beta
3658
- env: EMBER_TRY_SCENARIO=ember-canary
59+
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
3760

3861
before_install:
3962
- npm config set spin false
4063
- npm install -g npm@4
4164
- npm --version
4265

4366
script:
44-
- npm run lint:js
45-
# Usually, it's ok to finish the test scenario without reverting
46-
# to the addon's original dependency state, skipping "cleanup".
47-
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
67+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

‎CONTRIBUTING.md‎

Lines changed: 26 additions & 0 deletions
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 ember-cli-netlify`
7+
* `yarn install`
8+
9+
## Linting
10+
11+
* `yarn lint:hbs`
12+
* `yarn lint:js`
13+
* `yarn 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/).

‎config/ember-try.js‎

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,39 @@ module.exports = function() {
66
return Promise.all([
77
getChannelURL('release'),
88
getChannelURL('beta'),
9-
getChannelURL('canary'),
9+
getChannelURL('canary')
1010
]).then((urls) => {
1111
return {
1212
scenarios: [
1313
{
14-
name: 'ember-lts-2.12',
14+
name: 'ember-lts-2.16',
15+
env: {
16+
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
17+
},
1518
npm: {
1619
devDependencies: {
17-
'ember-source': '~2.12.0'
20+
'@ember/jquery': '^0.5.1',
21+
'ember-source': '~2.16.0'
1822
}
1923
}
2024
},
2125
{
22-
name: 'ember-lts-2.16',
26+
name: 'ember-lts-2.18',
27+
env: {
28+
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
29+
},
2330
npm: {
2431
devDependencies: {
25-
'ember-source': '~2.16.0'
32+
'@ember/jquery': '^0.5.1',
33+
'ember-source': '~2.18.0'
2634
}
2735
}
2836
},
2937
{
30-
name: 'ember-lts-2.18',
38+
name: 'ember-lts-3.4',
3139
npm: {
3240
devDependencies: {
33-
'ember-source': '~2.18.0'
41+
'ember-source': '~3.4.0'
3442
}
3543
}
3644
},
@@ -58,11 +66,28 @@ module.exports = function() {
5866
}
5967
}
6068
},
69+
// The default `.travis.yml` runs this scenario via `yarn test`,
70+
// not via `ember try`. It's still included here so that running
71+
// `ember try:each` manually or from a customized CI config will run it
72+
// along with all the other scenarios.
6173
{
6274
name: 'ember-default',
6375
npm: {
6476
devDependencies: {}
6577
}
78+
},
79+
{
80+
name: 'ember-default-with-jquery',
81+
env: {
82+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
83+
'jquery-integration': true
84+
})
85+
},
86+
npm: {
87+
devDependencies: {
88+
'@ember/jquery': '^0.5.1'
89+
}
90+
}
6691
}
6792
]
6893
};

‎index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const fs = require('fs-extra');
44

55
module.exports = {
6-
name: 'ember-cli-netlify',
6+
name: require('./package').name,
77
outputReady(result) {
88
if (fs.pathExistsSync('.netlifyheaders')) {
99
fs.copySync('.netlifyheaders', 'dist/_headers', { clobber: true });

0 commit comments

Comments
 (0)