Skip to content
This repository was archived by the owner on Apr 17, 2020. It is now read-only.

Commit 526cfe8

Browse files
authored
Merge pull request #34 from simplabs/node-eol
Update dependencies before 1.0 release
2 parents 8d47d64 + 0ed34be commit 526cfe8

21 files changed

+11146
-161
lines changed

.editorconfig

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
root = true
66

7-
87
[*]
98
end_of_line = lf
109
charset = utf-8

.eslintignore

+2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88

99
# dependencies
1010
/bower_components/
11+
/node_modules/
1112

1213
# misc
1314
/coverage/
15+
!.*
1416

1517
# ember-try
1618
/.node_modules.ember-try/

.eslintrc.js

+20-14
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,30 @@
1+
'use strict';
2+
13
module.exports = {
24
root: true,
3-
extends: [
4-
'simplabs',
5-
'simplabs/plugins/ember',
6-
],
5+
parser: 'babel-eslint',
76
parserOptions: {
8-
ecmaVersion: 2017,
9-
sourceType: 'module'
7+
ecmaVersion: 2018,
8+
sourceType: 'module',
9+
ecmaFeatures: {
10+
legacyDecorators: true
11+
}
12+
},
13+
env: {
14+
browser: true
1015
},
1116
overrides: [
1217
// node files
1318
{
1419
files: [
20+
'.eslintrc.js',
21+
'.template-lintrc.js',
1522
'ember-cli-build.js',
16-
'fastboot-server.js',
1723
'index.js',
1824
'testem.js',
25+
'blueprints/*/index.js',
1926
'config/**/*.js',
20-
'tests/**/*.js'
27+
'tests/dummy/config/**/*.js'
2128
],
2229
excludedFiles: [
2330
'addon/**',
@@ -26,23 +33,22 @@ module.exports = {
2633
'tests/dummy/app/**'
2734
],
2835
parserOptions: {
29-
sourceType: 'script',
30-
ecmaVersion: 2015
36+
sourceType: 'script'
3137
},
3238
env: {
3339
browser: false,
3440
node: true
3541
},
3642
plugins: ['node'],
3743
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
38-
"node/no-extraneous-require": "off",
39-
"node/no-unpublished-require": "off"
44+
'node/no-extraneous-require': 'off',
45+
'node/no-unpublished-require': 'off'
4046
// add your custom rules and overrides for node files here
4147
})
4248
}, {
4349
files: [
44-
"lib/**/*.js",
45-
"tests/**/*-nodetest.js",
50+
'lib/**/*.js',
51+
'tests/**/*-nodetest.js',
4652
],
4753
env: {
4854
node: true,

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
/node_modules/
1010

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

.npmignore

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@
99
/.bowerrc
1010
/.editorconfig
1111
/.ember-cli
12+
/.env*
1213
/.eslintignore
1314
/.eslintrc.js
15+
/.git/
1416
/.gitignore
15-
/.watchmanconfig
17+
/.template-lintrc.js
1618
/.travis.yml
19+
/.watchmanconfig
1720
/bower.json
1821
/config/ember-try.js
22+
/CONTRIBUTING.md
1923
/ember-cli-build.js
2024
/testem.js
2125
/tests/

.template-lintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'recommended'
4+
extends: 'octane'
55
};

.travis.yml

+16-9
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,33 @@
11
---
22
language: node_js
3-
43
node_js:
5-
- 'stable'
6-
- '8'
7-
- '6'
4+
- "stable"
5+
- "10"
6+
- "12"
87

9-
sudo: false
108
dist: trusty
119

1210
addons:
1311
chrome: stable
1412

1513
cache:
16-
directories:
17-
- node_modules
14+
yarn: true
15+
16+
branches:
17+
only:
18+
- master
19+
# npm version tags
20+
- /^v\d+\.\d+\.\d+/
21+
22+
before_install:
23+
- curl -o- -L https://yarnpkg.com/install.sh | bash
24+
- export PATH=$HOME/.yarn/bin:$PATH
1825

1926
install:
20-
- npm install
27+
- yarn install --non-interactive
2128

2229
script:
23-
- npm test
30+
- yarn test
2431

2532
notifications:
2633
email:

LICENSE

-20
This file was deleted.

LICENSE.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2015-2020 simplabs GmbH and contributors
4+
5+
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:
6+
7+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
8+
9+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ The underlying http-library used to send requests to the specified services. Thi
367367

368368
## Running Tests
369369

370-
- `npm test`
370+
- `yarn test`
371371

372372
[1]: http://ember-cli-deploy.com/docs/v0.6.x/plugins-overview/ "Plugin Documentation"
373373

config/ember-try.js

+73-68
Original file line numberDiff line numberDiff line change
@@ -2,82 +2,87 @@
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.16',
15-
env: {
16-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
17-
},
18-
npm: {
19-
devDependencies: {
20-
'@ember/jquery': '^0.5.1',
21-
'ember-source': '~2.16.0'
22-
}
5+
module.exports = async function() {
6+
return {
7+
scenarios: [
8+
{
9+
name: 'ember-lts-3.12',
10+
npm: {
11+
devDependencies: {
12+
'ember-source': '~3.12.0'
2313
}
24-
},
25-
{
26-
name: 'ember-lts-2.18',
27-
env: {
28-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
29-
},
30-
npm: {
31-
devDependencies: {
32-
'@ember/jquery': '^0.5.1',
33-
'ember-source': '~2.18.0'
34-
}
14+
}
15+
},
16+
{
17+
name: 'ember-lts-3.16',
18+
npm: {
19+
devDependencies: {
20+
'ember-source': '~3.16.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
}
69+
}
70+
},
71+
{
72+
name: 'ember-classic',
73+
env: {
74+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
75+
'application-template-wrapper': true,
76+
'default-async-observers': false,
77+
'template-only-glimmer-components': false
78+
})
6679
},
67-
{
68-
name: 'ember-default-with-jquery',
69-
env: {
70-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
71-
'jquery-integration': true
72-
})
73-
},
74-
npm: {
75-
devDependencies: {
76-
'@ember/jquery': '^0.5.1'
77-
}
80+
npm: {
81+
ember: {
82+
edition: 'classic'
7883
}
7984
}
80-
]
81-
};
82-
});
85+
}
86+
]
87+
};
8388
};

index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ function notificationHook(hookName) {
4545
}
4646

4747
module.exports = {
48-
name: 'ember-cli-deploy-webhooks',
48+
name: require('./package').name,
4949

5050
createDeployPlugin: function(options) {
5151
var DeployPlugin = DeployPluginBase.extend({

0 commit comments

Comments
 (0)