From b846b4df11653919c200e0de65d5e122dc6b6966 Mon Sep 17 00:00:00 2001 From: ijlee2 Date: Mon, 24 Feb 2025 14:03:37 +0100 Subject: [PATCH 1/9] chore: Sorted scripts to pass sort-package-json@2.14.0 out of the box --- .../src/blueprints/run-new/__addonLocation__/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/blueprints-v2-addon/src/blueprints/run-new/__addonLocation__/package.json b/packages/blueprints-v2-addon/src/blueprints/run-new/__addonLocation__/package.json index aaa5189..8466138 100644 --- a/packages/blueprints-v2-addon/src/blueprints/run-new/__addonLocation__/package.json +++ b/packages/blueprints-v2-addon/src/blueprints/run-new/__addonLocation__/package.json @@ -34,6 +34,7 @@ "scripts": { "addon": "blueprints-v2-addon --test-app-location \"<%= options.addon.locationInverse %>/<%= options.testApp.location %>\"", "build": "rollup --config", + "prelint:types": "type-css-modules --src src", "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", "lint:css": "stylelint \"**/*.css\" --allow-empty-input --cache", "lint:css:fix": "stylelint \"**/*.css\" --allow-empty-input --fix", @@ -42,7 +43,6 @@ "lint:hbs:fix": "ember-template-lint . --fix", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", - "prelint:types": "type-css-modules --src src", "lint:types": "glint", "prepack": "rollup --config", "start": "rollup --config --watch", From 488739ffe6fcc8068b4d1ba5679c152fa5c8e8b8 Mon Sep 17 00:00:00 2001 From: ijlee2 Date: Mon, 24 Feb 2025 14:05:49 +0100 Subject: [PATCH 2/9] chore: Updated dependencies --- .../run-new/__addonLocation__/package.json | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/blueprints-v2-addon/src/blueprints/run-new/__addonLocation__/package.json b/packages/blueprints-v2-addon/src/blueprints/run-new/__addonLocation__/package.json index 8466138..10bf793 100644 --- a/packages/blueprints-v2-addon/src/blueprints/run-new/__addonLocation__/package.json +++ b/packages/blueprints-v2-addon/src/blueprints/run-new/__addonLocation__/package.json @@ -51,13 +51,13 @@ "dependencies": { "@embroider/addon-shim": "^1.9.0", "decorator-transforms": "^2.3.0", - "embroider-css-modules": "^2.0.14" + "embroider-css-modules": "^2.0.15" }, "devDependencies": { - "@babel/core": "^7.26.8", + "@babel/core": "^7.26.9", "@babel/plugin-transform-typescript": "^7.26.8", - "@babel/runtime": "^7.26.7", - "@ember/test-helpers": "^4.0.5", + "@babel/runtime": "^7.26.9", + "@ember/test-helpers": "^5.1.0", "@embroider/addon-dev": "^7.1.1", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", @@ -77,18 +77,18 @@ "ember-modifier": "^4.2.0", "ember-source": "~6.2.0", "ember-template-lint": "^6.1.0", - "eslint": "^9.20.0", - "postcss": "^8.5.1", - "prettier": "^3.5.0", + "eslint": "^9.21.0", + "postcss": "^8.5.3", + "prettier": "^3.5.2", "qunit-dom": "^3.4.0", - "rollup": "^4.34.6", + "rollup": "^4.34.8", "rollup-plugin-postcss": "^4.0.2", "stylelint": "^16.14.1", - "type-css-modules": "^1.0.16", + "type-css-modules": "^1.0.17", "typescript": "^5.7.3" }, "peerDependencies": { - "@ember/test-helpers": "^4.0.0 || ^5.0.0", + "@ember/test-helpers": "^5.1.0", "qunit-dom": "^3.4.0" }, "peerDependenciesMeta": { From 8ec5279b9ae2d4626b078c5da2555bdf0480ed24 Mon Sep 17 00:00:00 2001 From: ijlee2 Date: Mon, 24 Feb 2025 14:05:57 +0100 Subject: [PATCH 3/9] chore: Updated CURRENT_VERSION --- packages/blueprints-v2-addon/package.json | 2 +- packages/blueprints-v2-addon/update-blueprints.mjs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/blueprints-v2-addon/package.json b/packages/blueprints-v2-addon/package.json index 043ea70..c7fdb4a 100644 --- a/packages/blueprints-v2-addon/package.json +++ b/packages/blueprints-v2-addon/package.json @@ -1,6 +1,6 @@ { "name": "blueprints-v2-addon", - "version": "0.6.0", + "version": "0.6.1", "private": true, "description": "Blueprints for v2 addons", "keywords": [ diff --git a/packages/blueprints-v2-addon/update-blueprints.mjs b/packages/blueprints-v2-addon/update-blueprints.mjs index 80c552a..5ba2100 100755 --- a/packages/blueprints-v2-addon/update-blueprints.mjs +++ b/packages/blueprints-v2-addon/update-blueprints.mjs @@ -5,7 +5,7 @@ import gitDiffApply from 'git-diff-apply'; import yargs from 'yargs'; import { hideBin } from 'yargs/helpers'; -const CURRENT_VERSION = '0.6.0'; +const CURRENT_VERSION = '0.6.1'; async function updateBlueprints({ from, to }) { const startTag = from; From 05f9155f73272ad2da706684b47859db5944dcc4 Mon Sep 17 00:00:00 2001 From: ijlee2 Date: Mon, 24 Feb 2025 14:06:14 +0100 Subject: [PATCH 4/9] chore: Updated fixtures --- .../output/packages/ui/form/package.json | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/blueprints-v2-addon/tests/fixtures/run-new/output/packages/ui/form/package.json b/packages/blueprints-v2-addon/tests/fixtures/run-new/output/packages/ui/form/package.json index 93aa652..c3a2cfa 100644 --- a/packages/blueprints-v2-addon/tests/fixtures/run-new/output/packages/ui/form/package.json +++ b/packages/blueprints-v2-addon/tests/fixtures/run-new/output/packages/ui/form/package.json @@ -34,6 +34,7 @@ "scripts": { "addon": "blueprints-v2-addon --test-app-location \"../../../test-app\"", "build": "rollup --config", + "prelint:types": "type-css-modules --src src", "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", "lint:css": "stylelint \"**/*.css\" --allow-empty-input --cache", "lint:css:fix": "stylelint \"**/*.css\" --allow-empty-input --fix", @@ -42,7 +43,6 @@ "lint:hbs:fix": "ember-template-lint . --fix", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", - "prelint:types": "type-css-modules --src src", "lint:types": "glint", "prepack": "rollup --config", "start": "rollup --config --watch", @@ -51,13 +51,13 @@ "dependencies": { "@embroider/addon-shim": "^1.9.0", "decorator-transforms": "^2.3.0", - "embroider-css-modules": "^2.0.14" + "embroider-css-modules": "^2.0.15" }, "devDependencies": { - "@babel/core": "^7.26.8", + "@babel/core": "^7.26.9", "@babel/plugin-transform-typescript": "^7.26.8", - "@babel/runtime": "^7.26.7", - "@ember/test-helpers": "^4.0.5", + "@babel/runtime": "^7.26.9", + "@ember/test-helpers": "^5.1.0", "@embroider/addon-dev": "^7.1.1", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", @@ -77,18 +77,18 @@ "ember-modifier": "^4.2.0", "ember-source": "~6.2.0", "ember-template-lint": "^6.1.0", - "eslint": "^9.20.0", - "postcss": "^8.5.1", - "prettier": "^3.5.0", + "eslint": "^9.21.0", + "postcss": "^8.5.3", + "prettier": "^3.5.2", "qunit-dom": "^3.4.0", - "rollup": "^4.34.6", + "rollup": "^4.34.8", "rollup-plugin-postcss": "^4.0.2", "stylelint": "^16.14.1", - "type-css-modules": "^1.0.16", + "type-css-modules": "^1.0.17", "typescript": "^5.7.3" }, "peerDependencies": { - "@ember/test-helpers": "^4.0.0 || ^5.0.0", + "@ember/test-helpers": "^5.1.0", "qunit-dom": "^3.4.0" }, "peerDependenciesMeta": { From 0af76b3d868a497a13adb5d212ba42542f5ac3ed Mon Sep 17 00:00:00 2001 From: ijlee2 Date: Mon, 24 Feb 2025 14:06:24 +0100 Subject: [PATCH 5/9] chore: Ran update-blueprints-v2-addon --- .../blueprints/v2-addon/package.json | 10 ++++----- .../run-new/__addonLocation__/package.json | 22 +++++++++---------- .../output/packages/ui/form/package.json | 22 +++++++++---------- .../blueprints/v2-addon/update-blueprints.mjs | 2 +- .../my-repo/blueprints/v2-addon/package.json | 10 ++++----- .../run-new/__addonLocation__/package.json | 22 +++++++++---------- .../output/packages/ui/form/package.json | 22 +++++++++---------- .../blueprints/v2-addon/update-blueprints.mjs | 2 +- 8 files changed, 56 insertions(+), 56 deletions(-) diff --git a/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/package.json b/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/package.json index 63896b0..c7fdb4a 100644 --- a/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/package.json +++ b/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/package.json @@ -1,6 +1,6 @@ { "name": "blueprints-v2-addon", - "version": "0.6.0", + "version": "0.6.1", "private": true, "description": "Blueprints for v2 addons", "keywords": [ @@ -38,7 +38,7 @@ "@codemod-utils/ast-javascript": "^1.2.13", "@codemod-utils/blueprints": "^1.1.9", "@codemod-utils/ember": "^2.0.4", - "@codemod-utils/files": "^2.0.8", + "@codemod-utils/files": "^2.1.0", "@codemod-utils/json": "^1.1.14", "yargs": "^17.7.2" }, @@ -48,12 +48,12 @@ "@shared-configs/prettier": "workspace:*", "@shared-configs/typescript": "workspace:*", "@sondr3/minitest": "^0.1.2", - "@types/node": "^18.19.75", + "@types/node": "^18.19.76", "@types/yargs": "^17.0.33", "concurrently": "^9.1.2", - "eslint": "^9.20.0", + "eslint": "^9.21.0", "git-diff-apply": "^6.0.6", - "prettier": "^3.5.0", + "prettier": "^3.5.2", "typescript": "^5.7.3" }, "engines": { diff --git a/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/src/blueprints/run-new/__addonLocation__/package.json b/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/src/blueprints/run-new/__addonLocation__/package.json index 187b59a..5125e93 100644 --- a/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/src/blueprints/run-new/__addonLocation__/package.json +++ b/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/src/blueprints/run-new/__addonLocation__/package.json @@ -34,6 +34,7 @@ "scripts": { "addon": "blueprints-v2-addon --test-app-location \"\\<%= options.addon.locationInverse %\\>/\\<%= options.testApp.location %\\>\"", "build": "rollup --config", + "prelint:types": "type-css-modules --src src", "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", "lint:css": "stylelint \"**/*.css\" --allow-empty-input --cache", "lint:css:fix": "stylelint \"**/*.css\" --allow-empty-input --fix", @@ -42,7 +43,6 @@ "lint:hbs:fix": "ember-template-lint . --fix", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", - "prelint:types": "type-css-modules --src src", "lint:types": "glint", "prepack": "rollup --config", "start": "rollup --config --watch", @@ -51,13 +51,13 @@ "dependencies": { "@embroider/addon-shim": "^1.9.0", "decorator-transforms": "^2.3.0", - "embroider-css-modules": "^2.0.14" + "embroider-css-modules": "^2.0.15" }, "devDependencies": { - "@babel/core": "^7.26.8", + "@babel/core": "^7.26.9", "@babel/plugin-transform-typescript": "^7.26.8", - "@babel/runtime": "^7.26.7", - "@ember/test-helpers": "^4.0.5", + "@babel/runtime": "^7.26.9", + "@ember/test-helpers": "^5.1.0", "@embroider/addon-dev": "^7.1.1", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", @@ -77,18 +77,18 @@ "ember-modifier": "^4.2.0", "ember-source": "~6.2.0", "ember-template-lint": "^6.1.0", - "eslint": "^9.20.0", - "postcss": "^8.5.1", - "prettier": "^3.5.0", + "eslint": "^9.21.0", + "postcss": "^8.5.3", + "prettier": "^3.5.2", "qunit-dom": "^3.4.0", - "rollup": "^4.34.6", + "rollup": "^4.34.8", "rollup-plugin-postcss": "^4.0.2", "stylelint": "^16.14.1", - "type-css-modules": "^1.0.16", + "type-css-modules": "^1.0.17", "typescript": "^5.7.3" }, "peerDependencies": { - "@ember/test-helpers": "^4.0.0 || ^5.0.0", + "@ember/test-helpers": "^5.1.0", "qunit-dom": "^3.4.0" }, "peerDependenciesMeta": { diff --git a/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/tests/fixtures/run-new/output/packages/ui/form/package.json b/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/tests/fixtures/run-new/output/packages/ui/form/package.json index 93aa652..c3a2cfa 100644 --- a/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/tests/fixtures/run-new/output/packages/ui/form/package.json +++ b/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/tests/fixtures/run-new/output/packages/ui/form/package.json @@ -34,6 +34,7 @@ "scripts": { "addon": "blueprints-v2-addon --test-app-location \"../../../test-app\"", "build": "rollup --config", + "prelint:types": "type-css-modules --src src", "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", "lint:css": "stylelint \"**/*.css\" --allow-empty-input --cache", "lint:css:fix": "stylelint \"**/*.css\" --allow-empty-input --fix", @@ -42,7 +43,6 @@ "lint:hbs:fix": "ember-template-lint . --fix", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", - "prelint:types": "type-css-modules --src src", "lint:types": "glint", "prepack": "rollup --config", "start": "rollup --config --watch", @@ -51,13 +51,13 @@ "dependencies": { "@embroider/addon-shim": "^1.9.0", "decorator-transforms": "^2.3.0", - "embroider-css-modules": "^2.0.14" + "embroider-css-modules": "^2.0.15" }, "devDependencies": { - "@babel/core": "^7.26.8", + "@babel/core": "^7.26.9", "@babel/plugin-transform-typescript": "^7.26.8", - "@babel/runtime": "^7.26.7", - "@ember/test-helpers": "^4.0.5", + "@babel/runtime": "^7.26.9", + "@ember/test-helpers": "^5.1.0", "@embroider/addon-dev": "^7.1.1", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", @@ -77,18 +77,18 @@ "ember-modifier": "^4.2.0", "ember-source": "~6.2.0", "ember-template-lint": "^6.1.0", - "eslint": "^9.20.0", - "postcss": "^8.5.1", - "prettier": "^3.5.0", + "eslint": "^9.21.0", + "postcss": "^8.5.3", + "prettier": "^3.5.2", "qunit-dom": "^3.4.0", - "rollup": "^4.34.6", + "rollup": "^4.34.8", "rollup-plugin-postcss": "^4.0.2", "stylelint": "^16.14.1", - "type-css-modules": "^1.0.16", + "type-css-modules": "^1.0.17", "typescript": "^5.7.3" }, "peerDependencies": { - "@ember/test-helpers": "^4.0.0 || ^5.0.0", + "@ember/test-helpers": "^5.1.0", "qunit-dom": "^3.4.0" }, "peerDependenciesMeta": { diff --git a/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/update-blueprints.mjs b/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/update-blueprints.mjs index 80c552a..5ba2100 100755 --- a/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/update-blueprints.mjs +++ b/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/update-blueprints.mjs @@ -5,7 +5,7 @@ import gitDiffApply from 'git-diff-apply'; import yargs from 'yargs'; import { hideBin } from 'yargs/helpers'; -const CURRENT_VERSION = '0.6.0'; +const CURRENT_VERSION = '0.6.1'; async function updateBlueprints({ from, to }) { const startTag = from; diff --git a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/package.json b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/package.json index 63896b0..c7fdb4a 100644 --- a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/package.json +++ b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/package.json @@ -1,6 +1,6 @@ { "name": "blueprints-v2-addon", - "version": "0.6.0", + "version": "0.6.1", "private": true, "description": "Blueprints for v2 addons", "keywords": [ @@ -38,7 +38,7 @@ "@codemod-utils/ast-javascript": "^1.2.13", "@codemod-utils/blueprints": "^1.1.9", "@codemod-utils/ember": "^2.0.4", - "@codemod-utils/files": "^2.0.8", + "@codemod-utils/files": "^2.1.0", "@codemod-utils/json": "^1.1.14", "yargs": "^17.7.2" }, @@ -48,12 +48,12 @@ "@shared-configs/prettier": "workspace:*", "@shared-configs/typescript": "workspace:*", "@sondr3/minitest": "^0.1.2", - "@types/node": "^18.19.75", + "@types/node": "^18.19.76", "@types/yargs": "^17.0.33", "concurrently": "^9.1.2", - "eslint": "^9.20.0", + "eslint": "^9.21.0", "git-diff-apply": "^6.0.6", - "prettier": "^3.5.0", + "prettier": "^3.5.2", "typescript": "^5.7.3" }, "engines": { diff --git a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/src/blueprints/run-new/__addonLocation__/package.json b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/src/blueprints/run-new/__addonLocation__/package.json index aaa5189..10bf793 100644 --- a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/src/blueprints/run-new/__addonLocation__/package.json +++ b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/src/blueprints/run-new/__addonLocation__/package.json @@ -34,6 +34,7 @@ "scripts": { "addon": "blueprints-v2-addon --test-app-location \"<%= options.addon.locationInverse %>/<%= options.testApp.location %>\"", "build": "rollup --config", + "prelint:types": "type-css-modules --src src", "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", "lint:css": "stylelint \"**/*.css\" --allow-empty-input --cache", "lint:css:fix": "stylelint \"**/*.css\" --allow-empty-input --fix", @@ -42,7 +43,6 @@ "lint:hbs:fix": "ember-template-lint . --fix", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", - "prelint:types": "type-css-modules --src src", "lint:types": "glint", "prepack": "rollup --config", "start": "rollup --config --watch", @@ -51,13 +51,13 @@ "dependencies": { "@embroider/addon-shim": "^1.9.0", "decorator-transforms": "^2.3.0", - "embroider-css-modules": "^2.0.14" + "embroider-css-modules": "^2.0.15" }, "devDependencies": { - "@babel/core": "^7.26.8", + "@babel/core": "^7.26.9", "@babel/plugin-transform-typescript": "^7.26.8", - "@babel/runtime": "^7.26.7", - "@ember/test-helpers": "^4.0.5", + "@babel/runtime": "^7.26.9", + "@ember/test-helpers": "^5.1.0", "@embroider/addon-dev": "^7.1.1", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", @@ -77,18 +77,18 @@ "ember-modifier": "^4.2.0", "ember-source": "~6.2.0", "ember-template-lint": "^6.1.0", - "eslint": "^9.20.0", - "postcss": "^8.5.1", - "prettier": "^3.5.0", + "eslint": "^9.21.0", + "postcss": "^8.5.3", + "prettier": "^3.5.2", "qunit-dom": "^3.4.0", - "rollup": "^4.34.6", + "rollup": "^4.34.8", "rollup-plugin-postcss": "^4.0.2", "stylelint": "^16.14.1", - "type-css-modules": "^1.0.16", + "type-css-modules": "^1.0.17", "typescript": "^5.7.3" }, "peerDependencies": { - "@ember/test-helpers": "^4.0.0 || ^5.0.0", + "@ember/test-helpers": "^5.1.0", "qunit-dom": "^3.4.0" }, "peerDependenciesMeta": { diff --git a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/tests/fixtures/run-new/output/packages/ui/form/package.json b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/tests/fixtures/run-new/output/packages/ui/form/package.json index 93aa652..c3a2cfa 100644 --- a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/tests/fixtures/run-new/output/packages/ui/form/package.json +++ b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/tests/fixtures/run-new/output/packages/ui/form/package.json @@ -34,6 +34,7 @@ "scripts": { "addon": "blueprints-v2-addon --test-app-location \"../../../test-app\"", "build": "rollup --config", + "prelint:types": "type-css-modules --src src", "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", "lint:css": "stylelint \"**/*.css\" --allow-empty-input --cache", "lint:css:fix": "stylelint \"**/*.css\" --allow-empty-input --fix", @@ -42,7 +43,6 @@ "lint:hbs:fix": "ember-template-lint . --fix", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", - "prelint:types": "type-css-modules --src src", "lint:types": "glint", "prepack": "rollup --config", "start": "rollup --config --watch", @@ -51,13 +51,13 @@ "dependencies": { "@embroider/addon-shim": "^1.9.0", "decorator-transforms": "^2.3.0", - "embroider-css-modules": "^2.0.14" + "embroider-css-modules": "^2.0.15" }, "devDependencies": { - "@babel/core": "^7.26.8", + "@babel/core": "^7.26.9", "@babel/plugin-transform-typescript": "^7.26.8", - "@babel/runtime": "^7.26.7", - "@ember/test-helpers": "^4.0.5", + "@babel/runtime": "^7.26.9", + "@ember/test-helpers": "^5.1.0", "@embroider/addon-dev": "^7.1.1", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", @@ -77,18 +77,18 @@ "ember-modifier": "^4.2.0", "ember-source": "~6.2.0", "ember-template-lint": "^6.1.0", - "eslint": "^9.20.0", - "postcss": "^8.5.1", - "prettier": "^3.5.0", + "eslint": "^9.21.0", + "postcss": "^8.5.3", + "prettier": "^3.5.2", "qunit-dom": "^3.4.0", - "rollup": "^4.34.6", + "rollup": "^4.34.8", "rollup-plugin-postcss": "^4.0.2", "stylelint": "^16.14.1", - "type-css-modules": "^1.0.16", + "type-css-modules": "^1.0.17", "typescript": "^5.7.3" }, "peerDependencies": { - "@ember/test-helpers": "^4.0.0 || ^5.0.0", + "@ember/test-helpers": "^5.1.0", "qunit-dom": "^3.4.0" }, "peerDependenciesMeta": { diff --git a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/update-blueprints.mjs b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/update-blueprints.mjs index 80c552a..5ba2100 100755 --- a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/update-blueprints.mjs +++ b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/update-blueprints.mjs @@ -5,7 +5,7 @@ import gitDiffApply from 'git-diff-apply'; import yargs from 'yargs'; import { hideBin } from 'yargs/helpers'; -const CURRENT_VERSION = '0.6.0'; +const CURRENT_VERSION = '0.6.1'; async function updateBlueprints({ from, to }) { const startTag = from; From f57fc3f301b9fd901ad2cb2393b90c76ec1d277f Mon Sep 17 00:00:00 2001 From: ijlee2 Date: Mon, 24 Feb 2025 14:06:31 +0100 Subject: [PATCH 6/9] chore: Standardized prefix --- .../src/blueprints/configs/ember-template-lint/package.json | 4 ++-- .../src/blueprints/configs/eslint/ember/package.json | 4 ++-- .../src/blueprints/configs/eslint/node/package.json | 4 ++-- .../src/blueprints/configs/prettier/package.json | 4 ++-- .../src/blueprints/configs/stylelint/package.json | 4 ++-- .../src/blueprints/configs/typescript/package.json | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/create-v2-addon-repo/src/blueprints/configs/ember-template-lint/package.json b/packages/create-v2-addon-repo/src/blueprints/configs/ember-template-lint/package.json index 32291e8..01dc04b 100644 --- a/packages/create-v2-addon-repo/src/blueprints/configs/ember-template-lint/package.json +++ b/packages/create-v2-addon-repo/src/blueprints/configs/ember-template-lint/package.json @@ -6,8 +6,8 @@ "type": "module", "main": "index.cjs", "scripts": { - "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"", - "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", + "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"", "lint:js": "prettier \"**/*.{cjs,mjs}\" --check", "lint:js:fix": "prettier \"**/*.{cjs,mjs}\" --write" }, diff --git a/packages/create-v2-addon-repo/src/blueprints/configs/eslint/ember/package.json b/packages/create-v2-addon-repo/src/blueprints/configs/eslint/ember/package.json index ff5541c..a545611 100644 --- a/packages/create-v2-addon-repo/src/blueprints/configs/eslint/ember/package.json +++ b/packages/create-v2-addon-repo/src/blueprints/configs/eslint/ember/package.json @@ -9,8 +9,8 @@ "./v2-addon": "./v2-addon/index.js" }, "scripts": { - "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"", - "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", + "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix" }, diff --git a/packages/create-v2-addon-repo/src/blueprints/configs/eslint/node/package.json b/packages/create-v2-addon-repo/src/blueprints/configs/eslint/node/package.json index a7c1c23..3517467 100644 --- a/packages/create-v2-addon-repo/src/blueprints/configs/eslint/node/package.json +++ b/packages/create-v2-addon-repo/src/blueprints/configs/eslint/node/package.json @@ -15,8 +15,8 @@ "lint:js:fix": "prettier --write \"**/*.js\"" }, "scripts": { - "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"", - "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", + "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix" }, diff --git a/packages/create-v2-addon-repo/src/blueprints/configs/prettier/package.json b/packages/create-v2-addon-repo/src/blueprints/configs/prettier/package.json index 7704e64..d829df0 100644 --- a/packages/create-v2-addon-repo/src/blueprints/configs/prettier/package.json +++ b/packages/create-v2-addon-repo/src/blueprints/configs/prettier/package.json @@ -17,8 +17,8 @@ } }, "scripts": { - "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"", - "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", + "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"", "lint:js": "prettier \"**/*.{cjs,mjs}\" --check", "lint:js:fix": "prettier \"**/*.{cjs,mjs}\" --write" }, diff --git a/packages/create-v2-addon-repo/src/blueprints/configs/stylelint/package.json b/packages/create-v2-addon-repo/src/blueprints/configs/stylelint/package.json index 6d6e77c..a3651e1 100644 --- a/packages/create-v2-addon-repo/src/blueprints/configs/stylelint/package.json +++ b/packages/create-v2-addon-repo/src/blueprints/configs/stylelint/package.json @@ -15,8 +15,8 @@ } }, "scripts": { - "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"", - "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", + "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"", "lint:js": "prettier \"**/*.{cjs,mjs}\" --check", "lint:js:fix": "prettier \"**/*.{cjs,mjs}\" --write" }, diff --git a/packages/create-v2-addon-repo/src/blueprints/configs/typescript/package.json b/packages/create-v2-addon-repo/src/blueprints/configs/typescript/package.json index 2e264a0..b85e1fa 100644 --- a/packages/create-v2-addon-repo/src/blueprints/configs/typescript/package.json +++ b/packages/create-v2-addon-repo/src/blueprints/configs/typescript/package.json @@ -11,8 +11,8 @@ "./node22": "./node22/index.json" }, "scripts": { - "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"", - "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", + "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"", "lint:js": "prettier \"**/*.{cjs,json,mjs}\" --check", "lint:js:fix": "prettier \"**/*.{cjs,json,mjs}\" --write" }, From 5fd1f48422bc9feec6a88c40923338370d963b07 Mon Sep 17 00:00:00 2001 From: ijlee2 Date: Mon, 24 Feb 2025 14:06:35 +0100 Subject: [PATCH 7/9] chore: Updated dependencies --- .../configs/ember-template-lint/package.json | 4 +-- .../configs/eslint/ember/package.json | 10 +++---- .../configs/eslint/node/package.json | 10 +++---- .../blueprints/configs/prettier/package.json | 6 ++-- .../blueprints/configs/stylelint/package.json | 6 ++-- .../configs/typescript/package.json | 4 +-- .../src/blueprints/docs-app/package.json | 30 +++++++++---------- .../src/blueprints/package.json | 1 + .../src/blueprints/test-app/package.json | 18 +++++------ 9 files changed, 45 insertions(+), 44 deletions(-) diff --git a/packages/create-v2-addon-repo/src/blueprints/configs/ember-template-lint/package.json b/packages/create-v2-addon-repo/src/blueprints/configs/ember-template-lint/package.json index 01dc04b..15dd14e 100644 --- a/packages/create-v2-addon-repo/src/blueprints/configs/ember-template-lint/package.json +++ b/packages/create-v2-addon-repo/src/blueprints/configs/ember-template-lint/package.json @@ -12,12 +12,12 @@ "lint:js:fix": "prettier \"**/*.{cjs,mjs}\" --write" }, "dependencies": { - "@ijlee2-frontend-configs/ember-template-lint": "^0.4.0" + "@ijlee2-frontend-configs/ember-template-lint": "^0.4.2" }, "devDependencies": { "@shared-configs/prettier": "workspace:*", "concurrently": "^9.1.2", - "prettier": "^3.5.0" + "prettier": "^3.5.2" }, "peerDependencies": { "ember-template-lint": "^6.1.0" diff --git a/packages/create-v2-addon-repo/src/blueprints/configs/eslint/ember/package.json b/packages/create-v2-addon-repo/src/blueprints/configs/eslint/ember/package.json index a545611..63901ff 100644 --- a/packages/create-v2-addon-repo/src/blueprints/configs/eslint/ember/package.json +++ b/packages/create-v2-addon-repo/src/blueprints/configs/eslint/ember/package.json @@ -15,18 +15,18 @@ "lint:js:fix": "eslint . --fix" }, "dependencies": { - "@ijlee2-frontend-configs/eslint-config-ember": "^0.2.1" + "@ijlee2-frontend-configs/eslint-config-ember": "^0.2.3" }, "devDependencies": { "@shared-configs/eslint-config-node": "workspace:*", "@shared-configs/prettier": "workspace:*", "concurrently": "^9.1.2", - "eslint": "^9.20.0", - "prettier": "^3.5.0" + "eslint": "^9.21.0", + "prettier": "^3.5.2" }, "peerDependencies": { - "eslint": "^9.20.0", - "prettier": "^3.5.0", + "eslint": "^9.21.0", + "prettier": "^3.5.2", "typescript": "^5.7.3" }, "peerDependenciesMeta": { diff --git a/packages/create-v2-addon-repo/src/blueprints/configs/eslint/node/package.json b/packages/create-v2-addon-repo/src/blueprints/configs/eslint/node/package.json index 3517467..1c713c4 100644 --- a/packages/create-v2-addon-repo/src/blueprints/configs/eslint/node/package.json +++ b/packages/create-v2-addon-repo/src/blueprints/configs/eslint/node/package.json @@ -21,17 +21,17 @@ "lint:js:fix": "eslint . --fix" }, "dependencies": { - "@ijlee2-frontend-configs/eslint-config-node": "^0.2.1" + "@ijlee2-frontend-configs/eslint-config-node": "^0.2.3" }, "devDependencies": { "@shared-configs/prettier": "workspace:*", "concurrently": "^9.1.2", - "eslint": "^9.20.0", - "prettier": "^3.5.0" + "eslint": "^9.21.0", + "prettier": "^3.5.2" }, "peerDependencies": { - "eslint": "^9.20.0", - "prettier": "^3.5.0", + "eslint": "^9.21.0", + "prettier": "^3.5.2", "typescript": "^5.7.3" }, "peerDependenciesMeta": { diff --git a/packages/create-v2-addon-repo/src/blueprints/configs/prettier/package.json b/packages/create-v2-addon-repo/src/blueprints/configs/prettier/package.json index d829df0..63e4d25 100644 --- a/packages/create-v2-addon-repo/src/blueprints/configs/prettier/package.json +++ b/packages/create-v2-addon-repo/src/blueprints/configs/prettier/package.json @@ -23,14 +23,14 @@ "lint:js:fix": "prettier \"**/*.{cjs,mjs}\" --write" }, "dependencies": { - "@ijlee2-frontend-configs/prettier": "^0.2.0" + "@ijlee2-frontend-configs/prettier": "^0.2.1" }, "devDependencies": { "concurrently": "^9.1.2", - "prettier": "^3.5.0" + "prettier": "^3.5.2" }, "peerDependencies": { - "prettier": "^3.5.0" + "prettier": "^3.5.2" }, "peerDependenciesMeta": { "prettier": { diff --git a/packages/create-v2-addon-repo/src/blueprints/configs/stylelint/package.json b/packages/create-v2-addon-repo/src/blueprints/configs/stylelint/package.json index a3651e1..4979175 100644 --- a/packages/create-v2-addon-repo/src/blueprints/configs/stylelint/package.json +++ b/packages/create-v2-addon-repo/src/blueprints/configs/stylelint/package.json @@ -21,15 +21,15 @@ "lint:js:fix": "prettier \"**/*.{cjs,mjs}\" --write" }, "dependencies": { - "@ijlee2-frontend-configs/stylelint": "^0.2.0" + "@ijlee2-frontend-configs/stylelint": "^0.2.1" }, "devDependencies": { "@shared-configs/prettier": "workspace:*", "concurrently": "^9.1.2", - "prettier": "^3.5.0" + "prettier": "^3.5.2" }, "peerDependencies": { - "prettier": "^3.5.0", + "prettier": "^3.5.2", "stylelint": "^16.14.1" }, "peerDependenciesMeta": { diff --git a/packages/create-v2-addon-repo/src/blueprints/configs/typescript/package.json b/packages/create-v2-addon-repo/src/blueprints/configs/typescript/package.json index b85e1fa..08fc8a0 100644 --- a/packages/create-v2-addon-repo/src/blueprints/configs/typescript/package.json +++ b/packages/create-v2-addon-repo/src/blueprints/configs/typescript/package.json @@ -17,12 +17,12 @@ "lint:js:fix": "prettier \"**/*.{cjs,json,mjs}\" --write" }, "dependencies": { - "@ijlee2-frontend-configs/typescript": "^0.3.0" + "@ijlee2-frontend-configs/typescript": "^0.3.1" }, "devDependencies": { "@shared-configs/prettier": "workspace:*", "concurrently": "^9.1.2", - "prettier": "^3.5.0" + "prettier": "^3.5.2" }, "peerDependencies": { "typescript": "^5.7.3" diff --git a/packages/create-v2-addon-repo/src/blueprints/docs-app/package.json b/packages/create-v2-addon-repo/src/blueprints/docs-app/package.json index 97fcb54..097f352 100644 --- a/packages/create-v2-addon-repo/src/blueprints/docs-app/package.json +++ b/packages/create-v2-addon-repo/src/blueprints/docs-app/package.json @@ -26,15 +26,15 @@ "test": "ember test --test-port 0" }, "devDependencies": { - "@babel/core": "^7.26.8", + "@babel/core": "^7.26.9", "@ember/optional-features": "^2.2.0", - "@ember/string": "^4.0.0", - "@ember/test-helpers": "^4.0.5", + "@ember/string": "^4.0.1", + "@ember/test-helpers": "^5.1.0", "@embroider/broccoli-side-watch": "^1.0.1", - "@embroider/compat": "^3.8.1", - "@embroider/core": "^3.5.0", + "@embroider/compat": "^3.8.3", + "@embroider/core": "^3.5.2", "@embroider/router": "^2.1.8", - "@embroider/webpack": "^4.0.9", + "@embroider/webpack": "^4.1.0", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/core": "^1.5.2", @@ -50,9 +50,9 @@ "autoprefixer": "^10.4.20", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.1.2", - "ember-a11y-testing": "^7.0.2", + "ember-a11y-testing": "^7.1.0", "ember-auto-import": "^2.10.0", - "ember-cli": "~6.2.0", + "ember-cli": "~6.2.2", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.2.0", "ember-cli-clean-css": "^3.0.0", @@ -63,27 +63,27 @@ "ember-cli-terser": "^4.0.2", "ember-load-initializers": "^3.0.1", "ember-modifier": "^4.2.0", - "ember-page-title": "^8.2.3", + "ember-page-title": "^9.0.1", "ember-qunit": "^9.0.1", "ember-resolver": "^13.1.0", "ember-source": "~6.2.0", "ember-template-imports": "^4.3.0", "ember-template-lint": "^6.1.0", "ember-test-selectors": "^7.0.0", - "embroider-css-modules": "^2.0.14", - "eslint": "^9.20.0", + "embroider-css-modules": "^2.0.15", + "eslint": "^9.21.0", "latest-version": "^9.0.0", "loader.js": "^4.7.0", - "postcss": "^8.5.1", + "postcss": "^8.5.3", "postcss-loader": "^8.1.1", - "prettier": "^3.5.0", + "prettier": "^3.5.2", "qunit": "^2.24.1", "qunit-dom": "^3.4.0", "stylelint": "^16.14.1", "tracked-built-ins": "^4.0.0", - "type-css-modules": "^1.0.16", + "type-css-modules": "^1.0.17", "typescript": "^5.7.3", - "webpack": "^5.97.1" + "webpack": "^5.98.0" }, "engines": { "node": "18.* || >= 20" diff --git a/packages/create-v2-addon-repo/src/blueprints/package.json b/packages/create-v2-addon-repo/src/blueprints/package.json index 14488df..72f07c2 100644 --- a/packages/create-v2-addon-repo/src/blueprints/package.json +++ b/packages/create-v2-addon-repo/src/blueprints/package.json @@ -24,6 +24,7 @@ }, "pnpm": { "overrides": { + "@ember/test-waiters": "^4.0.0", "get-tsconfig": "4.7.3" } } diff --git a/packages/create-v2-addon-repo/src/blueprints/test-app/package.json b/packages/create-v2-addon-repo/src/blueprints/test-app/package.json index f95557d..f1655e6 100644 --- a/packages/create-v2-addon-repo/src/blueprints/test-app/package.json +++ b/packages/create-v2-addon-repo/src/blueprints/test-app/package.json @@ -26,10 +26,10 @@ "test:ember-compatibility": "ember try:one" }, "devDependencies": { - "@babel/core": "^7.26.8", + "@babel/core": "^7.26.9", "@ember/optional-features": "^2.2.0", - "@ember/string": "^4.0.0", - "@ember/test-helpers": "^4.0.5", + "@ember/string": "^4.0.1", + "@ember/test-helpers": "^5.1.0", "@embroider/broccoli-side-watch": "^1.0.1", "@embroider/test-setup": "^4.0.0", "@glimmer/component": "^2.0.0", @@ -46,9 +46,9 @@ "@types/qunit": "^2.19.12", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.1.2", - "ember-a11y-testing": "^7.0.2", + "ember-a11y-testing": "^7.1.0", "ember-auto-import": "^2.10.0", - "ember-cli": "~6.2.0", + "ember-cli": "~6.2.2", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.2.0", "ember-cli-clean-css": "^3.0.0", @@ -59,7 +59,7 @@ "ember-cli-terser": "^4.0.2", "ember-load-initializers": "^3.0.1", "ember-modifier": "^4.2.0", - "ember-page-title": "^8.2.3", + "ember-page-title": "^9.0.1", "ember-qunit": "^9.0.1", "ember-resolver": "^13.1.0", "ember-source": "~6.2.0", @@ -67,16 +67,16 @@ "ember-template-lint": "^6.1.0", "ember-test-selectors": "^7.0.0", "ember-try": "^3.0.0", - "eslint": "^9.20.0", + "eslint": "^9.21.0", "latest-version": "^9.0.0", "loader.js": "^4.7.0", - "prettier": "^3.5.0", + "prettier": "^3.5.2", "qunit": "^2.24.1", "qunit-dom": "^3.4.0", "stylelint": "^16.14.1", "tracked-built-ins": "^4.0.0", "typescript": "^5.7.3", - "webpack": "^5.97.1" + "webpack": "^5.98.0" }, "engines": { "node": "18.* || >= 20" From 8979b04549fe7fed5e1eeb1e8005e75f71754792 Mon Sep 17 00:00:00 2001 From: ijlee2 Date: Mon, 24 Feb 2025 14:10:42 +0100 Subject: [PATCH 8/9] chore: Updated fixtures --- .../configs/ember-template-lint/package.json | 8 ++--- .../my-repo/configs/eslint/ember/package.json | 14 ++++----- .../my-repo/configs/eslint/node/package.json | 14 ++++----- .../my-repo/configs/prettier/package.json | 10 +++---- .../my-repo/configs/stylelint/package.json | 10 +++---- .../my-repo/configs/typescript/package.json | 8 ++--- .../output/my-repo/docs-app/package.json | 30 +++++++++---------- .../typescript/output/my-repo/package.json | 1 + .../output/my-repo/test-app/package.json | 18 +++++------ 9 files changed, 57 insertions(+), 56 deletions(-) diff --git a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/ember-template-lint/package.json b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/ember-template-lint/package.json index 32291e8..15dd14e 100644 --- a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/ember-template-lint/package.json +++ b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/ember-template-lint/package.json @@ -6,18 +6,18 @@ "type": "module", "main": "index.cjs", "scripts": { - "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"", - "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", + "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"", "lint:js": "prettier \"**/*.{cjs,mjs}\" --check", "lint:js:fix": "prettier \"**/*.{cjs,mjs}\" --write" }, "dependencies": { - "@ijlee2-frontend-configs/ember-template-lint": "^0.4.0" + "@ijlee2-frontend-configs/ember-template-lint": "^0.4.2" }, "devDependencies": { "@shared-configs/prettier": "workspace:*", "concurrently": "^9.1.2", - "prettier": "^3.5.0" + "prettier": "^3.5.2" }, "peerDependencies": { "ember-template-lint": "^6.1.0" diff --git a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/eslint/ember/package.json b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/eslint/ember/package.json index ff5541c..63901ff 100644 --- a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/eslint/ember/package.json +++ b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/eslint/ember/package.json @@ -9,24 +9,24 @@ "./v2-addon": "./v2-addon/index.js" }, "scripts": { - "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"", - "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", + "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix" }, "dependencies": { - "@ijlee2-frontend-configs/eslint-config-ember": "^0.2.1" + "@ijlee2-frontend-configs/eslint-config-ember": "^0.2.3" }, "devDependencies": { "@shared-configs/eslint-config-node": "workspace:*", "@shared-configs/prettier": "workspace:*", "concurrently": "^9.1.2", - "eslint": "^9.20.0", - "prettier": "^3.5.0" + "eslint": "^9.21.0", + "prettier": "^3.5.2" }, "peerDependencies": { - "eslint": "^9.20.0", - "prettier": "^3.5.0", + "eslint": "^9.21.0", + "prettier": "^3.5.2", "typescript": "^5.7.3" }, "peerDependenciesMeta": { diff --git a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/eslint/node/package.json b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/eslint/node/package.json index a7c1c23..1c713c4 100644 --- a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/eslint/node/package.json +++ b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/eslint/node/package.json @@ -15,23 +15,23 @@ "lint:js:fix": "prettier --write \"**/*.js\"" }, "scripts": { - "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"", - "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", + "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix" }, "dependencies": { - "@ijlee2-frontend-configs/eslint-config-node": "^0.2.1" + "@ijlee2-frontend-configs/eslint-config-node": "^0.2.3" }, "devDependencies": { "@shared-configs/prettier": "workspace:*", "concurrently": "^9.1.2", - "eslint": "^9.20.0", - "prettier": "^3.5.0" + "eslint": "^9.21.0", + "prettier": "^3.5.2" }, "peerDependencies": { - "eslint": "^9.20.0", - "prettier": "^3.5.0", + "eslint": "^9.21.0", + "prettier": "^3.5.2", "typescript": "^5.7.3" }, "peerDependenciesMeta": { diff --git a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/prettier/package.json b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/prettier/package.json index 7704e64..63e4d25 100644 --- a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/prettier/package.json +++ b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/prettier/package.json @@ -17,20 +17,20 @@ } }, "scripts": { - "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"", - "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", + "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"", "lint:js": "prettier \"**/*.{cjs,mjs}\" --check", "lint:js:fix": "prettier \"**/*.{cjs,mjs}\" --write" }, "dependencies": { - "@ijlee2-frontend-configs/prettier": "^0.2.0" + "@ijlee2-frontend-configs/prettier": "^0.2.1" }, "devDependencies": { "concurrently": "^9.1.2", - "prettier": "^3.5.0" + "prettier": "^3.5.2" }, "peerDependencies": { - "prettier": "^3.5.0" + "prettier": "^3.5.2" }, "peerDependenciesMeta": { "prettier": { diff --git a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/stylelint/package.json b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/stylelint/package.json index 6d6e77c..4979175 100644 --- a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/stylelint/package.json +++ b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/stylelint/package.json @@ -15,21 +15,21 @@ } }, "scripts": { - "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"", - "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", + "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"", "lint:js": "prettier \"**/*.{cjs,mjs}\" --check", "lint:js:fix": "prettier \"**/*.{cjs,mjs}\" --write" }, "dependencies": { - "@ijlee2-frontend-configs/stylelint": "^0.2.0" + "@ijlee2-frontend-configs/stylelint": "^0.2.1" }, "devDependencies": { "@shared-configs/prettier": "workspace:*", "concurrently": "^9.1.2", - "prettier": "^3.5.0" + "prettier": "^3.5.2" }, "peerDependencies": { - "prettier": "^3.5.0", + "prettier": "^3.5.2", "stylelint": "^16.14.1" }, "peerDependenciesMeta": { diff --git a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/typescript/package.json b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/typescript/package.json index 2e264a0..08fc8a0 100644 --- a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/typescript/package.json +++ b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/configs/typescript/package.json @@ -11,18 +11,18 @@ "./node22": "./node22/index.json" }, "scripts": { - "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"", - "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", + "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"", "lint:js": "prettier \"**/*.{cjs,json,mjs}\" --check", "lint:js:fix": "prettier \"**/*.{cjs,json,mjs}\" --write" }, "dependencies": { - "@ijlee2-frontend-configs/typescript": "^0.3.0" + "@ijlee2-frontend-configs/typescript": "^0.3.1" }, "devDependencies": { "@shared-configs/prettier": "workspace:*", "concurrently": "^9.1.2", - "prettier": "^3.5.0" + "prettier": "^3.5.2" }, "peerDependencies": { "typescript": "^5.7.3" diff --git a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/docs-app/package.json b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/docs-app/package.json index 2c2ceec..4b860cc 100644 --- a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/docs-app/package.json +++ b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/docs-app/package.json @@ -26,15 +26,15 @@ "test": "ember test --test-port 0" }, "devDependencies": { - "@babel/core": "^7.26.8", + "@babel/core": "^7.26.9", "@ember/optional-features": "^2.2.0", - "@ember/string": "^4.0.0", - "@ember/test-helpers": "^4.0.5", + "@ember/string": "^4.0.1", + "@ember/test-helpers": "^5.1.0", "@embroider/broccoli-side-watch": "^1.0.1", - "@embroider/compat": "^3.8.1", - "@embroider/core": "^3.5.0", + "@embroider/compat": "^3.8.3", + "@embroider/core": "^3.5.2", "@embroider/router": "^2.1.8", - "@embroider/webpack": "^4.0.9", + "@embroider/webpack": "^4.1.0", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/core": "^1.5.2", @@ -50,9 +50,9 @@ "autoprefixer": "^10.4.20", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.1.2", - "ember-a11y-testing": "^7.0.2", + "ember-a11y-testing": "^7.1.0", "ember-auto-import": "^2.10.0", - "ember-cli": "~6.2.0", + "ember-cli": "~6.2.2", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.2.0", "ember-cli-clean-css": "^3.0.0", @@ -63,27 +63,27 @@ "ember-cli-terser": "^4.0.2", "ember-load-initializers": "^3.0.1", "ember-modifier": "^4.2.0", - "ember-page-title": "^8.2.3", + "ember-page-title": "^9.0.1", "ember-qunit": "^9.0.1", "ember-resolver": "^13.1.0", "ember-source": "~6.2.0", "ember-template-imports": "^4.3.0", "ember-template-lint": "^6.1.0", "ember-test-selectors": "^7.0.0", - "embroider-css-modules": "^2.0.14", - "eslint": "^9.20.0", + "embroider-css-modules": "^2.0.15", + "eslint": "^9.21.0", "latest-version": "^9.0.0", "loader.js": "^4.7.0", - "postcss": "^8.5.1", + "postcss": "^8.5.3", "postcss-loader": "^8.1.1", - "prettier": "^3.5.0", + "prettier": "^3.5.2", "qunit": "^2.24.1", "qunit-dom": "^3.4.0", "stylelint": "^16.14.1", "tracked-built-ins": "^4.0.0", - "type-css-modules": "^1.0.16", + "type-css-modules": "^1.0.17", "typescript": "^5.7.3", - "webpack": "^5.97.1" + "webpack": "^5.98.0" }, "engines": { "node": "18.* || >= 20" diff --git a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/package.json b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/package.json index cd454d7..93be476 100644 --- a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/package.json +++ b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/package.json @@ -24,6 +24,7 @@ }, "pnpm": { "overrides": { + "@ember/test-waiters": "^4.0.0", "get-tsconfig": "4.7.3" } } diff --git a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/test-app/package.json b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/test-app/package.json index a14adc9..73089b1 100644 --- a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/test-app/package.json +++ b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/test-app/package.json @@ -26,10 +26,10 @@ "test:ember-compatibility": "ember try:one" }, "devDependencies": { - "@babel/core": "^7.26.8", + "@babel/core": "^7.26.9", "@ember/optional-features": "^2.2.0", - "@ember/string": "^4.0.0", - "@ember/test-helpers": "^4.0.5", + "@ember/string": "^4.0.1", + "@ember/test-helpers": "^5.1.0", "@embroider/broccoli-side-watch": "^1.0.1", "@embroider/test-setup": "^4.0.0", "@glimmer/component": "^2.0.0", @@ -46,9 +46,9 @@ "@types/qunit": "^2.19.12", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.1.2", - "ember-a11y-testing": "^7.0.2", + "ember-a11y-testing": "^7.1.0", "ember-auto-import": "^2.10.0", - "ember-cli": "~6.2.0", + "ember-cli": "~6.2.2", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.2.0", "ember-cli-clean-css": "^3.0.0", @@ -59,7 +59,7 @@ "ember-cli-terser": "^4.0.2", "ember-load-initializers": "^3.0.1", "ember-modifier": "^4.2.0", - "ember-page-title": "^8.2.3", + "ember-page-title": "^9.0.1", "ember-qunit": "^9.0.1", "ember-resolver": "^13.1.0", "ember-source": "~6.2.0", @@ -67,16 +67,16 @@ "ember-template-lint": "^6.1.0", "ember-test-selectors": "^7.0.0", "ember-try": "^3.0.0", - "eslint": "^9.20.0", + "eslint": "^9.21.0", "latest-version": "^9.0.0", "loader.js": "^4.7.0", - "prettier": "^3.5.0", + "prettier": "^3.5.2", "qunit": "^2.24.1", "qunit-dom": "^3.4.0", "stylelint": "^16.14.1", "tracked-built-ins": "^4.0.0", "typescript": "^5.7.3", - "webpack": "^5.97.1" + "webpack": "^5.98.0" }, "engines": { "node": "18.* || >= 20" From b90139fd5b75905e8c0420b347c4df5b8284e293 Mon Sep 17 00:00:00 2001 From: ijlee2 Date: Mon, 24 Feb 2025 14:11:04 +0100 Subject: [PATCH 9/9] chore: Added changeset --- .changeset/true-roses-win.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/true-roses-win.md diff --git a/.changeset/true-roses-win.md b/.changeset/true-roses-win.md new file mode 100644 index 0000000..4288db9 --- /dev/null +++ b/.changeset/true-roses-win.md @@ -0,0 +1,6 @@ +--- +"create-v2-addon-repo": patch +"blueprints-v2-addon": patch +--- + +Updated blueprints