Skip to content

Commit df99479

Browse files
simonihmigsimonihmig
authored
Merge pull request #18 from jelhan/upgrade-dependencies
upgrade dependencies except ember-changeset
2 parents 02a02e8 + 0dcdbf7 commit df99479

File tree

21 files changed

+5527
-1320
lines changed

21 files changed

+5527
-1320
lines changed

‎.editorconfig‎

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

‎.eslintrc.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
module.exports = {
22
root: true,
3+
parser: 'babel-eslint',
34
parserOptions: {
4-
ecmaVersion: 2017,
5-
sourceType: 'module'
5+
ecmaVersion: 2018,
6+
sourceType: 'module',
7+
ecmaFeatures: {
8+
legacyDecorators: true
9+
}
610
},
711
plugins: [
812
'ember'
@@ -15,6 +19,7 @@ module.exports = {
1519
browser: true
1620
},
1721
rules: {
22+
'ember/no-jquery': 'error'
1823
},
1924
overrides: [
2025
// node files
@@ -36,8 +41,7 @@ module.exports = {
3641
'tests/dummy/app/**'
3742
],
3843
parserOptions: {
39-
sourceType: 'script',
40-
ecmaVersion: 2015
44+
sourceType: 'script'
4145
},
4246
env: {
4347
browser: false,

‎.npmignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/.env*
1313
/.eslintignore
1414
/.eslintrc.js
15+
/.git/
1516
/.gitignore
1617
/.template-lintrc.js
1718
/.travis.yml

‎.template-lintrc.js‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ 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-
- "6"
6+
- "10"
77

8-
sudo: false
98
dist: trusty
109

1110
addons:
@@ -26,29 +25,35 @@ branches:
2625
- /^v\d+\.\d+\.\d+/
2726

2827
jobs:
29-
fail_fast: true
28+
fast_finish: true
3029
allow_failures:
3130
- env: EMBER_TRY_SCENARIO=ember-canary
3231

3332
include:
3433
# runs linting and tests with current locked deps
35-
3634
- stage: "Tests"
3735
name: "Tests"
3836
script:
3937
- npm run lint:hbs
4038
- npm run lint:js
4139
- npm test
4240

41+
- stage: "Additional Tests"
42+
name: "Floating Dependencies"
43+
install:
44+
- npm install --no-package-lock
45+
script:
46+
- npm test
47+
4348
# we recommend new addons test the current and previous LTS
4449
# as well as latest stable release (bonus points to beta/canary)
45-
- stage: "Additional Tests"
46-
env: EMBER_TRY_SCENARIO=ember-lts-2.18
47-
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
50+
- env: EMBER_TRY_SCENARIO=ember-3.13
51+
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
4852
- env: EMBER_TRY_SCENARIO=ember-release
4953
- env: EMBER_TRY_SCENARIO=ember-beta
5054
- env: EMBER_TRY_SCENARIO=ember-canary
5155
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
56+
- env: EMBER_TRY_SCENARIO=ember-classic
5257

5358
before_install:
5459
- curl -o- -L https://yarnpkg.com/install.sh | bash

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ further details.
1010
Compatibility
1111
------------------------------------------------------------------------------
1212

13-
* Ember.js v2.18 or above
13+
* Ember Bootstrap v3
14+
* Ember Changeset and Ember Changeset Validations v2
15+
* Ember.js v3.13 or above
1416
* Ember CLI v2.13 or above
17+
* Node.js v10 or above
1518

1619

1720
Installation

‎config/ember-try.js‎

Lines changed: 74 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -2,83 +2,88 @@
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-
useYarn: true,
13-
scenarios: [
14-
{
15-
name: 'ember-lts-2.18',
16-
env: {
17-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
18-
},
19-
npm: {
20-
devDependencies: {
21-
'@ember/jquery': '^0.5.1',
22-
'ember-source': '~2.18.0'
23-
}
5+
module.exports = async function() {
6+
return {
7+
useYarn: true,
8+
scenarios: [
9+
{
10+
name: 'ember-3.13',
11+
npm: {
12+
devDependencies: {
13+
'ember-source': '~3.13.0'
2414
}
25-
},
26-
{
27-
name: 'ember-lts-3.4',
28-
npm: {
29-
devDependencies: {
30-
'ember-source': '~3.4.0'
31-
}
15+
}
16+
},
17+
{
18+
name: 'ember-lts-3.16',
19+
npm: {
20+
devDependencies: {
21+
'ember-source': '~3.16.0'
3222
}
33-
},
34-
{
35-
name: 'ember-release',
36-
npm: {
37-
devDependencies: {
38-
'ember-source': urls[0]
39-
}
23+
}
24+
},
25+
{
26+
name: 'ember-release',
27+
npm: {
28+
devDependencies: {
29+
'ember-source': await getChannelURL('release')
4030
}
41-
},
42-
{
43-
name: 'ember-beta',
44-
npm: {
45-
devDependencies: {
46-
'ember-source': urls[1]
47-
}
31+
}
32+
},
33+
{
34+
name: 'ember-beta',
35+
npm: {
36+
devDependencies: {
37+
'ember-source': await getChannelURL('beta')
4838
}
49-
},
50-
{
51-
name: 'ember-canary',
52-
npm: {
53-
devDependencies: {
54-
'ember-source': urls[2]
55-
}
39+
}
40+
},
41+
{
42+
name: 'ember-canary',
43+
npm: {
44+
devDependencies: {
45+
'ember-source': await getChannelURL('canary')
5646
}
47+
}
48+
},
49+
// The default `.travis.yml` runs this scenario via `npm test`,
50+
// not via `ember try`. It's still included here so that running
51+
// `ember try:each` manually or from a customized CI config will run it
52+
// along with all the other scenarios.
53+
{
54+
name: 'ember-default',
55+
npm: {
56+
devDependencies: {}
57+
}
58+
},
59+
{
60+
name: 'ember-default-with-jquery',
61+
env: {
62+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
63+
'jquery-integration': true
64+
})
5765
},
58-
// The default `.travis.yml` runs this scenario via `npm test`,
59-
// not via `ember try`. It's still included here so that running
60-
// `ember try:each` manually or from a customized CI config will run it
61-
// along with all the other scenarios.
62-
{
63-
name: 'ember-default',
64-
npm: {
65-
devDependencies: {}
66+
npm: {
67+
devDependencies: {
68+
'@ember/jquery': '^0.5.1'
6669
}
70+
}
71+
},
72+
{
73+
name: 'ember-classic',
74+
env: {
75+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
76+
'application-template-wrapper': true,
77+
'default-async-observers': false,
78+
'template-only-glimmer-components': false
79+
})
6780
},
68-
{
69-
name: 'ember-default-with-jquery',
70-
env: {
71-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
72-
'jquery-integration': true
73-
})
74-
},
75-
npm: {
76-
devDependencies: {
77-
'@ember/jquery': '^0.5.1'
78-
}
81+
npm: {
82+
ember: {
83+
edition: 'classic'
7984
}
8085
}
81-
]
82-
};
83-
});
86+
}
87+
]
88+
};
8489
};

‎ember-cli-build.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ module.exports = function(defaults) {
66
let app = new EmberAddon(defaults, {
77
// Add options here
88
'ember-bootstrap': {
9-
bootstrapVersion: 3
9+
bootstrapVersion: 4,
10+
importBootstrapFont: false,
11+
importBootstrapCSS: true
1012
},
1113
});
1214

‎package.json‎

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"test": "tests"
1919
},
2020
"scripts": {
21-
"build": "ember build",
21+
"build": "ember build --environment=production",
2222
"lint:hbs": "ember-template-lint .",
2323
"lint:js": "eslint .",
2424
"start": "ember serve",
@@ -27,38 +27,44 @@
2727
},
2828
"dependencies": {
2929
"ember-changeset-validations": "^2.1.0",
30-
"ember-cli-babel": "^7.1.2"
30+
"ember-cli-babel": "^7.17.2",
31+
"ember-cli-htmlbars": "^4.2.2"
3132
},
3233
"devDependencies": {
33-
"@ember/optional-features": "^0.6.3",
34-
"bootstrap": "^3.3.7",
35-
"broccoli-asset-rev": "^2.7.0",
36-
"ember-bootstrap": "^2.5.0",
37-
"ember-cli": "~3.8.1",
38-
"ember-cli-dependency-checker": "^3.1.0",
39-
"ember-cli-eslint": "^4.2.3",
40-
"ember-cli-htmlbars": "^3.0.0",
41-
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
42-
"ember-cli-inject-live-reload": "^1.8.2",
34+
"@ember/optional-features": "^1.3.0",
35+
"@glimmer/component": "^1.0.0",
36+
"@glimmer/tracking": "^1.0.0",
37+
"babel-eslint": "^10.0.3",
38+
"bootstrap": "^4.3.1",
39+
"broccoli-asset-rev": "^3.0.0",
40+
"ember-auto-import": "^1.5.3",
41+
"ember-bootstrap": "^3.1.1",
42+
"ember-cli": "~3.16.0",
43+
"ember-cli-dependency-checker": "^3.2.0",
44+
"ember-cli-eslint": "^5.1.0",
45+
"ember-cli-inject-live-reload": "^2.0.2",
4346
"ember-cli-sri": "^2.1.1",
44-
"ember-cli-template-lint": "^1.0.0-beta.1",
45-
"ember-cli-uglify": "^2.1.0",
47+
"ember-cli-template-lint": "^2.0.0",
48+
"ember-cli-uglify": "^3.0.0",
4649
"ember-disable-prototype-extensions": "^1.1.3",
47-
"ember-export-application-global": "^2.0.0",
48-
"ember-load-initializers": "^1.1.0",
50+
"ember-export-application-global": "^2.0.1",
51+
"ember-load-initializers": "^2.1.1",
4952
"ember-maybe-import-regenerator": "^0.1.6",
50-
"ember-qunit": "^3.4.1",
51-
"ember-resolver": "^5.0.1",
52-
"ember-source": "~3.8.0",
53-
"ember-source-channel-url": "^1.1.0",
54-
"ember-try": "^1.0.0",
55-
"eslint-plugin-ember": "^5.2.0",
56-
"eslint-plugin-node": "^7.0.1",
53+
"ember-qunit": "^4.6.0",
54+
"ember-resolver": "^7.0.0",
55+
"ember-source": "~3.16.0",
56+
"ember-source-channel-url": "^2.0.1",
57+
"ember-try": "^1.4.0",
58+
"eslint-plugin-ember": "^7.7.2",
59+
"eslint-plugin-node": "^11.0.0",
5760
"loader.js": "^4.7.0",
58-
"qunit-dom": "^0.8.0"
61+
"qunit-dom": "^1.0.0"
5962
},
6063
"engines": {
61-
"node": "6.* || 8.* || >= 10.*"
64+
"node": "10.* || >= 12"
65+
},
66+
"ember": {
67+
"edition": "octane"
6268
},
6369
"ember-addon": {
6470
"configPath": "tests/dummy/config",

0 commit comments

Comments
 (0)