Skip to content

Commit

Permalink
Merge pull request #1985 from bartocc/ember-cli-update-441
Browse files Browse the repository at this point in the history
ember-cli-update v4.0.1...v4.4.1
  • Loading branch information
mansona authored Dec 18, 2023
2 parents d7fbdac + d3d886c commit d3dded4
Show file tree
Hide file tree
Showing 9 changed files with 982 additions and 1,388 deletions.
8 changes: 7 additions & 1 deletion .ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,11 @@

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
*/
"isTypeScriptProject": false
}
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
timeout-minutes: 7
steps:
- name: Check out a copy of the repo
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Use Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
Expand All @@ -37,10 +37,10 @@ jobs:
timeout-minutes: 7
steps:
- name: Check out a copy of the repo
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Use Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@
config/credentials.json

/code
# broccoli-debug
/DEBUG/
1 change: 0 additions & 1 deletion app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta property="og:image" content="https://blog.emberjs.com/images/logos/e-icon.png" />
<meta name="twitter:card" content="summary" />
Expand Down
2 changes: 1 addition & 1 deletion config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "4.0.1",
"version": "4.4.1",
"blueprints": [
{
"name": "app",
Expand Down
Loading

0 comments on commit d3dded4

Please sign in to comment.