Skip to content

Commit 2a2497c

Browse files
committed
update to v4.4 with ember-cli-update
1 parent d7ba17a commit 2a2497c

19 files changed

+7269
-3587
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
}

.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

.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: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ 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
percy:
@@ -18,46 +18,55 @@ jobs:
1818
env:
1919
PERCY_TOKEN: ee0a9d5c1122d6a21852edf19b5b309aaec18077fb3900c98995c90bc48ed240
2020
steps:
21-
- uses: actions/checkout@v2
22-
- uses: actions/setup-node@v3
21+
- uses: actions/checkout@v3
22+
- name: Install Node
23+
uses: actions/setup-node@v3
2324
with:
2425
node-version: 18.x
2526
cache: npm
26-
- run: npm ci
27-
- run: npx percy exec -- npm run test:docs
27+
- name: Install Dependencies
28+
run: npm ci
29+
- name: Run Tests
30+
run: npx percy exec -- npm run test:docs
2831

2932
test:
3033
name: "Tests"
3134
runs-on: ubuntu-latest
3235

3336
steps:
34-
- uses: actions/checkout@v2
37+
- uses: actions/checkout@v3
3538
- uses: mansona/npm-lockfile-version@v1
36-
- uses: actions/setup-node@v3
39+
- name: Install Node
40+
uses: actions/setup-node@v3
3741
with:
3842
node-version: 18.x
3943
cache: npm
40-
- run: npm ci
41-
- run: npm run lint
42-
- run: npx percy exec -- npm run test
44+
- name: Install Dependencies
45+
run: npm ci
46+
- name: Lint
47+
run: npm run lint
48+
- name: Run Tests
49+
run: npm run test:ember
4350

4451
floating:
4552
name: "Floating Dependencies"
4653
runs-on: ubuntu-latest
4754

4855
steps:
49-
- uses: actions/checkout@v2
56+
- uses: actions/checkout@v3
5057
- uses: actions/setup-node@v3
5158
with:
5259
node-version: 18.x
5360
cache: npm
54-
- run: npm install --no-shrinkwrap
55-
- run: npm run test:ember
61+
- name: Install Dependencies
62+
run: npm install --no-shrinkwrap
63+
- name: Run Tests
64+
run: npm run test:ember
5665

5766
try-scenarios:
5867
name: ${{ matrix.try-scenario }}
5968
runs-on: ubuntu-latest
60-
needs: 'test'
69+
needs: "test"
6170

6271
strategy:
6372
fail-fast: false
@@ -73,12 +82,14 @@ jobs:
7382
- no-deprecations
7483

7584
steps:
76-
- uses: actions/checkout@v2
77-
- uses: actions/setup-node@v3
85+
- uses: actions/checkout@v3
86+
- name: Install Node
87+
uses: actions/setup-node@v3
7888
with:
7989
node-version: 18.x
8090
cache: npm
81-
- run: npm ci
91+
- name: Install Dependencies
92+
run: npm ci
8293
- name: Run Tests
8394
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
8495

@@ -97,12 +108,14 @@ jobs:
97108
- ember-release-no-deprecations
98109

99110
steps:
100-
- uses: actions/checkout@v2
101-
- uses: actions/setup-node@v3
111+
- uses: actions/checkout@v3
112+
- name: Install Node
113+
uses: actions/setup-node@v3
102114
with:
103115
node-version: 18.x
104116
cache: npm
105-
- run: npm ci
117+
- name: Install Dependencies
118+
run: npm ci
106119
- name: Run Tests
107120
id: tests
108121
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

.gitignore

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,18 @@
2121
/testem.log
2222
/yarn-error.log
2323

24+
# IDEs
25+
.vscode
26+
.idea
27+
.changelog
28+
2429
# ember-try
2530
/.node_modules.ember-try/
2631
/bower.json.ember-try
32+
/npm-shrinkwrap.json.ember-try
2733
/package.json.ember-try
34+
/package-lock.json.ember-try
35+
/yarn.lock.ember-try
2836

29-
.vscode
30-
.idea
31-
.changelog
37+
# broccoli-debug
38+
/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
@@ -23,4 +23,4 @@
2323
* `ember serve`
2424
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2525

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

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1+
# ember-styleguide
2+
13
[![This project uses GitHub Actions for continuous integration.](https://github.com/ember-learn/ember-styleguide/workflows/CI/badge.svg)](https://github.com/ember-learn/ember-styleguide/actions?query=workflow%3ACI)
24
[![This project uses Percy.io for visual regression testing.](https://percy.io/static/images/percy-badge.svg)](https://percy.io/Ember/ember-styleguide)
35
[![Latest NPM release](https://img.shields.io/npm/v/ember-styleguide.svg)](https://www.npmjs.com/package/ember-styleguide.svg)
46

5-
ember-styleguide
6-
==============================================================================
7-
87
This addon is intended to provide basic components for easier style coordination among the Ember family of websites, although the original intent is to support the emberjs.com website. We are committed to the goal of meeting WCAG 2.0 AA conformance standards.
98

109

11-
Compatibility
12-
------------------------------------------------------------------------------
10+
## Compatibility
1311

1412
* Ember.js v3.24 or above
1513
* Ember CLI v3.24 or above

config/ember-try.js

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,6 @@ module.exports = async function () {
5050
},
5151
},
5252
},
53-
{
54-
name: 'ember-default-with-jquery',
55-
env: {
56-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
57-
'jquery-integration': true,
58-
}),
59-
},
60-
npm: {
61-
devDependencies: {
62-
'@ember/jquery': '^1.1.0',
63-
},
64-
},
65-
},
6653
{
6754
name: 'ember-classic',
6855
env: {

0 commit comments

Comments
 (0)