Skip to content

Commit 3de4a02

Browse files
committed
update to Ember 3.28 with ember-cli-update
1 parent 430f1ec commit 3de4a02

9 files changed

+105
-87
lines changed

.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
1617
.eslintcache
1718

1819
# ember-try

.eslintrc.js

+16-11
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@ module.exports = {
3939
// node files
4040
{
4141
files: [
42-
'.eslintrc.js',
43-
'.prettierrc.js',
44-
'.template-lintrc.js',
45-
'ember-cli-build.js',
46-
'index.js',
47-
'testem.js',
48-
'blueprints/*/index.js',
49-
'config/**/*.js',
50-
'tests/dummy/config/**/*.js',
51-
'lib/**/*.js',
52-
'node-tests/**/*.js',
42+
'./.eslintrc.js',
43+
'./.prettierrc.js',
44+
'./.template-lintrc.js',
45+
'./ember-cli-build.js',
46+
'./index.js',
47+
'./testem.js',
48+
'./blueprints/*/index.js',
49+
'./config/**/*.js',
50+
'./tests/dummy/config/**/*.js',
51+
'./lib/**/*.js',
52+
'./node-tests/**/*.js',
5353
],
5454
excludedFiles: ['addon/**', 'addon-test-support/**', 'app/**', 'tests/dummy/app/**'],
5555
parserOptions: {
@@ -69,5 +69,10 @@ module.exports = {
6969
mocha: true,
7070
},
7171
},
72+
{
73+
// Test files:
74+
files: ['tests/**/*-test.{js,ts}'],
75+
extends: ['plugin:qunit/recommended'],
76+
},
7277
],
7378
};

.npmignore

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
/ember-cli-build.js
2727
testem.*
2828
/tests/
29+
/yarn-error.log
2930
/yarn.lock
3031
.gitkeep
3132

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ To switch Bootstrap version or preprocessor, see the [setup documentation](http:
2424

2525
Ember Bootstrap works and is fully [tested](https://github.com/kaliber5/ember-bootstrap/actions?query=workflow%3ACI+branch%3Amaster) with
2626

27-
* Ember.js 3.16+ (including all optional features)
27+
* Ember.js 3.28+ (including all optional features)
2828
* Ember CLI 3.15+
29-
* Bootstrap 3 and 4
29+
* Bootstrap 3-5
3030
* all modern evergreen browsers (Chrome, Firefox, Safari, Edge)
31-
* node.js 12+
32-
* FastBoot 3.0+
31+
* node.js 16+
32+
* FastBoot 4.0+
3333
* Embroider: we strive (and test) for maximum compatibility with Embroider, including the most aggressive setting
3434
(`staticComponents`) for tree shaking and code splitting. However as Embroider itself is still considered beta software,
3535
we won't be able to *guarantee* that for the time being.

config/ember-try.js

+1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ module.exports = async function () {
104104
npm: {
105105
devDependencies: {
106106
bootstrap: bootstrapVersion,
107+
'ember-source': '~3.28.0',
107108
},
108109
ember: {
109110
edition: 'classic',

package.json

+19-18
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"changelog": "lerna-changelog",
2626
"docs:build": "gulp docs:build",
2727
"docs:serve": "gulp docs:serve",
28-
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
28+
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
2929
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
3030
"lint:hbs": "ember-template-lint .",
3131
"lint:hbs:fix": "ember-template-lint . --fix",
@@ -60,9 +60,9 @@
6060
"broccoli-merge-trees": "^4.2.0",
6161
"chalk": "^4.1.1",
6262
"ember-auto-import": "^2.2.0",
63-
"ember-cli-babel": "^7.26.4",
63+
"ember-cli-babel": "^7.26.10",
6464
"ember-cli-build-config-editor": "0.5.1",
65-
"ember-cli-htmlbars": "^5.7.1",
65+
"ember-cli-htmlbars": "^5.7.2",
6666
"ember-cli-version-checker": "^5.1.2",
6767
"ember-concurrency": "^2.1.2",
6868
"ember-decorators": "^6.1.0",
@@ -85,24 +85,24 @@
8585
"devDependencies": {
8686
"@babel/core": "^7.0.0-0",
8787
"@ember/optional-features": "^2.0.0",
88-
"@ember/test-helpers": "^2.4.2",
89-
"@embroider/test-setup": "^0.41.0",
88+
"@ember/test-helpers": "^2.6.0",
89+
"@embroider/test-setup": "^0.48.1",
9090
"babel-eslint": "^10.1.0",
9191
"bootstrap": "^4.6.0",
9292
"bootstrap-sass": "^3.3.7",
9393
"broccoli-asset-rev": "^3.0.0",
9494
"chai": "^4.3.4",
9595
"chai-things": "^0.2.0",
9696
"ember-a11y-testing": "^4.0.7",
97-
"ember-cli": "~3.26.1",
97+
"ember-cli": "~3.28.6",
9898
"ember-cli-app-version": "^4.0.0",
9999
"ember-cli-blueprint-test-helpers": "^0.19.1",
100100
"ember-cli-browserstack": "^1.1.0",
101101
"ember-cli-content-security-policy": "^2.0.0-4",
102102
"ember-cli-dependency-checker": "^3.2.0",
103103
"ember-cli-fastboot": "^4.1.1",
104104
"ember-cli-fastboot-testing": "^0.6.1",
105-
"ember-cli-inject-live-reload": "^2.0.2",
105+
"ember-cli-inject-live-reload": "^2.1.0",
106106
"ember-cli-sri": "^2.1.1",
107107
"ember-cli-terser": "^4.0.2",
108108
"ember-cli-test-loader": "^3.0.0",
@@ -112,20 +112,21 @@
112112
"ember-export-application-global": "^2.0.1",
113113
"ember-load-initializers": "^2.1.2",
114114
"ember-page-title": "^6.2.2",
115-
"ember-qunit": "^5.1.4",
116-
"ember-resolver": "^8.0.2",
115+
"ember-qunit": "^5.1.5",
116+
"ember-resolver": "^8.0.3",
117117
"ember-sinon": "^5.0.0",
118118
"ember-sinon-qunit": "^5.0.0",
119-
"ember-source": "~3.26.1",
119+
"ember-source": "~3.28.8",
120120
"ember-source-channel-url": "^3.0.0",
121-
"ember-template-lint": "^3.6.0",
121+
"ember-template-lint": "^3.15.0",
122122
"ember-try": "^1.4.0",
123-
"eslint": "^7.27.0",
124-
"eslint-config-prettier": "^8.1.0",
125-
"eslint-plugin-ember": "^10.5.0",
123+
"eslint": "^7.32.0",
124+
"eslint-config-prettier": "^8.3.0",
125+
"eslint-plugin-ember": "^10.5.8",
126126
"eslint-plugin-hbs": "^1.0.0",
127127
"eslint-plugin-node": "^11.1.0",
128-
"eslint-plugin-prettier": "^3.3.1",
128+
"eslint-plugin-prettier": "^3.4.1",
129+
"eslint-plugin-qunit": "^6.2.0",
129130
"execa": "^5.0.0",
130131
"glob": "^7.1.7",
131132
"gulp": "^4.0.0",
@@ -139,16 +140,16 @@
139140
"merge-stream": "^2.0.0",
140141
"mocha": "^8.4.0",
141142
"npm-run-all": "^4.1.5",
142-
"prettier": "^2.2.1",
143-
"qunit": "^2.14.1",
143+
"prettier": "^2.5.1",
144+
"qunit": "^2.17.2",
144145
"qunit-dom": "^1.6.0",
145146
"release-it": "^14.6.2",
146147
"release-it-lerna-changelog": "^3.1.0",
147148
"striptags": "^3.0.0",
148149
"webpack": "^5.56.1"
149150
},
150151
"engines": {
151-
"node": ">=16.*"
152+
"node": "12.* || 14.* || >= 16"
152153
},
153154
"publishConfig": {
154155
"registry": "https://registry.npmjs.org"

tests/dummy/config/ember-cli-update.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.26.1",
6+
"version": "3.28.6",
77
"blueprints": [
88
{
99
"name": "addon",

tests/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</div>
2929
</div>
3030

31-
<script src="/testem.js" integrity=""></script>
31+
<script src="/testem.js" integrity="" data-embroider-ignore></script>
3232
<script src="{{rootURL}}assets/vendor.js"></script>
3333
<script src="{{rootURL}}assets/test-support.js"></script>
3434
<script src="{{rootURL}}assets/dummy.js"></script>

0 commit comments

Comments
 (0)