Skip to content

Commit bb546b9

Browse files
mansonamansona
committed
update to v4.4 with ember-cli-update
1 parent a131d83 commit bb546b9

File tree

18 files changed

+4679
-5903
lines changed

18 files changed

+4679
-5903
lines changed

‎.ember-cli‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,10 @@
66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
88
"disableAnalytics": false,
9-
"useYarn": true
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
1015
}

‎.eslintignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@
2020
# ember-try
2121
/.node_modules.ember-try/
2222
/bower.json.ember-try
23+
/npm-shrinkwrap.json.ember-try
2324
/package.json.ember-try
25+
/package-lock.json.ember-try
26+
/yarn.lock.ember-try

‎.eslintrc.js‎

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

‎.github/workflows/ci.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ on:
88
pull_request: {}
99

1010
concurrency:
11-
group: ci-${{ github.head_ref || github.ref }}
12-
cancel-in-progress: true
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
1313

1414
jobs:
1515
test:
1616
name: "Tests"
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
2121
- name: Install Node
22-
uses: actions/setup-node@v2
22+
uses: actions/setup-node@v3
2323
with:
2424
node-version: 12.x
2525
cache: npm
@@ -35,8 +35,8 @@ jobs:
3535
runs-on: ubuntu-latest
3636

3737
steps:
38-
- uses: actions/checkout@v2
39-
- uses: actions/setup-node@v2
38+
- uses: actions/checkout@v3
39+
- uses: actions/setup-node@v3
4040
with:
4141
node-version: 12.x
4242
cache: npm
@@ -48,7 +48,7 @@ jobs:
4848
try-scenarios:
4949
name: ${{ matrix.try-scenario }}
5050
runs-on: ubuntu-latest
51-
needs: 'test'
51+
needs: "test"
5252

5353
strategy:
5454
fail-fast: false
@@ -60,14 +60,14 @@ jobs:
6060
- ember-release
6161
- ember-beta
6262
- ember-canary
63-
- ember-default-with-jquery
63+
- ember-classic
6464
- embroider-safe
6565
- embroider-optimized
6666

6767
steps:
68-
- uses: actions/checkout@v2
68+
- uses: actions/checkout@v3
6969
- name: Install Node
70-
uses: actions/setup-node@v2
70+
uses: actions/setup-node@v3
7171
with:
7272
node-version: 12.x
7373
cache: npm

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

‎.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
@@ -33,4 +34,7 @@
3334
# ember-try
3435
/.node_modules.ember-try/
3536
/bower.json.ember-try
37+
/npm-shrinkwrap.json.ember-try
3638
/package.json.ember-try
39+
/package-lock.json.ember-try
40+
/yarn.lock.ember-try

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

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
* `ember serve`
2323
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2424

25-
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
25+
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

‎README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ This addon lets you populate `<head>` tag from your Ember code without any direc
66

77
The hope is that, in the future, Ember will provide a mechanism for populating `<head>` tag from your app. Until then, this addon provides that functionality.
88

9+
## Compatibility
10+
911
* Ember.js v3.16 or above
1012
* Ember CLI v2.13 or above
1113
* Node.js v12 or above
@@ -19,7 +21,9 @@ Install by running
1921
ember install ember-cli-head
2022
```
2123

22-
Then, add `<HeadLayout />` to the top of your application template.
24+
## Usage
25+
26+
Add `<HeadLayout />` to the top of your application template.
2327

2428
```handlebars
2529
{{!-- app/templates/application.hbs --}}

‎config/ember-try.js‎

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

0 commit comments

Comments
 (0)