From 2d6b43770b14648f57bbaef3ad8d12999be3dfc2 Mon Sep 17 00:00:00 2001 From: Vasyl Marchuk Date: Sun, 23 Nov 2025 13:55:08 +0200 Subject: [PATCH 1/6] Upgrade Ember from `5.12` to `6.0.1` --- config/ember-cli-update.json | 2 +- package-lock.json | 47 +++++++++++++++++++++++++++++------- package.json | 4 +-- 3 files changed, 41 insertions(+), 12 deletions(-) diff --git a/config/ember-cli-update.json b/config/ember-cli-update.json index daccd39f3c..ab1df082c0 100644 --- a/config/ember-cli-update.json +++ b/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "ember-cli", - "version": "5.12.0", + "version": "6.0.1", "blueprints": [ { "name": "app", diff --git a/package-lock.json b/package-lock.json index 5c345632e9..67dbc0c762 100644 --- a/package-lock.json +++ b/package-lock.json @@ -115,7 +115,7 @@ "ember-auto-import": "^2.10.0", "ember-autoresize-modifier": "^0.8.0", "ember-basic-dropdown": "^8.6.2", - "ember-cli": "~5.12.0", + "ember-cli": "~6.0.1", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.2.0", "ember-cli-bundle-analyzer": "^1.0.0", @@ -153,7 +153,7 @@ "ember-screen": "^2.0.0", "ember-sinon-qunit": "^7.5.0", "ember-sortable": "^5.3.3", - "ember-source": "~5.12.0", + "ember-source": "~6.0.0", "ember-svg-jar": "^2.6.3", "ember-template-imports": "^4.2.0", "ember-template-lint-plugin-prettier": "^5.0.0", @@ -11496,6 +11496,35 @@ "integrity": "sha512-MioUE+LfjCEz65Wf7Z/Rm4XCP5k2c+TbMd2Z2JKc7U9uwjBhAfNPE48KC4GTGKhppMeYVepwDBNO/nGY6NYHBA==", "dev": true }, + "node_modules/babel-remove-types": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/babel-remove-types/-/babel-remove-types-1.0.2.tgz", + "integrity": "sha512-X2lmGht7sGkDgpBIaTmr8b/0aXKkMeHeJ5W0HgOdMp1KHyE3PHySHYfbYrfkVoISQsHppNv9yA+pDwhWqaxBSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.16.10", + "@babel/plugin-syntax-decorators": "^7.16.7", + "@babel/plugin-transform-typescript": "^7.16.8", + "prettier": "^2.5.1" + } + }, + "node_modules/babel-remove-types/node_modules/prettier": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "dev": true, + "license": "MIT", + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/babylon": { "version": "6.18.0", "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", @@ -17338,13 +17367,14 @@ } }, "node_modules/ember-cli": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/ember-cli/-/ember-cli-5.12.0.tgz", - "integrity": "sha512-48ZOoUZTXsav37RIYY9gyCR35yo64mhzfv5YHtTbsZZwLv/HjvTz27X0CTvkfVQaOWHYDFekxdp9ppaKz84VNA==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ember-cli/-/ember-cli-6.0.1.tgz", + "integrity": "sha512-UD9szFnZS27uC66iaFMBPEHcDDmtEy7+mwzjoCmDnYT85ZIXsEh5r+aEry2NSJnTXayOItbhDtSbd0eTqKPyUQ==", "dev": true, "license": "MIT", "dependencies": { "@pnpm/find-workspace-dir": "^6.0.2", + "babel-remove-types": "^1.0.0", "broccoli": "^3.5.2", "broccoli-builder": "^0.18.14", "broccoli-concat": "^4.2.5", @@ -17411,7 +17441,6 @@ "promise-map-series": "^0.3.0", "promise.hash.helper": "^1.0.8", "quick-temp": "^0.1.8", - "remove-types": "^1.0.0", "resolve": "^1.22.1", "resolve-package-path": "^4.0.3", "safe-stable-stringify": "^2.4.3", @@ -25798,9 +25827,9 @@ } }, "node_modules/ember-source": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/ember-source/-/ember-source-5.12.0.tgz", - "integrity": "sha512-2MWlJmQEeeiIk9p5CDMuvD470YPi7/4wXgU41ftbWc9svwF+0usoe4PLoLC0T/jV6YX+3SY5tumQfxLSLoFhmQ==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ember-source/-/ember-source-6.0.1.tgz", + "integrity": "sha512-2IK4qYuJXG3U0ngm2JO+7mABAWlXjjBT2yvwxxTmatyg+iuV5CCtGWZGTGa/uw1nfAaihkDwyaVqNjmlvbovcg==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 54d51cadfe..755381be57 100644 --- a/package.json +++ b/package.json @@ -121,7 +121,7 @@ "ember-auto-import": "^2.10.0", "ember-autoresize-modifier": "^0.8.0", "ember-basic-dropdown": "^8.6.2", - "ember-cli": "~5.12.0", + "ember-cli": "~6.0.1", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.2.0", "ember-cli-bundle-analyzer": "^1.0.0", @@ -159,7 +159,7 @@ "ember-screen": "^2.0.0", "ember-sinon-qunit": "^7.5.0", "ember-sortable": "^5.3.3", - "ember-source": "~5.12.0", + "ember-source": "~6.0.0", "ember-svg-jar": "^2.6.3", "ember-template-imports": "^4.2.0", "ember-template-lint-plugin-prettier": "^5.0.0", From d935fb36c0d8fabe61685a3fd93baf8352529466 Mon Sep 17 00:00:00 2001 From: Vasyl Marchuk Date: Sun, 23 Nov 2025 14:06:18 +0200 Subject: [PATCH 2/6] Use official version `1.0.2` of `ember-window-mock` instead of our custom fork --- package-lock.json | 335 +--------------------------------------------- package.json | 2 +- 2 files changed, 7 insertions(+), 330 deletions(-) diff --git a/package-lock.json b/package-lock.json index 67dbc0c762..92db5d2842 100644 --- a/package-lock.json +++ b/package-lock.json @@ -159,7 +159,7 @@ "ember-template-lint-plugin-prettier": "^5.0.0", "ember-tooltips": "^4.0.0", "ember-truth-helpers": "^4.0.3", - "ember-window-mock": "github:codecrafters-io/ember-window-mock#renovate/ember-source-5.x", + "ember-window-mock": "^1.0.2", "eslint": "^8.57.1", "eslint-config-prettier": "^10.1.5", "eslint-plugin-ember": "^12.7.4", @@ -27692,337 +27692,14 @@ } }, "node_modules/ember-window-mock": { - "version": "0.9.0", - "resolved": "git+ssh://git@github.com/codecrafters-io/ember-window-mock.git#3c9f615b5637b9ea3ea805171b011e30fc987406", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/ember-window-mock/-/ember-window-mock-1.0.2.tgz", + "integrity": "sha512-05qmab/YLHwg3Pn+NfQh7PwGY2H1GimxhNKxEoBX6/H3aMGmgwk9rOsV7fFV1PjZrq/V6op+BIqSfObw35psHg==", "dev": true, "license": "MIT", "dependencies": { - "ember-cli-babel": "^7.26.11", - "ember-cli-htmlbars": "^6.2.0" - }, - "engines": { - "node": "16.* || >= 18" - }, - "peerDependencies": { - "ember-source": "^4.0.0 || ^5.0.0" - } - }, - "node_modules/ember-window-mock/node_modules/@babel/plugin-proposal-private-property-in-object": { - "version": "7.21.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz", - "integrity": "sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==", - "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead.", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-create-class-features-plugin": "^7.21.0", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/ember-window-mock/node_modules/@babel/runtime": { - "version": "7.12.18", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.18.tgz", - "integrity": "sha512-BogPQ7ciE6SYAUPtlm9tWbgI9+2AgqSam6QivMgXgAT+fKbgppaj4ZX15MHeLC1PVF5sNk70huBu20XxWOs8Cg==", - "dev": true, - "dependencies": { - "regenerator-runtime": "^0.13.4" - } - }, - "node_modules/ember-window-mock/node_modules/@types/fs-extra": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-5.1.0.tgz", - "integrity": "sha512-AInn5+UBFIK9FK5xc9yP5e3TQSPNNgjHByqYcj9g5elVBnDQcQL7PlO1CIRy2gWlbwK7UPYqi7vRvFA44dCmYQ==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/ember-window-mock/node_modules/broccoli-funnel": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/broccoli-funnel/-/broccoli-funnel-2.0.2.tgz", - "integrity": "sha512-/vDTqtv7ipjEZQOVqO4vGDVAOZyuYzQ/EgGoyewfOgh1M7IQAToBKZI0oAQPgMBeFPPlIbfMuAngk+ohPBuaHQ==", - "dev": true, - "dependencies": { - "array-equal": "^1.0.0", - "blank-object": "^1.0.1", - "broccoli-plugin": "^1.3.0", - "debug": "^2.2.0", - "fast-ordered-set": "^1.0.0", - "fs-tree-diff": "^0.5.3", - "heimdalljs": "^0.2.0", - "minimatch": "^3.0.0", - "mkdirp": "^0.5.0", - "path-posix": "^1.0.0", - "rimraf": "^2.4.3", - "symlink-or-copy": "^1.0.0", - "walk-sync": "^0.3.1" - }, - "engines": { - "node": "^4.5 || 6.* || >= 7.*" - } - }, - "node_modules/ember-window-mock/node_modules/broccoli-funnel/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/ember-window-mock/node_modules/broccoli-plugin": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/broccoli-plugin/-/broccoli-plugin-1.3.1.tgz", - "integrity": "sha512-DW8XASZkmorp+q7J4EeDEZz+LoyKLAd2XZULXyD9l4m9/hAKV3vjHmB1kiUshcWAYMgTP1m2i4NnqCE/23h6AQ==", - "dev": true, - "dependencies": { - "promise-map-series": "^0.2.1", - "quick-temp": "^0.1.3", - "rimraf": "^2.3.4", - "symlink-or-copy": "^1.1.8" - } - }, - "node_modules/ember-window-mock/node_modules/broccoli-plugin/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/ember-window-mock/node_modules/broccoli-source": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/broccoli-source/-/broccoli-source-2.1.2.tgz", - "integrity": "sha512-1lLayO4wfS0c0Sj50VfHJXNWf94FYY0WUhxj0R77thbs6uWI7USiOWFqQV5dRmhAJnoKaGN4WyLGQbgjgiYFwQ==", - "dev": true, - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/ember-window-mock/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/ember-window-mock/node_modules/ember-cli-babel": { - "version": "7.26.11", - "resolved": "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz", - "integrity": "sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==", - "dev": true, - "dependencies": { - "@babel/core": "^7.12.0", - "@babel/helper-compilation-targets": "^7.12.0", - "@babel/plugin-proposal-class-properties": "^7.16.5", - "@babel/plugin-proposal-decorators": "^7.13.5", - "@babel/plugin-proposal-private-methods": "^7.16.5", - "@babel/plugin-proposal-private-property-in-object": "^7.16.5", - "@babel/plugin-transform-modules-amd": "^7.13.0", - "@babel/plugin-transform-runtime": "^7.13.9", - "@babel/plugin-transform-typescript": "^7.13.0", - "@babel/polyfill": "^7.11.5", - "@babel/preset-env": "^7.16.5", - "@babel/runtime": "7.12.18", - "amd-name-resolver": "^1.3.1", - "babel-plugin-debug-macros": "^0.3.4", - "babel-plugin-ember-data-packages-polyfill": "^0.1.2", - "babel-plugin-ember-modules-api-polyfill": "^3.5.0", - "babel-plugin-module-resolver": "^3.2.0", - "broccoli-babel-transpiler": "^7.8.0", - "broccoli-debug": "^0.6.4", - "broccoli-funnel": "^2.0.2", - "broccoli-source": "^2.1.2", - "calculate-cache-key-for-tree": "^2.0.0", - "clone": "^2.1.2", - "ember-cli-babel-plugin-helpers": "^1.1.1", - "ember-cli-version-checker": "^4.1.0", - "ensure-posix-path": "^1.0.2", - "fixturify-project": "^1.10.0", - "resolve-package-path": "^3.1.0", - "rimraf": "^3.0.1", - "semver": "^5.5.0" - }, - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/ember-window-mock/node_modules/ember-cli-babel/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/ember-window-mock/node_modules/ember-cli-version-checker": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-4.1.1.tgz", - "integrity": "sha512-bzEWsTMXUGEJfxcAGWPe6kI7oHEGD3jaxUWDYPTqzqGhNkgPwXTBgoWs9zG1RaSMaOPFnloWuxRcoHi4TrYS3Q==", - "dev": true, - "dependencies": { - "resolve-package-path": "^2.0.0", - "semver": "^6.3.0", - "silent-error": "^1.1.1" - }, - "engines": { - "node": "8.* || 10.* || >= 12.*" - } - }, - "node_modules/ember-window-mock/node_modules/ember-cli-version-checker/node_modules/resolve-package-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-2.0.0.tgz", - "integrity": "sha512-/CLuzodHO2wyyHTzls5Qr+EFeG6RcW4u6//gjYvUfcfyuplIX1SSccU+A5A9A78Gmezkl3NBkFAMxLbzTY9TJA==", - "dev": true, - "dependencies": { - "path-root": "^0.1.1", - "resolve": "^1.13.1" - }, - "engines": { - "node": "8.* || 10.* || >= 12" - } - }, - "node_modules/ember-window-mock/node_modules/fixturify": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/fixturify/-/fixturify-1.3.0.tgz", - "integrity": "sha512-tL0svlOy56pIMMUQ4bU1xRe6NZbFSa/ABTWMxW2mH38lFGc9TrNAKWcMBQ7eIjo3wqSS8f2ICabFaatFyFmrVQ==", - "dev": true, - "dependencies": { - "@types/fs-extra": "^5.0.5", - "@types/minimatch": "^3.0.3", - "@types/rimraf": "^2.0.2", - "fs-extra": "^7.0.1", - "matcher-collection": "^2.0.0" - }, - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/ember-window-mock/node_modules/fixturify-project": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/fixturify-project/-/fixturify-project-1.10.0.tgz", - "integrity": "sha512-L1k9uiBQuN0Yr8tA9Noy2VSQ0dfg0B8qMdvT7Wb5WQKc7f3dn3bzCbSrqlb+etLW+KDV4cBC7R1OvcMg3kcxmA==", - "dev": true, - "dependencies": { - "fixturify": "^1.2.0", - "tmp": "^0.0.33" - } - }, - "node_modules/ember-window-mock/node_modules/fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, - "node_modules/ember-window-mock/node_modules/fs-tree-diff": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/fs-tree-diff/-/fs-tree-diff-0.5.9.tgz", - "integrity": "sha512-872G8ax0kHh01m9n/2KDzgYwouKza0Ad9iFltBpNykvROvf2AGtoOzPJgGx125aolGPER3JuC7uZFrQ7bG1AZw==", - "dev": true, - "dependencies": { - "heimdalljs-logger": "^0.1.7", - "object-assign": "^4.1.0", - "path-posix": "^1.0.0", - "symlink-or-copy": "^1.1.8" - } - }, - "node_modules/ember-window-mock/node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", - "dev": true, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/ember-window-mock/node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/ember-window-mock/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "node_modules/ember-window-mock/node_modules/regenerator-runtime": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", - "dev": true - }, - "node_modules/ember-window-mock/node_modules/resolve-package-path": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-3.1.0.tgz", - "integrity": "sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==", - "dev": true, - "dependencies": { - "path-root": "^0.1.1", - "resolve": "^1.17.0" - }, - "engines": { - "node": "10.* || >= 12" - } - }, - "node_modules/ember-window-mock/node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true, - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/ember-window-mock/node_modules/walk-sync": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.4.tgz", - "integrity": "sha512-ttGcuHA/OBnN2pcM6johpYlEms7XpO5/fyKIr48541xXedan4roO8cS1Q2S/zbbjGH/BarYDAMeS2Mi9HE5Tig==", - "dev": true, - "dependencies": { - "ensure-posix-path": "^1.0.0", - "matcher-collection": "^1.0.0" - } - }, - "node_modules/ember-window-mock/node_modules/walk-sync/node_modules/matcher-collection": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.1.2.tgz", - "integrity": "sha512-YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g==", - "dev": true, - "dependencies": { - "minimatch": "^3.0.2" + "@embroider/addon-shim": "^1.8.7", + "@embroider/macros": "^1.16.5" } }, "node_modules/emoji-regex": { diff --git a/package.json b/package.json index 755381be57..d2d6f8236b 100644 --- a/package.json +++ b/package.json @@ -165,7 +165,7 @@ "ember-template-lint-plugin-prettier": "^5.0.0", "ember-tooltips": "^4.0.0", "ember-truth-helpers": "^4.0.3", - "ember-window-mock": "github:codecrafters-io/ember-window-mock#renovate/ember-source-5.x", + "ember-window-mock": "^1.0.2", "eslint": "^8.57.1", "eslint-config-prettier": "^10.1.5", "eslint-plugin-ember": "^12.7.4", From 72a92076f9755ca211ba05c794cd4b8d8151619e Mon Sep 17 00:00:00 2001 From: Vasyl Marchuk Date: Sun, 23 Nov 2025 14:04:16 +0200 Subject: [PATCH 3/6] Upgrade `ember-math-helpers` from `4.0.0` to `5.0.0` --- .../community-solution-card/content.hbs | 2 +- package-lock.json | 37 +++++++++++++++---- package.json | 2 +- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/app/components/course-page/course-stage-step/community-solution-card/content.hbs b/app/components/course-page/course-stage-step/community-solution-card/content.hbs index 268621c875..ecc57aabce 100644 --- a/app/components/course-page/course-stage-step/community-solution-card/content.hbs +++ b/app/components/course-page/course-stage-step/community-solution-card/content.hbs @@ -17,7 +17,7 @@ @highlightedFile={{highlightedFile}} @onPublishToGithubButtonClick={{this.handlePublishToGithubButtonClick}} @solution={{@solution}} - class={{if (not-eq index (sub @solution.highlightedFiles.length 1)) "mb-4"}} + class={{if (not-eq index (sub (or @solution.highlightedFiles.length 0) 1)) "mb-4"}} /> {{/each}} {{else}} diff --git a/package-lock.json b/package-lock.json index 92db5d2842..ba06934aff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -144,7 +144,7 @@ "ember-keyboard": "^9.0.3", "ember-lifeline": "^7.0.0", "ember-load-initializers": "^3.0.1", - "ember-math-helpers": "^4.0.0", + "ember-math-helpers": "^5.0.0", "ember-modifier": "^4.2.0", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.1", @@ -24534,18 +24534,41 @@ } }, "node_modules/ember-math-helpers": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/ember-math-helpers/-/ember-math-helpers-4.0.0.tgz", - "integrity": "sha512-f83fUNp9/DbnPK6WWiYDLdxSePMC2YVxt7aZZPsDy3Zlwp75mhzUknbqd6wSCeKwJYJm+1xh0l/SygxzLvKgnw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ember-math-helpers/-/ember-math-helpers-5.0.0.tgz", + "integrity": "sha512-UKChQuu1Ki57NGMFF0V1mbRJ5LtkZ+EMIdCl5w+3nrwCOzn8GpePQDgtQqgdE3tFrm3TsHfLgHtfa38uNSSG6w==", "dev": true, + "license": "MIT", "dependencies": { - "@embroider/addon-shim": "^1.8.6" + "@embroider/addon-shim": "^1.8.9", + "decorator-transforms": "^2.2.2" }, "engines": { - "node": "14.* || 16.* || >= 18" + "node": ">= 18" }, "peerDependencies": { - "ember-source": "^4.0.0 || ^5.0.0" + "ember-source": ">= 4.12.0" + } + }, + "node_modules/ember-math-helpers/node_modules/babel-import-util": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-3.0.1.tgz", + "integrity": "sha512-2copPaWQFUrzooJVIVZA/Oppx/S/KOoZ4Uhr+XWEQDMZ8Rvq/0SNQpbdIyMBJ8IELWt10dewuJw+tX4XjOo7Rg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 12.*" + } + }, + "node_modules/ember-math-helpers/node_modules/decorator-transforms": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/decorator-transforms/-/decorator-transforms-2.3.0.tgz", + "integrity": "sha512-jo8c1ss9yFPudHuYYcrJ9jpkDZIoi+lOGvt+Uyp9B+dz32i50icRMx9Bfa8hEt7TnX1FyKWKkjV+cUdT/ep2kA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/plugin-syntax-decorators": "^7.23.3", + "babel-import-util": "^3.0.0" } }, "node_modules/ember-modifier": { diff --git a/package.json b/package.json index d2d6f8236b..c1e4023dae 100644 --- a/package.json +++ b/package.json @@ -150,7 +150,7 @@ "ember-keyboard": "^9.0.3", "ember-lifeline": "^7.0.0", "ember-load-initializers": "^3.0.1", - "ember-math-helpers": "^4.0.0", + "ember-math-helpers": "^5.0.0", "ember-modifier": "^4.2.0", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.1", From d3e5e238a225e9fd8f60274d71f41c56eeaf0c67 Mon Sep 17 00:00:00 2001 From: Vasyl Marchuk Date: Sun, 23 Nov 2025 16:54:25 +0200 Subject: [PATCH 4/6] Upgrade Ember from `6.0.1` to `6.1` --- config/ember-cli-update.json | 2 +- package-lock.json | 194 ++++++++++++++++++----------------- package.json | 12 +-- 3 files changed, 107 insertions(+), 101 deletions(-) diff --git a/config/ember-cli-update.json b/config/ember-cli-update.json index ab1df082c0..6fab9e3ab7 100644 --- a/config/ember-cli-update.json +++ b/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "ember-cli", - "version": "6.0.1", + "version": "6.1.0", "blueprints": [ { "name": "app", diff --git a/package-lock.json b/package-lock.json index ba06934aff..2d2d896f23 100644 --- a/package-lock.json +++ b/package-lock.json @@ -115,7 +115,7 @@ "ember-auto-import": "^2.10.0", "ember-autoresize-modifier": "^0.8.0", "ember-basic-dropdown": "^8.6.2", - "ember-cli": "~6.0.1", + "ember-cli": "~6.1.0", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.2.0", "ember-cli-bundle-analyzer": "^1.0.0", @@ -153,7 +153,7 @@ "ember-screen": "^2.0.0", "ember-sinon-qunit": "^7.5.0", "ember-sortable": "^5.3.3", - "ember-source": "~6.0.0", + "ember-source": "~6.1.0", "ember-svg-jar": "^2.6.3", "ember-template-imports": "^4.2.0", "ember-template-lint-plugin-prettier": "^5.0.0", @@ -8090,43 +8090,46 @@ } }, "node_modules/@pnpm/constants": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@pnpm/constants/-/constants-7.1.1.tgz", - "integrity": "sha512-31pZqMtjwV+Vaq7MaPrT1EoDFSYwye3dp6BiHIGRJmVThCQwySRKM7hCvqqI94epNkqFAAYoWrNynWoRYosGdw==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/@pnpm/constants/-/constants-10.0.0.tgz", + "integrity": "sha512-dxIXcW1F1dxIGfye2JXE7Q8WVwYB0axVzdBOkvE1WKIVR4xjB8e6k/Dkjo7DpbyfW5Vu2k21p6dyM32YLSAWoQ==", "dev": true, + "license": "MIT", "engines": { - "node": ">=16.14" + "node": ">=18.12" }, "funding": { "url": "https://opencollective.com/pnpm" } }, "node_modules/@pnpm/error": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@pnpm/error/-/error-5.0.2.tgz", - "integrity": "sha512-0TEm+tWNYm+9uh6DSKyRbv8pv/6b4NL0PastLvMxIoqZbBZ5Zj1cYi332R9xsSUi31ZOsu2wpgn/bC7DA9hrjg==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@pnpm/error/-/error-6.0.3.tgz", + "integrity": "sha512-OIYhG7HQh4zUFh2s8/6bp7glVRjNxms7bpzXVOLV7pyRa+rSYFmqJ8zDsBC64k58nuaxS85Ip+SCDjFxsFGeOg==", "dev": true, + "license": "MIT", "dependencies": { - "@pnpm/constants": "7.1.1" + "@pnpm/constants": "10.0.0" }, "engines": { - "node": ">=16.14" + "node": ">=18.12" }, "funding": { "url": "https://opencollective.com/pnpm" } }, "node_modules/@pnpm/find-workspace-dir": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@pnpm/find-workspace-dir/-/find-workspace-dir-6.0.2.tgz", - "integrity": "sha512-JSrpQUFCs4vY1D5tOmj7qBb+oE2j/lO6341giEdUpvYf3FijY8CY13l8rPjfHV2y3m//utzl0An+q+qx14S6Nw==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/@pnpm/find-workspace-dir/-/find-workspace-dir-7.0.3.tgz", + "integrity": "sha512-eGjkyHSufkHyZ66WpygWnslcRePB0U1lJg1dF3rgWqTChpregYoDyNGDzK7l9Gk+CHVgGZZS5aWp7uKKVmAAEg==", "dev": true, + "license": "MIT", "dependencies": { - "@pnpm/error": "5.0.2", + "@pnpm/error": "6.0.3", "find-up": "^5.0.0" }, "engines": { - "node": ">=16.14" + "node": ">=18.12" }, "funding": { "url": "https://opencollective.com/pnpm" @@ -14037,27 +14040,6 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, - "node_modules/builtins": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", - "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==", - "dev": true, - "dependencies": { - "semver": "^7.0.0" - } - }, - "node_modules/builtins/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -15392,10 +15374,11 @@ "dev": true }, "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -17367,13 +17350,13 @@ } }, "node_modules/ember-cli": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ember-cli/-/ember-cli-6.0.1.tgz", - "integrity": "sha512-UD9szFnZS27uC66iaFMBPEHcDDmtEy7+mwzjoCmDnYT85ZIXsEh5r+aEry2NSJnTXayOItbhDtSbd0eTqKPyUQ==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ember-cli/-/ember-cli-6.1.0.tgz", + "integrity": "sha512-LpVtpf/QgHcmmzX3InToSUnn0wX9D8TEKVhxF4KPf2HpCzrTllUcwu+pfCsXDb3VziTjRKUnnh5ZnjER/pVyFQ==", "dev": true, "license": "MIT", "dependencies": { - "@pnpm/find-workspace-dir": "^6.0.2", + "@pnpm/find-workspace-dir": "^7.0.2", "babel-remove-types": "^1.0.0", "broccoli": "^3.5.2", "broccoli-builder": "^0.18.14", @@ -17391,7 +17374,7 @@ "calculate-cache-key-for-tree": "^2.0.0", "capture-exit": "^2.0.0", "chalk": "^4.1.2", - "ci-info": "^3.8.0", + "ci-info": "^4.0.0", "clean-base-url": "^1.0.0", "compression": "^1.7.4", "configstore": "^5.0.1", @@ -17408,7 +17391,7 @@ "ensure-posix-path": "^1.1.1", "execa": "^5.1.1", "exit": "^0.1.2", - "express": "^4.18.1", + "express": "^4.21.1", "filesize": "^10.0.8", "find-up": "^5.0.0", "find-yarn-workspace-root": "^2.0.0", @@ -17434,7 +17417,7 @@ "minimatch": "^7.4.3", "morgan": "^1.10.0", "nopt": "^3.0.6", - "npm-package-arg": "^10.1.0", + "npm-package-arg": "^12.0.0", "os-locale": "^5.0.0", "p-defer": "^3.0.0", "portfinder": "^1.0.32", @@ -17450,7 +17433,7 @@ "sort-package-json": "^1.57.0", "symlink-or-copy": "^1.3.1", "temp": "0.9.4", - "testem": "^3.15.1", + "testem": "^3.15.2", "tiny-lr": "^2.0.0", "tree-sync": "^2.1.0", "walk-sync": "^3.0.0", @@ -20712,6 +20695,22 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, + "node_modules/ember-cli/node_modules/ci-info": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.1.tgz", + "integrity": "sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/ember-cli/node_modules/cli-width": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz", @@ -25850,14 +25849,15 @@ } }, "node_modules/ember-source": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ember-source/-/ember-source-6.0.1.tgz", - "integrity": "sha512-2IK4qYuJXG3U0ngm2JO+7mABAWlXjjBT2yvwxxTmatyg+iuV5CCtGWZGTGa/uw1nfAaihkDwyaVqNjmlvbovcg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ember-source/-/ember-source-6.1.0.tgz", + "integrity": "sha512-7FBMsr5XlSVs080FEw0ssNgbQEAAzQGc3ZHmgBE40LRcz7g+vMXPwaZ7DGsOoWPXHKAVeeDbr5qiMC13WkVj5w==", "dev": true, "license": "MIT", "dependencies": { "@babel/core": "^7.24.4", "@ember/edition-utils": "^1.2.0", + "@embroider/addon-shim": "^1.9.0", "@glimmer/compiler": "0.92.4", "@glimmer/destroyable": "0.92.3", "@glimmer/env": "^0.1.7", @@ -25881,7 +25881,7 @@ "broccoli-funnel": "^3.0.8", "broccoli-merge-trees": "^4.2.0", "chalk": "^4.0.0", - "ember-auto-import": "^2.6.3", + "ember-auto-import": "^2.10.0", "ember-cli-babel": "^8.2.0", "ember-cli-get-component-path-option": "^1.0.0", "ember-cli-is-package-missing": "^1.0.0", @@ -25902,7 +25902,7 @@ "node": ">= 18.*" }, "peerDependencies": { - "@glimmer/component": "^1.1.2" + "@glimmer/component": ">= 1.1.2" } }, "node_modules/ember-source/node_modules/@glimmer/global-context": { @@ -29069,17 +29069,18 @@ } }, "node_modules/express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", "dev": true, + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -29093,7 +29094,7 @@ "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.10", + "path-to-regexp": "0.1.12", "proxy-addr": "~2.0.7", "qs": "6.13.0", "range-parser": "~1.2.1", @@ -29108,6 +29109,10 @@ }, "engines": { "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/express/node_modules/debug": { @@ -29153,10 +29158,11 @@ "dev": true }, "node_modules/express/node_modules/path-to-regexp": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", - "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", - "dev": true + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", + "dev": true, + "license": "MIT" }, "node_modules/extend": { "version": "3.0.2", @@ -31532,25 +31538,24 @@ "dev": true }, "node_modules/hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-8.1.0.tgz", + "integrity": "sha512-Rw/B2DNQaPBICNXEm8balFz9a6WpZrkCGpcWFpy7nCj+NyhSdqXipmfvtmWt9xGfp0wZnBxB+iVpLmQMYt47Tw==", "dev": true, + "license": "ISC", "dependencies": { - "lru-cache": "^7.5.1" + "lru-cache": "^10.0.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/hosted-git-info/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "dev": true, - "engines": { - "node": ">=12" - } + "license": "ISC" }, "node_modules/html-encoding-sniffer": { "version": "4.0.0", @@ -34804,25 +34809,27 @@ } }, "node_modules/npm-package-arg": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", - "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-12.0.2.tgz", + "integrity": "sha512-f1NpFjNI9O4VbKMOlA5QoBq/vSQPORHcTZ2feJpFkTHJ9eQkdlmZEKSjcAhxTGInC7RlEyScT9ui67NaOsjFWA==", "dev": true, + "license": "ISC", "dependencies": { - "hosted-git-info": "^6.0.0", - "proc-log": "^3.0.0", + "hosted-git-info": "^8.0.0", + "proc-log": "^5.0.0", "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" + "validate-npm-package-name": "^6.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/npm-package-arg/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", + "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -36764,12 +36771,13 @@ } }, "node_modules/proc-log": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", - "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz", + "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==", "dev": true, + "license": "ISC", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/process-relative-require": { @@ -41691,15 +41699,13 @@ "dev": true }, "node_modules/validate-npm-package-name": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz", - "integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-6.0.2.tgz", + "integrity": "sha512-IUoow1YUtvoBBC06dXs8bR8B9vuA3aJfmQNKMoaPG/OFsPmoQvw8xh+6Ye25Gx9DQhoEom3Pcu9MKHerm/NpUQ==", "dev": true, - "dependencies": { - "builtins": "^5.0.0" - }, + "license": "ISC", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/validate-peer-dependencies": { diff --git a/package.json b/package.json index c1e4023dae..5dcc2130d8 100644 --- a/package.json +++ b/package.json @@ -15,10 +15,10 @@ "build:versions": "echo \"npm: $(npm --version)\" && ember --version", "build:ember": "ember build --environment=production", "install:silent": "npm install --no-fund --no-audit", - "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"", + "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\" --prefixColors auto", "lint:css": "stylelint \"**/*.css\"", - "lint:css:fix": "concurrently \"npm:lint:css -- --fix\"", - "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", + "lint:css:fix": "npm run lint:css -- --fix", + "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\" --prefixColors auto", "lint:hbs": "ember-template-lint .", "lint:hbs:fix": "ember-template-lint . --fix", "lint:js": "eslint . --cache", @@ -31,7 +31,7 @@ "restart:watchman": "command -v watchman >/dev/null 2>&1 && (watchman watch-del . && watchman watch-project .) || echo 'watchman not installed, skipping'", "start": "FASTBOOT_DISABLED=true npm run start:fastboot", "start:fastboot": "npm run install:silent && npm run restart:watchman && ember serve", - "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"", + "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\" --prefixColors auto", "test:ember": "ember test" }, "devDependencies": { @@ -121,7 +121,7 @@ "ember-auto-import": "^2.10.0", "ember-autoresize-modifier": "^0.8.0", "ember-basic-dropdown": "^8.6.2", - "ember-cli": "~6.0.1", + "ember-cli": "~6.1.0", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.2.0", "ember-cli-bundle-analyzer": "^1.0.0", @@ -159,7 +159,7 @@ "ember-screen": "^2.0.0", "ember-sinon-qunit": "^7.5.0", "ember-sortable": "^5.3.3", - "ember-source": "~6.0.0", + "ember-source": "~6.1.0", "ember-svg-jar": "^2.6.3", "ember-template-imports": "^4.2.0", "ember-template-lint-plugin-prettier": "^5.0.0", From c075d06a7dd7f476c19d49b9a7de5652405c713d Mon Sep 17 00:00:00 2001 From: Vasyl Marchuk Date: Sun, 23 Nov 2025 17:00:24 +0200 Subject: [PATCH 5/6] Include `.gts` and other combined js-template files in `.prettierrc.js` --- .prettierrc.js | 7 +++ .../roadmap-page/course-idea-card.gts | 50 +++++++++---------- .../roadmap-page/idea-card/unvote-button.gts | 6 +-- .../roadmap-page/idea-card/vote-button.gts | 16 +++--- .../roadmap-page/submit-course-idea-card.gts | 10 ++-- 5 files changed, 48 insertions(+), 41 deletions(-) diff --git a/.prettierrc.js b/.prettierrc.js index de8e9c0847..9006185ad3 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -11,5 +11,12 @@ module.exports = { singleQuote: false, }, }, + { + files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}', + options: { + singleQuote: true, + templateSingleQuote: false, + }, + }, ], }; diff --git a/app/components/roadmap-page/course-idea-card.gts b/app/components/roadmap-page/course-idea-card.gts index ab90898bef..7fbc927a3f 100644 --- a/app/components/roadmap-page/course-idea-card.gts +++ b/app/components/roadmap-page/course-idea-card.gts @@ -73,31 +73,31 @@ export default class CourseIdeaCard extends Component {