From 5436eaf88af9b72d75be3aa71677af4f130d72ce Mon Sep 17 00:00:00 2001 From: Isaac Lee <16869656+ijlee2@users.noreply.github.com> Date: Tue, 10 Sep 2024 06:18:54 +0200 Subject: [PATCH] Set up @ember/test-helpers and qunit-dom (#49) * chore: Removed the directories field (unused) * feature: Set up @ember/test-helpers and qunit-dom * chore: Updated fixtures * chore: Updated CURRENT_VERSION * chore: Ran update-blueprints-v2-addon * chore: Added changeset --------- Co-authored-by: ijlee2 --- .changeset/kind-lamps-nail.md | 6 ++++++ packages/blueprints-v2-addon/package.json | 2 +- .../run-new/__addonLocation__/package.json | 18 ++++++++++++++---- .../unpublished-development-types/index.d.ts | 1 + .../output/packages/ui/form/package.json | 18 ++++++++++++++---- .../unpublished-development-types/index.d.ts | 1 + .../blueprints-v2-addon/update-blueprints.js | 4 ++-- .../blueprints/v2-addon/package.json | 2 +- .../run-new/__addonLocation__/package.json | 18 ++++++++++++++---- .../unpublished-development-types/index.d.ts | 1 + .../output/packages/ui/form/package.json | 18 ++++++++++++++---- .../unpublished-development-types/index.d.ts | 1 + .../blueprints/v2-addon/update-blueprints.js | 4 ++-- .../my-repo/blueprints/v2-addon/package.json | 2 +- .../run-new/__addonLocation__/package.json | 18 ++++++++++++++---- .../unpublished-development-types/index.d.ts | 1 + .../output/packages/ui/form/package.json | 18 ++++++++++++++---- .../unpublished-development-types/index.d.ts | 1 + .../blueprints/v2-addon/update-blueprints.js | 4 ++-- 19 files changed, 105 insertions(+), 33 deletions(-) create mode 100644 .changeset/kind-lamps-nail.md diff --git a/.changeset/kind-lamps-nail.md b/.changeset/kind-lamps-nail.md new file mode 100644 index 0000000..69f84e4 --- /dev/null +++ b/.changeset/kind-lamps-nail.md @@ -0,0 +1,6 @@ +--- +"create-v2-addon-repo": minor +"blueprints-v2-addon": minor +--- + +Set up @ember/test-helpers and qunit-dom diff --git a/packages/blueprints-v2-addon/package.json b/packages/blueprints-v2-addon/package.json index 1c05b22..e906139 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.1.5", + "version": "0.2.0", "private": true, "description": "Blueprints for v2 addons", "keywords": [ 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 0bec1ae..0bdd6ea 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 @@ -25,10 +25,6 @@ ] } }, - "directories": { - "doc": "doc", - "test": "tests" - }, "files": [ "addon-main.cjs", "declarations", @@ -65,6 +61,7 @@ "@babel/core": "^7.25.2", "@babel/plugin-transform-typescript": "^7.25.2", "@babel/runtime": "^7.25.6", + "@ember/test-helpers": "^4.0.4", "@embroider/addon-dev": "^5.0.0", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", @@ -87,12 +84,25 @@ "eslint": "^8.57.0", "postcss": "^8.4.45", "prettier": "^3.3.3", + "qunit-dom": "^3.2.0", "rollup": "^4.21.2", "rollup-plugin-postcss": "^4.0.2", "stylelint": "^16.9.0", "type-css-modules": "^1.0.13", "typescript": "^5.5.4" }, + "peerDependencies": { + "@ember/test-helpers": "^3.2.0 || ^4.0.0", + "qunit-dom": "^3.2.0" + }, + "peerDependenciesMeta": { + "@ember/test-helpers": { + "optional": true + }, + "qunit-dom": { + "optional": true + } + }, "engines": { "node": "18.* || >= 20" }, diff --git a/packages/blueprints-v2-addon/src/blueprints/run-new/__addonLocation__/unpublished-development-types/index.d.ts b/packages/blueprints-v2-addon/src/blueprints/run-new/__addonLocation__/unpublished-development-types/index.d.ts index 2f22d3f..11efbbf 100644 --- a/packages/blueprints-v2-addon/src/blueprints/run-new/__addonLocation__/unpublished-development-types/index.d.ts +++ b/packages/blueprints-v2-addon/src/blueprints/run-new/__addonLocation__/unpublished-development-types/index.d.ts @@ -4,6 +4,7 @@ import '@glint/environment-ember-loose'; import '@glint/environment-ember-template-imports'; import 'ember-source/types'; +import 'qunit-dom'; import type EmbroiderCssModulesRegistry from 'embroider-css-modules/template-registry'; 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 dd2d960..7ca1bec 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 @@ -25,10 +25,6 @@ ] } }, - "directories": { - "doc": "doc", - "test": "tests" - }, "files": [ "addon-main.cjs", "declarations", @@ -65,6 +61,7 @@ "@babel/core": "^7.25.2", "@babel/plugin-transform-typescript": "^7.25.2", "@babel/runtime": "^7.25.6", + "@ember/test-helpers": "^4.0.4", "@embroider/addon-dev": "^5.0.0", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", @@ -87,12 +84,25 @@ "eslint": "^8.57.0", "postcss": "^8.4.45", "prettier": "^3.3.3", + "qunit-dom": "^3.2.0", "rollup": "^4.21.2", "rollup-plugin-postcss": "^4.0.2", "stylelint": "^16.9.0", "type-css-modules": "^1.0.13", "typescript": "^5.5.4" }, + "peerDependencies": { + "@ember/test-helpers": "^3.2.0 || ^4.0.0", + "qunit-dom": "^3.2.0" + }, + "peerDependenciesMeta": { + "@ember/test-helpers": { + "optional": true + }, + "qunit-dom": { + "optional": true + } + }, "engines": { "node": "18.* || >= 20" }, diff --git a/packages/blueprints-v2-addon/tests/fixtures/run-new/output/packages/ui/form/unpublished-development-types/index.d.ts b/packages/blueprints-v2-addon/tests/fixtures/run-new/output/packages/ui/form/unpublished-development-types/index.d.ts index 3dde153..222f8c1 100644 --- a/packages/blueprints-v2-addon/tests/fixtures/run-new/output/packages/ui/form/unpublished-development-types/index.d.ts +++ b/packages/blueprints-v2-addon/tests/fixtures/run-new/output/packages/ui/form/unpublished-development-types/index.d.ts @@ -4,6 +4,7 @@ import '@glint/environment-ember-loose'; import '@glint/environment-ember-template-imports'; import 'ember-source/types'; +import 'qunit-dom'; import type EmbroiderCssModulesRegistry from 'embroider-css-modules/template-registry'; diff --git a/packages/blueprints-v2-addon/update-blueprints.js b/packages/blueprints-v2-addon/update-blueprints.js index 5f6adf4..c60e07f 100755 --- a/packages/blueprints-v2-addon/update-blueprints.js +++ b/packages/blueprints-v2-addon/update-blueprints.js @@ -5,7 +5,7 @@ import gitDiffApply from 'git-diff-apply'; import yargs from 'yargs'; import { hideBin } from 'yargs/helpers'; -const CURRENT_VERSION = '0.1.5'; +const CURRENT_VERSION = '0.2.0'; async function updateBlueprints({ from, to }) { const startTag = from; @@ -37,7 +37,7 @@ yargs(hideBin(process.argv)) type: 'string', }) .option('to', { - describe: "The end version (e.g. '0.5.0')", + describe: "The end version (e.g. '0.2.0')", type: 'string', }) .demandOption(['to']); 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 1c05b22..e906139 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.1.5", + "version": "0.2.0", "private": true, "description": "Blueprints for v2 addons", "keywords": [ 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 eb54e30..2273beb 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 @@ -25,10 +25,6 @@ ] } }, - "directories": { - "doc": "doc", - "test": "tests" - }, "files": [ "addon-main.cjs", "declarations", @@ -65,6 +61,7 @@ "@babel/core": "^7.25.2", "@babel/plugin-transform-typescript": "^7.25.2", "@babel/runtime": "^7.25.6", + "@ember/test-helpers": "^4.0.4", "@embroider/addon-dev": "^5.0.0", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", @@ -87,12 +84,25 @@ "eslint": "^8.57.0", "postcss": "^8.4.45", "prettier": "^3.3.3", + "qunit-dom": "^3.2.0", "rollup": "^4.21.2", "rollup-plugin-postcss": "^4.0.2", "stylelint": "^16.9.0", "type-css-modules": "^1.0.13", "typescript": "^5.5.4" }, + "peerDependencies": { + "@ember/test-helpers": "^3.2.0 || ^4.0.0", + "qunit-dom": "^3.2.0" + }, + "peerDependenciesMeta": { + "@ember/test-helpers": { + "optional": true + }, + "qunit-dom": { + "optional": true + } + }, "engines": { "node": "18.* || >= 20" }, diff --git a/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/src/blueprints/run-new/__addonLocation__/unpublished-development-types/index.d.ts b/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/src/blueprints/run-new/__addonLocation__/unpublished-development-types/index.d.ts index d3f6968..f782f08 100644 --- a/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/src/blueprints/run-new/__addonLocation__/unpublished-development-types/index.d.ts +++ b/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/src/blueprints/run-new/__addonLocation__/unpublished-development-types/index.d.ts @@ -4,6 +4,7 @@ import '@glint/environment-ember-loose'; import '@glint/environment-ember-template-imports'; import 'ember-source/types'; +import 'qunit-dom'; import type EmbroiderCssModulesRegistry from 'embroider-css-modules/template-registry'; 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 dd2d960..7ca1bec 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 @@ -25,10 +25,6 @@ ] } }, - "directories": { - "doc": "doc", - "test": "tests" - }, "files": [ "addon-main.cjs", "declarations", @@ -65,6 +61,7 @@ "@babel/core": "^7.25.2", "@babel/plugin-transform-typescript": "^7.25.2", "@babel/runtime": "^7.25.6", + "@ember/test-helpers": "^4.0.4", "@embroider/addon-dev": "^5.0.0", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", @@ -87,12 +84,25 @@ "eslint": "^8.57.0", "postcss": "^8.4.45", "prettier": "^3.3.3", + "qunit-dom": "^3.2.0", "rollup": "^4.21.2", "rollup-plugin-postcss": "^4.0.2", "stylelint": "^16.9.0", "type-css-modules": "^1.0.13", "typescript": "^5.5.4" }, + "peerDependencies": { + "@ember/test-helpers": "^3.2.0 || ^4.0.0", + "qunit-dom": "^3.2.0" + }, + "peerDependenciesMeta": { + "@ember/test-helpers": { + "optional": true + }, + "qunit-dom": { + "optional": true + } + }, "engines": { "node": "18.* || >= 20" }, diff --git a/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/tests/fixtures/run-new/output/packages/ui/form/unpublished-development-types/index.d.ts b/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/tests/fixtures/run-new/output/packages/ui/form/unpublished-development-types/index.d.ts index 3dde153..222f8c1 100644 --- a/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/tests/fixtures/run-new/output/packages/ui/form/unpublished-development-types/index.d.ts +++ b/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/tests/fixtures/run-new/output/packages/ui/form/unpublished-development-types/index.d.ts @@ -4,6 +4,7 @@ import '@glint/environment-ember-loose'; import '@glint/environment-ember-template-imports'; import 'ember-source/types'; +import 'qunit-dom'; import type EmbroiderCssModulesRegistry from 'embroider-css-modules/template-registry'; diff --git a/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/update-blueprints.js b/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/update-blueprints.js index 5f6adf4..c60e07f 100755 --- a/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/update-blueprints.js +++ b/packages/create-v2-addon-repo/src/blueprints/blueprints/v2-addon/update-blueprints.js @@ -5,7 +5,7 @@ import gitDiffApply from 'git-diff-apply'; import yargs from 'yargs'; import { hideBin } from 'yargs/helpers'; -const CURRENT_VERSION = '0.1.5'; +const CURRENT_VERSION = '0.2.0'; async function updateBlueprints({ from, to }) { const startTag = from; @@ -37,7 +37,7 @@ yargs(hideBin(process.argv)) type: 'string', }) .option('to', { - describe: "The end version (e.g. '0.5.0')", + describe: "The end version (e.g. '0.2.0')", type: 'string', }) .demandOption(['to']); 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 1c05b22..e906139 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.1.5", + "version": "0.2.0", "private": true, "description": "Blueprints for v2 addons", "keywords": [ 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 0bec1ae..0bdd6ea 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 @@ -25,10 +25,6 @@ ] } }, - "directories": { - "doc": "doc", - "test": "tests" - }, "files": [ "addon-main.cjs", "declarations", @@ -65,6 +61,7 @@ "@babel/core": "^7.25.2", "@babel/plugin-transform-typescript": "^7.25.2", "@babel/runtime": "^7.25.6", + "@ember/test-helpers": "^4.0.4", "@embroider/addon-dev": "^5.0.0", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", @@ -87,12 +84,25 @@ "eslint": "^8.57.0", "postcss": "^8.4.45", "prettier": "^3.3.3", + "qunit-dom": "^3.2.0", "rollup": "^4.21.2", "rollup-plugin-postcss": "^4.0.2", "stylelint": "^16.9.0", "type-css-modules": "^1.0.13", "typescript": "^5.5.4" }, + "peerDependencies": { + "@ember/test-helpers": "^3.2.0 || ^4.0.0", + "qunit-dom": "^3.2.0" + }, + "peerDependenciesMeta": { + "@ember/test-helpers": { + "optional": true + }, + "qunit-dom": { + "optional": true + } + }, "engines": { "node": "18.* || >= 20" }, diff --git a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/src/blueprints/run-new/__addonLocation__/unpublished-development-types/index.d.ts b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/src/blueprints/run-new/__addonLocation__/unpublished-development-types/index.d.ts index 2f22d3f..11efbbf 100644 --- a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/src/blueprints/run-new/__addonLocation__/unpublished-development-types/index.d.ts +++ b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/src/blueprints/run-new/__addonLocation__/unpublished-development-types/index.d.ts @@ -4,6 +4,7 @@ import '@glint/environment-ember-loose'; import '@glint/environment-ember-template-imports'; import 'ember-source/types'; +import 'qunit-dom'; import type EmbroiderCssModulesRegistry from 'embroider-css-modules/template-registry'; 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 dd2d960..7ca1bec 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 @@ -25,10 +25,6 @@ ] } }, - "directories": { - "doc": "doc", - "test": "tests" - }, "files": [ "addon-main.cjs", "declarations", @@ -65,6 +61,7 @@ "@babel/core": "^7.25.2", "@babel/plugin-transform-typescript": "^7.25.2", "@babel/runtime": "^7.25.6", + "@ember/test-helpers": "^4.0.4", "@embroider/addon-dev": "^5.0.0", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", @@ -87,12 +84,25 @@ "eslint": "^8.57.0", "postcss": "^8.4.45", "prettier": "^3.3.3", + "qunit-dom": "^3.2.0", "rollup": "^4.21.2", "rollup-plugin-postcss": "^4.0.2", "stylelint": "^16.9.0", "type-css-modules": "^1.0.13", "typescript": "^5.5.4" }, + "peerDependencies": { + "@ember/test-helpers": "^3.2.0 || ^4.0.0", + "qunit-dom": "^3.2.0" + }, + "peerDependenciesMeta": { + "@ember/test-helpers": { + "optional": true + }, + "qunit-dom": { + "optional": true + } + }, "engines": { "node": "18.* || >= 20" }, 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/unpublished-development-types/index.d.ts b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/tests/fixtures/run-new/output/packages/ui/form/unpublished-development-types/index.d.ts index 3dde153..222f8c1 100644 --- a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/tests/fixtures/run-new/output/packages/ui/form/unpublished-development-types/index.d.ts +++ b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/tests/fixtures/run-new/output/packages/ui/form/unpublished-development-types/index.d.ts @@ -4,6 +4,7 @@ import '@glint/environment-ember-loose'; import '@glint/environment-ember-template-imports'; import 'ember-source/types'; +import 'qunit-dom'; import type EmbroiderCssModulesRegistry from 'embroider-css-modules/template-registry'; diff --git a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/update-blueprints.js b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/update-blueprints.js index 5f6adf4..c60e07f 100755 --- a/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/update-blueprints.js +++ b/packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints/v2-addon/update-blueprints.js @@ -5,7 +5,7 @@ import gitDiffApply from 'git-diff-apply'; import yargs from 'yargs'; import { hideBin } from 'yargs/helpers'; -const CURRENT_VERSION = '0.1.5'; +const CURRENT_VERSION = '0.2.0'; async function updateBlueprints({ from, to }) { const startTag = from; @@ -37,7 +37,7 @@ yargs(hideBin(process.argv)) type: 'string', }) .option('to', { - describe: "The end version (e.g. '0.5.0')", + describe: "The end version (e.g. '0.2.0')", type: 'string', }) .demandOption(['to']);