Skip to content

Commit 0589633

Browse files
committed
v3.28.6...v4.4.1
# Conflicts: # packages/ember-cli-fastboot/CONTRIBUTING.md # packages/ember-cli-fastboot/README.md
1 parent 1c768fa commit 0589633

File tree

15 files changed

+86
-53
lines changed

15 files changed

+86
-53
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ jobs:
133133
- ember-release
134134
- ember-beta
135135
- ember-canary
136-
- ember-default-with-jquery
137136
- ember-classic
138137
- embroider-safe
139138
- embroider-optimized

packages/ember-cli-fastboot/.ember-cli

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55

66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
8-
"disableAnalytics": false
8+
"disableAnalytics": false,
9+
10+
/**
11+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
13+
*/
14+
"isTypeScriptProject": false
915
}

packages/ember-cli-fastboot/.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@
1919
# ember-try
2020
/.node_modules.ember-try/
2121
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2223
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

packages/ember-cli-fastboot/.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ module.exports = {
4646
extends: ['plugin:node/recommended'],
4747
},
4848
{
49-
// Test files:
49+
// test files
5050
files: ['tests/**/*-test.{js,ts}'],
5151
extends: ['plugin:qunit/recommended'],
5252
},

packages/ember-cli-fastboot/.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,10 @@
2323
# ember-try
2424
/.node_modules.ember-try/
2525
/bower.json.ember-try
26+
/npm-shrinkwrap.json.ember-try
2627
/package.json.ember-try
28+
/package-lock.json.ember-try
29+
/yarn.lock.ember-try
30+
31+
# broccoli-debug
32+
/DEBUG/

packages/ember-cli-fastboot/.npmignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
/.eslintignore
1515
/.eslintrc.js
1616
/.git/
17+
/.github/
1718
/.gitignore
1819
/.prettierignore
1920
/.prettierrc.js
@@ -34,4 +35,7 @@
3435
# ember-try
3536
/.node_modules.ember-try/
3637
/bower.json.ember-try
38+
/npm-shrinkwrap.json.ember-try
3739
/package.json.ember-try
40+
/package-lock.json.ember-try
41+
/yarn.lock.ember-try

packages/ember-cli-fastboot/.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414
/coverage/
1515
!.*
1616
.eslintcache
17+
.lint-todo/
1718

1819
# ember-try
1920
/.node_modules.ember-try/
2021
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2123
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

packages/ember-cli-fastboot/config/ember-try.js

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,6 @@ module.exports = async function () {
6363
},
6464
},
6565
},
66-
{
67-
name: 'ember-default-with-jquery',
68-
env: {
69-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
70-
'jquery-integration': true,
71-
}),
72-
},
73-
npm: {
74-
devDependencies: {
75-
'@ember/jquery': '^1.1.0',
76-
},
77-
},
78-
},
7966
{
8067
name: 'ember-classic',
8168
env: {

packages/ember-cli-fastboot/package.json

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"broccoli-merge-trees": "^4.2.0",
3434
"broccoli-plugin": "^4.0.7",
3535
"chalk": "^4.1.2",
36-
"ember-cli-babel": "^7.26.6",
36+
"ember-cli-babel": "^7.26.11",
3737
"ember-cli-lodash-subset": "^2.0.1",
3838
"ember-cli-preprocess-registry": "^3.3.0",
3939
"ember-cli-version-checker": "^5.1.2",
@@ -49,46 +49,45 @@
4949
"devDependencies": {
5050
"@ember/optional-features": "^2.0.0",
5151
"@ember/string": "^3.1.1",
52-
"@ember/test-helpers": "^2.6.0",
52+
"@ember/test-helpers": "^2.7.0",
5353
"@embroider/test-setup": "^3.0.3",
54-
"@glimmer/component": "^1.0.4",
55-
"@glimmer/tracking": "^1.0.4",
54+
"@glimmer/component": "^1.1.2",
55+
"@glimmer/tracking": "^1.1.2",
5656
"babel-eslint": "^10.1.0",
5757
"broccoli-asset-rev": "^3.0.0",
5858
"broccoli-test-helper": "^1.5.0",
59-
"ember-auto-import": "^2.2.1",
60-
"ember-cli": "~3.28.6",
61-
"ember-cli-dependency-checker": "^3.2.0",
62-
"ember-cli-htmlbars": "^5.7.2",
59+
"ember-auto-import": "^2.4.1",
60+
"ember-cli": "~4.4.1",
61+
"ember-cli-dependency-checker": "^3.3.1",
62+
"ember-cli-htmlbars": "^6.0.1",
6363
"ember-cli-inject-live-reload": "^2.1.0",
6464
"ember-cli-sri": "^2.1.1",
6565
"ember-cli-terser": "^4.0.2",
6666
"ember-disable-prototype-extensions": "^1.1.3",
6767
"ember-export-application-global": "^2.0.1",
6868
"ember-load-initializers": "^2.1.2",
69-
"ember-maybe-import-regenerator": "^0.1.6",
7069
"ember-page-title": "^7.0.0",
7170
"ember-qunit": "^5.1.5",
7271
"ember-resolver": "^8.0.3",
73-
"ember-source": "~3.28.8",
72+
"ember-source": "~4.4.0",
7473
"ember-source-channel-url": "^3.0.0",
75-
"ember-template-lint": "^3.15.0",
74+
"ember-template-lint": "^4.8.0",
7675
"ember-try": "^3.0.0",
7776
"eslint": "^7.32.0",
78-
"eslint-config-prettier": "^8.3.0",
79-
"eslint-plugin-ember": "^10.5.8",
77+
"eslint-config-prettier": "^8.5.0",
78+
"eslint-plugin-ember": "^10.6.1",
8079
"eslint-plugin-node": "^11.1.0",
81-
"eslint-plugin-prettier": "^3.4.1",
82-
"eslint-plugin-qunit": "^6.2.0",
80+
"eslint-plugin-prettier": "^4.0.0",
81+
"eslint-plugin-qunit": "^7.2.0",
8382
"glob": "^7.1.3",
8483
"lint-to-the-future": "^2.0.0",
8584
"lint-to-the-future-eslint": "^2.0.1",
8685
"loader.js": "^4.7.0",
8786
"mocha": "^9.1.2",
8887
"npm-run-all": "^4.1.5",
89-
"prettier": "^2.5.1",
90-
"qunit": "^2.17.2",
91-
"qunit-dom": "^1.6.0",
88+
"prettier": "^2.6.2",
89+
"qunit": "^2.19.1",
90+
"qunit-dom": "^2.0.0",
9291
"sinon": "^17.0.1",
9392
"webpack": "^5.90.1"
9493
},

packages/ember-cli-fastboot/tests/dummy/app/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<html>
33
<head>
44
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
65
<title>Dummy</title>
76
<meta name="description" content="">
87
<meta name="viewport" content="width=device-width, initial-scale=1">

0 commit comments

Comments
 (0)