Merge pull request #1977 from bartocc/ember-4

🐹 Migrate to ember 4
ember-learn · Dec 10, 2023 · 97b0981 · 97b0981
2 parents b8b4697 + bfea48b
commit 97b0981
Show file tree

Hide file tree

Showing 15 changed files with 6,948 additions and 6,016 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -20,4 +20,7 @@
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -51,7 +51,7 @@ module.exports = {
       },
     },
     {
-      // Test files:
+      // test files
       files: ['tests/**/*-test.{js,ts}'],
       extends: ['plugin:qunit/recommended'],
     },

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   NODE_VERSION: 14
-  NODE_OPTIONS: "--max_old_space_size=4096"
+  NODE_OPTIONS: '--max_old_space_size=4096'
 
 jobs:
   lint:
@@ -31,7 +31,6 @@ jobs:
       - name: Lint
         run: npm run lint
 
-
   test-app:
     name: Test app
     runs-on: ubuntu-latest
@@ -56,7 +55,6 @@ jobs:
         env:
           PERCY_TOKEN: 877df6aad8486060f69a34864b6cd33f870633743b23411343737c46a875a762
 
-
   test-node:
     name: Test node-tests
     runs-on: ubuntu-latest

diff --git a/.gitignore b/.gitignore
@@ -24,8 +24,11 @@
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
 /yarn.lock
+/yarn.lock.ember-try
 
 # Deployment credentials
 config/credentials.json

diff --git a/.prettierignore b/.prettierignore
@@ -14,8 +14,12 @@
 /coverage/
 !.*
 .eslintcache
+.lint-todo/
 
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try
diff --git a/config/ember-cli-update.json b/config/ember-cli-update.json
@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.28.6",
+      "version": "4.0.1",
       "blueprints": [
         {
           "name": "app",