Skip to content

Commit a629601

Browse files
committed
update to v4.0.1 with ember-cli-update
# Conflicts: # .eslintignore # .github/workflows/ci.yml # .gitignore
1 parent 9960a2f commit a629601

File tree

9 files changed

+256
-260
lines changed

9 files changed

+256
-260
lines changed

.eslintignore

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,13 @@
1616
.*/
1717
.eslintcache
1818

19+
# data git checkout
20+
/ember-api-docs-data/
21+
1922
# ember-try
2023
/.node_modules.ember-try/
2124
/bower.json.ember-try
25+
/npm-shrinkwrap.json.ember-try
2226
/package.json.ember-try
23-
24-
# data git checkout
25-
/ember-api-docs-data/
27+
/package-lock.json.ember-try
28+
/yarn.lock.ember-try

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ module.exports = {
6464
},
6565
},
6666
{
67-
// Test files:
67+
// test files
6868
files: ['tests/**/*-test.{js,ts}'],
6969
extends: ['plugin:qunit/recommended'],
7070
},

.github/workflows/ci.yml

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,59 +3,52 @@ name: CI
33
on:
44
push:
55
branches:
6+
- main
67
- master
7-
pull_request:
8+
pull_request: {}
89

910
env:
1011
NODE_VERSION: 20
1112
PERCY_PARALLEL_NONCE: ${{ github.run_id }}-${{ github.run_number }}
1213
PERCY_PARALLEL_TOTAL: 1
1314

15+
concurrency:
16+
group: ci-${{ github.head_ref || github.ref }}
17+
cancel-in-progress: true
18+
1419
jobs:
1520
lint:
16-
name: Lint files
21+
name: "Lint"
1722
runs-on: ubuntu-latest
1823
timeout-minutes: 5
19-
steps:
20-
- name: Check out a copy of the repo
21-
uses: actions/checkout@v4
2224

25+
steps:
26+
- uses: actions/checkout@v4
2327
- uses: pnpm/action-setup@v4
24-
25-
- name: Use Node.js ${{ env.NODE_VERSION }}
26-
uses: actions/setup-node@v4
28+
- uses: actions/setup-node@v4
2729
with:
28-
cache: 'pnpm'
30+
cache: pnpm
2931
node-version: ${{ env.NODE_VERSION }}
30-
31-
- name: Install dependencies
32-
run: pnpm i --frozen-lockfile
33-
32+
- name: Install Dependencies
33+
run: pnpm install
3434
- name: Lint
3535
run: pnpm run lint
3636

37-
38-
test-app:
39-
name: Test app
37+
test:
38+
name: "Test"
4039
runs-on: ubuntu-latest
4140
timeout-minutes: 10
42-
steps:
43-
- name: Check out a copy of the repo
44-
uses: actions/checkout@v4
4541

42+
steps:
43+
- uses: actions/checkout@v4
4644
- uses: pnpm/action-setup@v4
47-
48-
- name: Use Node.js ${{ env.NODE_VERSION }}
49-
uses: actions/setup-node@v4
45+
- uses: actions/setup-node@v4
5046
with:
51-
cache: 'pnpm'
47+
cache: pnpm
5248
node-version: ${{ env.NODE_VERSION }}
53-
54-
- run: pnpm install --frozen-lockfile
55-
49+
- run: pnpm install
5650
- run: pnpm run clone
57-
58-
- name: Test
51+
- name: Run Tests
5952
env:
6053
PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
6154
PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}

.gitignore

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,14 @@ browserstack-local.pid
3636
local.log
3737
.vscode/
3838

39+
# ember-api-docs-data checkout
40+
/ember-api-docs-data/
41+
/ember-api-docs-data
42+
3943
# ember-try
4044
/.node_modules.ember-try/
4145
/bower.json.ember-try
46+
/npm-shrinkwrap.json.ember-try
4247
/package.json.ember-try
43-
44-
/ember-api-docs-data/
45-
/ember-api-docs-data
48+
/package-lock.json.ember-try
49+
/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

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": "3.28.6",
6+
"version": "4.0.1",
77
"blueprints": [
88
{
99
"name": "app",

config/targets.js

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,6 @@ const browsers = [
77
'last 1 Edge versions',
88
];
99

10-
// Ember's browser support policy is changing, and IE11 support will end in
11-
// v4.0 onwards.
12-
//
13-
// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
14-
//
15-
// If you need IE11 support on a version of Ember that still offers support
16-
// for it, uncomment the code block below.
17-
//
18-
// const isCI = Boolean(process.env.CI);
19-
// const isProduction = process.env.EMBER_ENV === 'production';
20-
//
21-
// if (isCI || isProduction) {
22-
// browsers.push('ie 11');
23-
// }
24-
2510
module.exports = {
2611
browsers,
2712
node: 'current',

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"ember-anchor": "^1.0.3",
6464
"ember-auto-import": "^2.10.0",
6565
"ember-basic-dropdown": "^8.6.0",
66-
"ember-cli": "~3.28.6",
66+
"ember-cli": "~4.0.1",
6767
"ember-cli-app-version": "^5.0.0",
6868
"ember-cli-autoprefixer": "^1.0.0",
6969
"ember-cli-babel": "^8.2.0",
@@ -82,22 +82,22 @@
8282
"ember-cli-terser": "^4.0.2",
8383
"ember-composable-helpers": "^3.1.1",
8484
"ember-concurrency": "^4.0.3",
85-
"ember-data": "~3.28.6",
85+
"ember-data": "~4.0.2",
8686
"ember-data-fastboot": "https://github.com/mainmatter/ember-data-fastboot#update-babel",
8787
"ember-decorators": "^6.1.1",
8888
"ember-export-application-global": "^2.0.1",
8989
"ember-fetch": "^8.1.1",
9090
"ember-inflector": "^4.0.3",
9191
"ember-load-initializers": "^2.1.2",
9292
"ember-metrics": "^1.5.2",
93-
"ember-page-title": "^6.2.2",
93+
"ember-page-title": "^7.0.0",
9494
"ember-power-select": "^8.7.0",
9595
"ember-qunit": "^5.1.5",
9696
"ember-resolver": "^8.0.3",
9797
"ember-rfc176-data": "^0.3.17",
9898
"ember-showdown-shiki": "^1.2.1",
9999
"ember-sinon": "^4.1.1",
100-
"ember-source": "~3.28.8",
100+
"ember-source": "~4.0.1",
101101
"ember-styleguide": "^11.0.3",
102102
"ember-svg-jar": "^2.4.2",
103103
"ember-template-lint": "^3.15.0",
@@ -109,8 +109,8 @@
109109
"eslint-config-prettier": "^8.3.0",
110110
"eslint-plugin-ember": "^10.5.8",
111111
"eslint-plugin-node": "^11.1.0",
112-
"eslint-plugin-prettier": "^3.4.1",
113-
"eslint-plugin-qunit": "^6.2.0",
112+
"eslint-plugin-prettier": "^4.0.0",
113+
"eslint-plugin-qunit": "^7.2.0",
114114
"express-sslify": "^1.2.0",
115115
"fastboot-app-server": "^3.3.2",
116116
"lint-to-the-future": "^2.0.0",
@@ -130,7 +130,7 @@
130130
"prember": "^2.1.0",
131131
"prettier": "^2.5.1",
132132
"qunit": "^2.17.2",
133-
"qunit-dom": "^1.6.0",
133+
"qunit-dom": "^2.0.0",
134134
"sanitize-html": "^2.3.2",
135135
"semver": "^7.5.4",
136136
"semver-compare": "^1.0.0",

0 commit comments

Comments
 (0)