Skip to content

Commit d3dded4

Browse files
mansonamansona
authored
Merge pull request #1985 from bartocc/ember-cli-update-441
ember-cli-update v4.0.1...v4.4.1
2 parents d7fbdac + d3d886c commit d3dded4

File tree

9 files changed

+982
-1388
lines changed

9 files changed

+982
-1388
lines changed

‎.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
}

‎.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
timeout-minutes: 7
1818
steps:
1919
- name: Check out a copy of the repo
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121

2222
- name: Use Node.js ${{ env.NODE_VERSION }}
23-
uses: actions/setup-node@v2
23+
uses: actions/setup-node@v3
2424
with:
2525
cache: 'npm'
2626
node-version: ${{ env.NODE_VERSION }}
@@ -37,10 +37,10 @@ jobs:
3737
timeout-minutes: 7
3838
steps:
3939
- name: Check out a copy of the repo
40-
uses: actions/checkout@v2
40+
uses: actions/checkout@v3
4141

4242
- name: Use Node.js ${{ env.NODE_VERSION }}
43-
uses: actions/setup-node@v2
43+
uses: actions/setup-node@v3
4444
with:
4545
cache: 'npm'
4646
node-version: ${{ env.NODE_VERSION }}

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,5 @@
3434
config/credentials.json
3535

3636
/code
37+
# broccoli-debug
38+
/DEBUG/

‎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
<meta name="viewport" content="width=device-width, initial-scale=1">
76
<meta property="og:image" content="https://blog.emberjs.com/images/logos/e-icon.png" />
87
<meta name="twitter:card" content="summary" />

‎config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "4.0.1",
6+
"version": "4.4.1",
77
"blueprints": [
88
{
99
"name": "app",

0 commit comments

Comments
 (0)