Skip to content

Commit 97b0981

Browse files
authored
Merge pull request #1977 from bartocc/ember-4
🐹 Migrate to ember 4
2 parents b8b4697 + bfea48b commit 97b0981

15 files changed

+6948
-6016
lines changed

.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
@@ -51,7 +51,7 @@ module.exports = {
5151
},
5252
},
5353
{
54-
// Test files:
54+
// test files
5555
files: ['tests/**/*-test.{js,ts}'],
5656
extends: ['plugin:qunit/recommended'],
5757
},

.github/workflows/ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
NODE_VERSION: 14
11-
NODE_OPTIONS: "--max_old_space_size=4096"
11+
NODE_OPTIONS: '--max_old_space_size=4096'
1212

1313
jobs:
1414
lint:
@@ -31,7 +31,6 @@ jobs:
3131
- name: Lint
3232
run: npm run lint
3333

34-
3534
test-app:
3635
name: Test app
3736
runs-on: ubuntu-latest
@@ -56,7 +55,6 @@ jobs:
5655
env:
5756
PERCY_TOKEN: 877df6aad8486060f69a34864b6cd33f870633743b23411343737c46a875a762
5857

59-
6058
test-node:
6159
name: Test node-tests
6260
runs-on: ubuntu-latest

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@
2424
# ember-try
2525
/.node_modules.ember-try/
2626
/bower.json.ember-try
27+
/npm-shrinkwrap.json.ember-try
2728
/package.json.ember-try
29+
/package-lock.json.ember-try
2830
/yarn.lock
31+
/yarn.lock.ember-try
2932

3033
# Deployment credentials
3134
config/credentials.json

.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",

0 commit comments

Comments
 (0)