Skip to content

Commit f3e2628

Browse files
Gaurav0Gaurav0
committed
ember-cli-update
1 parent 2f5f23a commit f3e2628

File tree

14 files changed

+2770
-1330
lines changed

14 files changed

+2770
-1330
lines changed

‎.eslintignore

Lines changed: 20 additions & 1 deletion
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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
module.exports = {
22
root: true,
3+
parser: 'babel-eslint',
34
parserOptions: {
4-
ecmaVersion: 2017,
5+
ecmaVersion: 2018,
56
sourceType: 'module'
67
},
78
plugins: [
@@ -15,11 +16,14 @@ module.exports = {
1516
browser: true
1617
},
1718
rules: {
19+
'ember/no-jquery': 'error'
1820
},
1921
overrides: [
2022
// node files
2123
{
2224
files: [
25+
'.eslintrc.js',
26+
'.template-lintrc.js',
2327
'ember-cli-build.js',
2428
'index.js',
2529
'testem.js',
@@ -34,8 +38,7 @@ module.exports = {
3438
'tests/dummy/app/**'
3539
],
3640
parserOptions: {
37-
sourceType: 'script',
38-
ecmaVersion: 2015
41+
sourceType: 'script'
3942
},
4043
env: {
4144
browser: false,

‎.gitignore

Lines changed: 13 additions & 11 deletions
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

Lines changed: 29 additions & 18 deletions
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

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: 30 additions & 22 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+
- "8"
77

88
sudo: false
99
dist: trusty
@@ -19,29 +19,37 @@ env:
1919
global:
2020
# See https://git.io/vdao3 for details.
2121
- JOBS=1
22-
matrix:
23-
# we recommend new addons test the current and previous LTS
24-
# 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
22+
23+
branches:
24+
only:
25+
- master
26+
# npm version tags
27+
- /^v\d+\.\d+\.\d+/
28+
29+
jobs:
30+
fail_fast: true
3531
allow_failures:
3632
- env: EMBER_TRY_SCENARIO=ember-canary
3733

38-
before_install:
39-
- npm config set spin false
40-
- npm install -g npm@4
41-
- npm --version
34+
include:
35+
# runs linting and tests with current locked deps
36+
37+
- stage: "Tests"
38+
name: "Tests"
39+
script:
40+
- npm run lint:hbs
41+
- npm run lint:js
42+
- npm test
43+
44+
# we recommend new addons test the current and previous LTS
45+
# as well as latest stable release (bonus points to beta/canary)
46+
- stage: "Additional Tests"
47+
env: EMBER_TRY_SCENARIO=ember-lts-3.4
48+
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
49+
- env: EMBER_TRY_SCENARIO=ember-release
50+
- env: EMBER_TRY_SCENARIO=ember-beta
51+
- env: EMBER_TRY_SCENARIO=ember-canary
52+
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
4253

4354
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
55+
- 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 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

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) 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

‎config/ember-try.js

Lines changed: 60 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2,69 +2,72 @@
22

33
const getChannelURL = require('ember-source-channel-url');
44

5-
module.exports = function() {
6-
return Promise.all([
7-
getChannelURL('release'),
8-
getChannelURL('beta'),
9-
getChannelURL('canary')
10-
]).then((urls) => {
11-
return {
12-
scenarios: [
13-
{
14-
name: 'ember-lts-2.12',
15-
npm: {
16-
devDependencies: {
17-
'ember-source': '~2.12.0'
18-
}
5+
module.exports = async function() {
6+
return {
7+
scenarios: [
8+
{
9+
name: 'ember-lts-3.4',
10+
npm: {
11+
devDependencies: {
12+
'ember-source': '~3.4.0'
1913
}
20-
},
21-
{
22-
name: 'ember-lts-2.16',
23-
npm: {
24-
devDependencies: {
25-
'ember-source': '~2.16.0'
26-
}
27-
}
28-
},
29-
{
30-
name: 'ember-lts-2.18',
31-
npm: {
32-
devDependencies: {
33-
'ember-source': '~2.18.0'
34-
}
14+
}
15+
},
16+
{
17+
name: 'ember-lts-3.8',
18+
npm: {
19+
devDependencies: {
20+
'ember-source': '~3.8.0'
3521
}
36-
},
37-
{
38-
name: 'ember-release',
39-
npm: {
40-
devDependencies: {
41-
'ember-source': urls[0]
42-
}
22+
}
23+
},
24+
{
25+
name: 'ember-release',
26+
npm: {
27+
devDependencies: {
28+
'ember-source': await getChannelURL('release')
4329
}
44-
},
45-
{
46-
name: 'ember-beta',
47-
npm: {
48-
devDependencies: {
49-
'ember-source': urls[1]
50-
}
30+
}
31+
},
32+
{
33+
name: 'ember-beta',
34+
npm: {
35+
devDependencies: {
36+
'ember-source': await getChannelURL('beta')
5137
}
52-
},
53-
{
54-
name: 'ember-canary',
55-
npm: {
56-
devDependencies: {
57-
'ember-source': urls[2]
58-
}
38+
}
39+
},
40+
{
41+
name: 'ember-canary',
42+
npm: {
43+
devDependencies: {
44+
'ember-source': await getChannelURL('canary')
5945
}
46+
}
47+
},
48+
// The default `.travis.yml` runs this scenario via `npm test`,
49+
// not via `ember try`. It's still included here so that running
50+
// `ember try:each` manually or from a customized CI config will run it
51+
// along with all the other scenarios.
52+
{
53+
name: 'ember-default',
54+
npm: {
55+
devDependencies: {}
56+
}
57+
},
58+
{
59+
name: 'ember-default-with-jquery',
60+
env: {
61+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
62+
'jquery-integration': true
63+
})
6064
},
61-
{
62-
name: 'ember-default',
63-
npm: {
64-
devDependencies: {}
65+
npm: {
66+
devDependencies: {
67+
'@ember/jquery': '^0.5.1'
6568
}
6669
}
67-
]
68-
};
69-
});
70+
}
71+
]
72+
};
7073
};

0 commit comments

Comments
 (0)