From 415ef858ed418bca32a472fb69f1066ead463bea Mon Sep 17 00:00:00 2001 From: ijlee2 Date: Wed, 15 Jan 2025 09:04:41 +0100 Subject: [PATCH] chore: Updated fixtures --- .../output/demo-app/types/global.d.ts | 9 +---- .../output/package.json | 2 +- .../ember-container-query/package.json | 40 +++++++++---------- .../ember-container-query/rollup.config.mjs | 4 ++ .../ember-container-query/tsconfig.json | 5 ++- .../unpublished-development-types/index.d.ts | 1 - .../output/ember-container-query/package.json | 40 +++++++++---------- .../ember-container-query/rollup.config.mjs | 4 ++ .../ember-container-query/tsconfig.json | 5 ++- .../unpublished-development-types/index.d.ts | 1 - .../output/package.json | 2 +- .../output/test-app/types/global.d.ts | 9 +---- .../output/ember-container-query/package.json | 16 ++++---- .../ember-container-query/rollup.config.mjs | 1 + .../output/package.json | 2 +- .../output/ember-container-query/package.json | 40 +++++++++---------- .../ember-container-query/rollup.config.mjs | 4 ++ .../ember-container-query/tsconfig.json | 5 ++- .../unpublished-development-types/index.d.ts | 1 - .../output/package.json | 2 +- .../output/test-app/types/global.d.ts | 9 +---- .../output/ember-container-query/package.json | 32 +++++++-------- .../ember-container-query/rollup.config.mjs | 4 ++ .../ember-container-query/tsconfig.json | 5 ++- .../output/package.json | 2 +- .../output/test-app/types/global.d.ts | 7 ---- .../output/hello-world/package.json | 32 +++++++-------- .../output/hello-world/rollup.config.mjs | 4 ++ .../output/hello-world/tsconfig.json | 5 ++- .../fixtures/hello-world/output/package.json | 8 ++-- .../output/test-app/types/global.d.ts | 7 ---- .../output/demo-app/types/global.d.ts | 7 ---- .../output/package.json | 2 +- .../output/packages/new-v1-addon/package.json | 32 +++++++-------- .../packages/new-v1-addon/rollup.config.mjs | 4 ++ .../packages/new-v1-addon/tsconfig.json | 5 ++- .../output/new-v1-addon/package.json | 16 ++++---- .../output/new-v1-addon/rollup.config.mjs | 1 + .../output/package.json | 2 +- .../output/new-v1-addon/package.json | 16 ++++---- .../output/new-v1-addon/rollup.config.mjs | 1 + .../new-v1-addon-npm/output/package.json | 2 +- .../output/new-v1-addon/package.json | 16 ++++---- .../output/new-v1-addon/rollup.config.mjs | 1 + .../new-v1-addon-pnpm/output/package.json | 8 ++-- .../output/new-v1-addon/package.json | 32 +++++++-------- .../output/new-v1-addon/rollup.config.mjs | 4 ++ .../output/new-v1-addon/tsconfig.json | 5 ++- .../output/package.json | 2 +- .../output/test-app/types/global.d.ts | 7 ---- .../output/demo-app/types/global.d.ts | 9 +---- .../customizations/output/package.json | 2 +- .../ember-container-query/rollup.config.mjs | 4 ++ .../ember-container-query/tsconfig.json | 5 ++- .../unpublished-development-types/index.d.ts | 1 - .../ember-container-query/rollup.config.mjs | 4 ++ .../ember-container-query/tsconfig.json | 5 ++- .../unpublished-development-types/index.d.ts | 1 - .../glint/output/package.json | 2 +- .../glint/output/test-app/types/global.d.ts | 9 +---- .../ember-container-query/rollup.config.mjs | 1 + .../javascript/output/package.json | 2 +- .../ember-container-query/rollup.config.mjs | 4 ++ .../ember-container-query/tsconfig.json | 5 ++- .../npm/output/package.json | 2 +- .../npm/output/test-app/types/global.d.ts | 7 ---- .../ember-container-query/rollup.config.mjs | 4 ++ .../ember-container-query/tsconfig.json | 5 ++- .../pnpm/output/package.json | 8 ++-- .../pnpm/output/test-app/types/global.d.ts | 7 ---- .../ember-container-query/rollup.config.mjs | 4 ++ .../ember-container-query/tsconfig.json | 5 ++- .../unpublished-development-types/index.d.ts | 1 - .../scoped/output/package.json | 2 +- .../scoped/output/test-app/types/global.d.ts | 9 +---- .../ember-container-query/rollup.config.mjs | 4 ++ .../ember-container-query/tsconfig.json | 5 ++- .../typescript/output/package.json | 2 +- .../output/test-app/types/global.d.ts | 7 ---- .../output/ember-container-query/package.json | 32 +++++++-------- .../ember-container-query/package.json | 40 +++++++++---------- .../output/ember-container-query/package.json | 40 +++++++++---------- .../output/ember-container-query/package.json | 16 ++++---- .../output/ember-container-query/package.json | 32 +++++++-------- .../output/ember-container-query/package.json | 40 +++++++++---------- .../output/ember-container-query/package.json | 32 +++++++-------- 86 files changed, 394 insertions(+), 435 deletions(-) diff --git a/tests/fixtures/ember-container-query-customizations/output/demo-app/types/global.d.ts b/tests/fixtures/ember-container-query-customizations/output/demo-app/types/global.d.ts index b702c4f0..5bfd1c5a 100644 --- a/tests/fixtures/ember-container-query-customizations/output/demo-app/types/global.d.ts +++ b/tests/fixtures/ember-container-query-customizations/output/demo-app/types/global.d.ts @@ -1,7 +1,2 @@ -// Types for compiled templates -declare module 'demo-app-for-ember-container-query/templates/*' { - import { TemplateFactory } from 'ember-cli-htmlbars'; - - const tmpl: TemplateFactory; - export default tmpl; -} +import '@glint/environment-ember-loose'; +import '@glint/environment-ember-template-imports'; diff --git a/tests/fixtures/ember-container-query-customizations/output/package.json b/tests/fixtures/ember-container-query-customizations/output/package.json index 3cb0cbd5..08bde303 100644 --- a/tests/fixtures/ember-container-query-customizations/output/package.json +++ b/tests/fixtures/ember-container-query-customizations/output/package.json @@ -14,7 +14,7 @@ "lint": "yarn workspaces run lint", "lint:fix": "yarn workspaces run lint:fix", "prepare": "yarn build", - "start": "concurrently 'yarn:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", + "start": "concurrently \"yarn:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow", "start:addon": "yarn workspace ember-container-query run start", "start:test-app": "yarn workspace demo-app-for-ember-container-query run start", "test": "yarn workspaces run test" diff --git a/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/package.json b/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/package.json index 06b07988..62634eb8 100644 --- a/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/package.json +++ b/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/package.json @@ -24,21 +24,17 @@ "test": "tests" }, "scripts": { - "build": "concurrently 'yarn:build:*'", - "build:js": "rollup --config", - "build:types": "glint --declaration", - "lint": "concurrently 'yarn:lint:*(!fix)' --names 'lint:'", - "lint:fix": "concurrently 'yarn:lint:*:fix' --names 'fix:'", + "build": "rollup --config", + "lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"", "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern", "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "lint:types": "glint", - "prepack": "concurrently 'yarn:build:*'", - "start": "concurrently 'yarn:start:*'", - "start:js": "rollup --config --watch --no-watch.clearScreen", - "start:types": "glint --declaration --watch", - "test": "echo 'A v2 addon does not have tests, run tests in demo-app'" + "prepack": "rollup --config", + "start": "rollup --config --watch", + "test": "echo \"A v2 addon does not have tests, run tests in demo-app\"" }, "changelog": { "labels": { @@ -60,31 +56,31 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@babel/plugin-transform-typescript": "^7.26.3", + "@babel/plugin-transform-typescript": "^7.26.5", "@babel/runtime": "^7.26.0", "@embroider/addon-dev": "^7.1.1", - "@glint/core": "^1.5.0", - "@glint/environment-ember-loose": "^1.5.0", - "@glint/environment-ember-template-imports": "^1.5.0", - "@glint/template": "^1.5.0", + "@glint/core": "^1.5.1", + "@glint/environment-ember-loose": "^1.5.1", + "@glint/environment-ember-template-imports": "^1.5.1", + "@glint/template": "^1.5.1", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^3.0.8", - "@typescript-eslint/eslint-plugin": "^8.18.2", - "@typescript-eslint/parser": "^8.18.2", + "@typescript-eslint/eslint-plugin": "^8.20.0", + "@typescript-eslint/parser": "^8.20.0", "babel-plugin-ember-template-compilation": "^2.3.0", - "concurrently": "^9.1.0", + "concurrently": "^9.1.2", "ember-source": "^6.1.0", "ember-template-lint": "^6.0.0", "eslint": "^8.57.1", - "eslint-config-prettier": "^9.1.0", + "eslint-config-prettier": "^10.0.1", "eslint-plugin-ember": "^12.3.3", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.15.1", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "prettier": "^3.4.2", - "rollup": "^4.29.1", + "rollup": "^4.30.1", "rollup-plugin-copy": "^3.5.0", - "typescript": "^5.7.2" + "typescript": "^5.7.3" }, "engines": { "node": "14.* || 16.* || >= 18" diff --git a/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/rollup.config.mjs b/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/rollup.config.mjs index e0794c07..c862dca3 100644 --- a/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/rollup.config.mjs +++ b/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/rollup.config.mjs @@ -30,6 +30,7 @@ export default { 'helpers/**/*.js', 'modifiers/**/*.js', 'services/**/*.js', + 'utils/**/*.js', ]), // Follow the V2 Addon rules about dependencies. Your code can import from @@ -54,6 +55,9 @@ export default { // Ensure that .gjs files are properly integrated as Javascript addon.gjs(), + // Emit .d.ts declaration files + addon.declarations('declarations'), + // addons are allowed to contain imports of .css files, which we want rollup // to leave alone and keep in the published output. addon.keepAssets(['**/*.css']), diff --git a/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/tsconfig.json b/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/tsconfig.json index d6c89f58..31597961 100644 --- a/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/tsconfig.json +++ b/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/tsconfig.json @@ -7,7 +7,10 @@ "emitDeclarationOnly": true, "noEmit": false, "noEmitOnError": false, - "rootDir": "./src" + "rootDir": "./src", + "types": [ + "ember-source/types" + ] }, "include": [ "src/**/*", diff --git a/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/unpublished-development-types/index.d.ts b/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/unpublished-development-types/index.d.ts index 179d359d..45276a70 100644 --- a/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/unpublished-development-types/index.d.ts +++ b/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/unpublished-development-types/index.d.ts @@ -3,7 +3,6 @@ import '@glint/environment-ember-loose'; import '@glint/environment-ember-template-imports'; -import 'ember-source/types'; // Uncomment if you need to support consuming projects in loose mode // diff --git a/tests/fixtures/ember-container-query-glint/output/ember-container-query/package.json b/tests/fixtures/ember-container-query-glint/output/ember-container-query/package.json index 0877c9a8..88ed2cc9 100644 --- a/tests/fixtures/ember-container-query-glint/output/ember-container-query/package.json +++ b/tests/fixtures/ember-container-query-glint/output/ember-container-query/package.json @@ -24,21 +24,17 @@ "test": "tests" }, "scripts": { - "build": "concurrently 'yarn:build:*'", - "build:js": "rollup --config", - "build:types": "glint --declaration", - "lint": "concurrently 'yarn:lint:*(!fix)' --names 'lint:'", - "lint:fix": "concurrently 'yarn:lint:*:fix' --names 'fix:'", + "build": "rollup --config", + "lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"", "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern", "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "lint:types": "glint", - "prepack": "concurrently 'yarn:build:*'", - "start": "concurrently 'yarn:start:*'", - "start:js": "rollup --config --watch --no-watch.clearScreen", - "start:types": "glint --declaration --watch", - "test": "echo 'A v2 addon does not have tests, run tests in test-app'" + "prepack": "rollup --config", + "start": "rollup --config --watch", + "test": "echo \"A v2 addon does not have tests, run tests in test-app\"" }, "changelog": { "labels": { @@ -60,31 +56,31 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@babel/plugin-transform-typescript": "^7.26.3", + "@babel/plugin-transform-typescript": "^7.26.5", "@babel/runtime": "^7.26.0", "@embroider/addon-dev": "^7.1.1", - "@glint/core": "^1.5.0", - "@glint/environment-ember-loose": "^1.5.0", - "@glint/environment-ember-template-imports": "^1.5.0", - "@glint/template": "^1.5.0", + "@glint/core": "^1.5.1", + "@glint/environment-ember-loose": "^1.5.1", + "@glint/environment-ember-template-imports": "^1.5.1", + "@glint/template": "^1.5.1", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^3.0.8", - "@typescript-eslint/eslint-plugin": "^8.18.2", - "@typescript-eslint/parser": "^8.18.2", + "@typescript-eslint/eslint-plugin": "^8.20.0", + "@typescript-eslint/parser": "^8.20.0", "babel-plugin-ember-template-compilation": "^2.3.0", - "concurrently": "^9.1.0", + "concurrently": "^9.1.2", "ember-source": "^6.1.0", "ember-template-lint": "^6.0.0", "eslint": "^8.57.1", - "eslint-config-prettier": "^9.1.0", + "eslint-config-prettier": "^10.0.1", "eslint-plugin-ember": "^12.3.3", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.15.1", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "prettier": "^3.4.2", - "rollup": "^4.29.1", + "rollup": "^4.30.1", "rollup-plugin-copy": "^3.5.0", - "typescript": "^5.7.2" + "typescript": "^5.7.3" }, "engines": { "node": "14.* || 16.* || >= 18" diff --git a/tests/fixtures/ember-container-query-glint/output/ember-container-query/rollup.config.mjs b/tests/fixtures/ember-container-query-glint/output/ember-container-query/rollup.config.mjs index e0794c07..c862dca3 100644 --- a/tests/fixtures/ember-container-query-glint/output/ember-container-query/rollup.config.mjs +++ b/tests/fixtures/ember-container-query-glint/output/ember-container-query/rollup.config.mjs @@ -30,6 +30,7 @@ export default { 'helpers/**/*.js', 'modifiers/**/*.js', 'services/**/*.js', + 'utils/**/*.js', ]), // Follow the V2 Addon rules about dependencies. Your code can import from @@ -54,6 +55,9 @@ export default { // Ensure that .gjs files are properly integrated as Javascript addon.gjs(), + // Emit .d.ts declaration files + addon.declarations('declarations'), + // addons are allowed to contain imports of .css files, which we want rollup // to leave alone and keep in the published output. addon.keepAssets(['**/*.css']), diff --git a/tests/fixtures/ember-container-query-glint/output/ember-container-query/tsconfig.json b/tests/fixtures/ember-container-query-glint/output/ember-container-query/tsconfig.json index d6c89f58..31597961 100644 --- a/tests/fixtures/ember-container-query-glint/output/ember-container-query/tsconfig.json +++ b/tests/fixtures/ember-container-query-glint/output/ember-container-query/tsconfig.json @@ -7,7 +7,10 @@ "emitDeclarationOnly": true, "noEmit": false, "noEmitOnError": false, - "rootDir": "./src" + "rootDir": "./src", + "types": [ + "ember-source/types" + ] }, "include": [ "src/**/*", diff --git a/tests/fixtures/ember-container-query-glint/output/ember-container-query/unpublished-development-types/index.d.ts b/tests/fixtures/ember-container-query-glint/output/ember-container-query/unpublished-development-types/index.d.ts index 179d359d..45276a70 100644 --- a/tests/fixtures/ember-container-query-glint/output/ember-container-query/unpublished-development-types/index.d.ts +++ b/tests/fixtures/ember-container-query-glint/output/ember-container-query/unpublished-development-types/index.d.ts @@ -3,7 +3,6 @@ import '@glint/environment-ember-loose'; import '@glint/environment-ember-template-imports'; -import 'ember-source/types'; // Uncomment if you need to support consuming projects in loose mode // diff --git a/tests/fixtures/ember-container-query-glint/output/package.json b/tests/fixtures/ember-container-query-glint/output/package.json index cec3db55..86c7b613 100644 --- a/tests/fixtures/ember-container-query-glint/output/package.json +++ b/tests/fixtures/ember-container-query-glint/output/package.json @@ -14,7 +14,7 @@ "lint": "yarn workspaces run lint", "lint:fix": "yarn workspaces run lint:fix", "prepare": "yarn build", - "start": "concurrently 'yarn:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", + "start": "concurrently \"yarn:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow", "start:addon": "yarn workspace ember-container-query run start", "start:test-app": "yarn workspace test-app run start", "test": "yarn workspaces run test" diff --git a/tests/fixtures/ember-container-query-glint/output/test-app/types/global.d.ts b/tests/fixtures/ember-container-query-glint/output/test-app/types/global.d.ts index 45a2e8ab..5bfd1c5a 100644 --- a/tests/fixtures/ember-container-query-glint/output/test-app/types/global.d.ts +++ b/tests/fixtures/ember-container-query-glint/output/test-app/types/global.d.ts @@ -1,7 +1,2 @@ -// Types for compiled templates -declare module 'test-app/templates/*' { - import { TemplateFactory } from 'ember-cli-htmlbars'; - - const tmpl: TemplateFactory; - export default tmpl; -} +import '@glint/environment-ember-loose'; +import '@glint/environment-ember-template-imports'; diff --git a/tests/fixtures/ember-container-query-javascript/output/ember-container-query/package.json b/tests/fixtures/ember-container-query-javascript/output/ember-container-query/package.json index 39ca7e22..9cf3c0b1 100644 --- a/tests/fixtures/ember-container-query-javascript/output/ember-container-query/package.json +++ b/tests/fixtures/ember-container-query-javascript/output/ember-container-query/package.json @@ -25,15 +25,15 @@ }, "scripts": { "build": "rollup --config", - "lint": "concurrently 'yarn:lint:*(!fix)' --names 'lint:'", - "lint:fix": "concurrently 'yarn:lint:*:fix' --names 'fix:'", + "lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"", "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern", "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "prepack": "rollup --config", "start": "rollup --config --watch", - "test": "echo 'A v2 addon does not have tests, run tests in test-app'" + "test": "echo \"A v2 addon does not have tests, run tests in test-app\"" }, "changelog": { "labels": { @@ -55,21 +55,21 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@babel/eslint-parser": "^7.25.9", + "@babel/eslint-parser": "^7.26.5", "@babel/runtime": "^7.26.0", "@embroider/addon-dev": "^7.1.1", "@rollup/plugin-babel": "^6.0.4", "babel-plugin-ember-template-compilation": "^2.3.0", - "concurrently": "^9.1.0", + "concurrently": "^9.1.2", "ember-template-lint": "^6.0.0", "eslint": "^8.57.1", - "eslint-config-prettier": "^9.1.0", + "eslint-config-prettier": "^10.0.1", "eslint-plugin-ember": "^12.3.3", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.15.1", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "prettier": "^3.4.2", - "rollup": "^4.29.1", + "rollup": "^4.30.1", "rollup-plugin-copy": "^3.5.0" }, "engines": { diff --git a/tests/fixtures/ember-container-query-javascript/output/ember-container-query/rollup.config.mjs b/tests/fixtures/ember-container-query-javascript/output/ember-container-query/rollup.config.mjs index 182d14e2..2914e184 100644 --- a/tests/fixtures/ember-container-query-javascript/output/ember-container-query/rollup.config.mjs +++ b/tests/fixtures/ember-container-query-javascript/output/ember-container-query/rollup.config.mjs @@ -30,6 +30,7 @@ export default { 'helpers/**/*.js', 'modifiers/**/*.js', 'services/**/*.js', + 'utils/**/*.js', ]), // Follow the V2 Addon rules about dependencies. Your code can import from diff --git a/tests/fixtures/ember-container-query-javascript/output/package.json b/tests/fixtures/ember-container-query-javascript/output/package.json index cec3db55..86c7b613 100644 --- a/tests/fixtures/ember-container-query-javascript/output/package.json +++ b/tests/fixtures/ember-container-query-javascript/output/package.json @@ -14,7 +14,7 @@ "lint": "yarn workspaces run lint", "lint:fix": "yarn workspaces run lint:fix", "prepare": "yarn build", - "start": "concurrently 'yarn:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", + "start": "concurrently \"yarn:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow", "start:addon": "yarn workspace ember-container-query run start", "start:test-app": "yarn workspace test-app run start", "test": "yarn workspaces run test" diff --git a/tests/fixtures/ember-container-query-scoped/output/ember-container-query/package.json b/tests/fixtures/ember-container-query-scoped/output/ember-container-query/package.json index 9d0c7240..9d6c16fd 100644 --- a/tests/fixtures/ember-container-query-scoped/output/ember-container-query/package.json +++ b/tests/fixtures/ember-container-query-scoped/output/ember-container-query/package.json @@ -24,21 +24,17 @@ "test": "tests" }, "scripts": { - "build": "concurrently 'yarn:build:*'", - "build:js": "rollup --config", - "build:types": "glint --declaration", - "lint": "concurrently 'yarn:lint:*(!fix)' --names 'lint:'", - "lint:fix": "concurrently 'yarn:lint:*:fix' --names 'fix:'", + "build": "rollup --config", + "lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"", "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern", "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "lint:types": "glint", - "prepack": "concurrently 'yarn:build:*'", - "start": "concurrently 'yarn:start:*'", - "start:js": "rollup --config --watch --no-watch.clearScreen", - "start:types": "glint --declaration --watch", - "test": "echo 'A v2 addon does not have tests, run tests in test-app'" + "prepack": "rollup --config", + "start": "rollup --config --watch", + "test": "echo \"A v2 addon does not have tests, run tests in test-app\"" }, "changelog": { "labels": { @@ -60,31 +56,31 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@babel/plugin-transform-typescript": "^7.26.3", + "@babel/plugin-transform-typescript": "^7.26.5", "@babel/runtime": "^7.26.0", "@embroider/addon-dev": "^7.1.1", - "@glint/core": "^1.5.0", - "@glint/environment-ember-loose": "^1.5.0", - "@glint/environment-ember-template-imports": "^1.5.0", - "@glint/template": "^1.5.0", + "@glint/core": "^1.5.1", + "@glint/environment-ember-loose": "^1.5.1", + "@glint/environment-ember-template-imports": "^1.5.1", + "@glint/template": "^1.5.1", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^3.0.8", - "@typescript-eslint/eslint-plugin": "^8.18.2", - "@typescript-eslint/parser": "^8.18.2", + "@typescript-eslint/eslint-plugin": "^8.20.0", + "@typescript-eslint/parser": "^8.20.0", "babel-plugin-ember-template-compilation": "^2.3.0", - "concurrently": "^9.1.0", + "concurrently": "^9.1.2", "ember-source": "^6.1.0", "ember-template-lint": "^6.0.0", "eslint": "^8.57.1", - "eslint-config-prettier": "^9.1.0", + "eslint-config-prettier": "^10.0.1", "eslint-plugin-ember": "^12.3.3", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.15.1", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "prettier": "^3.4.2", - "rollup": "^4.29.1", + "rollup": "^4.30.1", "rollup-plugin-copy": "^3.5.0", - "typescript": "^5.7.2" + "typescript": "^5.7.3" }, "engines": { "node": "14.* || 16.* || >= 18" diff --git a/tests/fixtures/ember-container-query-scoped/output/ember-container-query/rollup.config.mjs b/tests/fixtures/ember-container-query-scoped/output/ember-container-query/rollup.config.mjs index e0794c07..c862dca3 100644 --- a/tests/fixtures/ember-container-query-scoped/output/ember-container-query/rollup.config.mjs +++ b/tests/fixtures/ember-container-query-scoped/output/ember-container-query/rollup.config.mjs @@ -30,6 +30,7 @@ export default { 'helpers/**/*.js', 'modifiers/**/*.js', 'services/**/*.js', + 'utils/**/*.js', ]), // Follow the V2 Addon rules about dependencies. Your code can import from @@ -54,6 +55,9 @@ export default { // Ensure that .gjs files are properly integrated as Javascript addon.gjs(), + // Emit .d.ts declaration files + addon.declarations('declarations'), + // addons are allowed to contain imports of .css files, which we want rollup // to leave alone and keep in the published output. addon.keepAssets(['**/*.css']), diff --git a/tests/fixtures/ember-container-query-scoped/output/ember-container-query/tsconfig.json b/tests/fixtures/ember-container-query-scoped/output/ember-container-query/tsconfig.json index d6c89f58..31597961 100644 --- a/tests/fixtures/ember-container-query-scoped/output/ember-container-query/tsconfig.json +++ b/tests/fixtures/ember-container-query-scoped/output/ember-container-query/tsconfig.json @@ -7,7 +7,10 @@ "emitDeclarationOnly": true, "noEmit": false, "noEmitOnError": false, - "rootDir": "./src" + "rootDir": "./src", + "types": [ + "ember-source/types" + ] }, "include": [ "src/**/*", diff --git a/tests/fixtures/ember-container-query-scoped/output/ember-container-query/unpublished-development-types/index.d.ts b/tests/fixtures/ember-container-query-scoped/output/ember-container-query/unpublished-development-types/index.d.ts index 179d359d..45276a70 100644 --- a/tests/fixtures/ember-container-query-scoped/output/ember-container-query/unpublished-development-types/index.d.ts +++ b/tests/fixtures/ember-container-query-scoped/output/ember-container-query/unpublished-development-types/index.d.ts @@ -3,7 +3,6 @@ import '@glint/environment-ember-loose'; import '@glint/environment-ember-template-imports'; -import 'ember-source/types'; // Uncomment if you need to support consuming projects in loose mode // diff --git a/tests/fixtures/ember-container-query-scoped/output/package.json b/tests/fixtures/ember-container-query-scoped/output/package.json index e0419dc7..825feaa2 100644 --- a/tests/fixtures/ember-container-query-scoped/output/package.json +++ b/tests/fixtures/ember-container-query-scoped/output/package.json @@ -14,7 +14,7 @@ "lint": "yarn workspaces run lint", "lint:fix": "yarn workspaces run lint:fix", "prepare": "yarn build", - "start": "concurrently 'yarn:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", + "start": "concurrently \"yarn:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow", "start:addon": "yarn workspace @ijlee2/ember-container-query run start", "start:test-app": "yarn workspace test-app run start", "test": "yarn workspaces run test" diff --git a/tests/fixtures/ember-container-query-scoped/output/test-app/types/global.d.ts b/tests/fixtures/ember-container-query-scoped/output/test-app/types/global.d.ts index 45a2e8ab..5bfd1c5a 100644 --- a/tests/fixtures/ember-container-query-scoped/output/test-app/types/global.d.ts +++ b/tests/fixtures/ember-container-query-scoped/output/test-app/types/global.d.ts @@ -1,7 +1,2 @@ -// Types for compiled templates -declare module 'test-app/templates/*' { - import { TemplateFactory } from 'ember-cli-htmlbars'; - - const tmpl: TemplateFactory; - export default tmpl; -} +import '@glint/environment-ember-loose'; +import '@glint/environment-ember-template-imports'; diff --git a/tests/fixtures/ember-container-query-typescript/output/ember-container-query/package.json b/tests/fixtures/ember-container-query-typescript/output/ember-container-query/package.json index e497c891..72180ec2 100644 --- a/tests/fixtures/ember-container-query-typescript/output/ember-container-query/package.json +++ b/tests/fixtures/ember-container-query-typescript/output/ember-container-query/package.json @@ -24,21 +24,17 @@ "test": "tests" }, "scripts": { - "build": "concurrently 'yarn:build:*'", - "build:js": "rollup --config", - "build:types": "tsc", - "lint": "concurrently 'yarn:lint:*(!fix)' --names 'lint:'", - "lint:fix": "concurrently 'yarn:lint:*:fix' --names 'fix:'", + "build": "rollup --config", + "lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"", "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern", "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "lint:types": "tsc --emitDeclarationOnly false --noEmit", - "prepack": "concurrently 'yarn:build:*'", - "start": "concurrently 'yarn:start:*'", - "start:js": "rollup --config --watch --no-watch.clearScreen", - "start:types": "tsc --watch", - "test": "echo 'A v2 addon does not have tests, run tests in test-app'" + "prepack": "rollup --config", + "start": "rollup --config --watch", + "test": "echo \"A v2 addon does not have tests, run tests in test-app\"" }, "changelog": { "labels": { @@ -60,26 +56,26 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@babel/plugin-transform-typescript": "^7.26.3", + "@babel/plugin-transform-typescript": "^7.26.5", "@babel/runtime": "^7.26.0", "@embroider/addon-dev": "^7.1.1", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^3.0.8", - "@typescript-eslint/eslint-plugin": "^8.18.2", - "@typescript-eslint/parser": "^8.18.2", + "@typescript-eslint/eslint-plugin": "^8.20.0", + "@typescript-eslint/parser": "^8.20.0", "babel-plugin-ember-template-compilation": "^2.3.0", - "concurrently": "^9.1.0", + "concurrently": "^9.1.2", "ember-template-lint": "^6.0.0", "eslint": "^8.57.1", - "eslint-config-prettier": "^9.1.0", + "eslint-config-prettier": "^10.0.1", "eslint-plugin-ember": "^12.3.3", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.15.1", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "prettier": "^3.4.2", - "rollup": "^4.29.1", + "rollup": "^4.30.1", "rollup-plugin-copy": "^3.5.0", - "typescript": "^5.7.2" + "typescript": "^5.7.3" }, "engines": { "node": "14.* || 16.* || >= 18" diff --git a/tests/fixtures/ember-container-query-typescript/output/ember-container-query/rollup.config.mjs b/tests/fixtures/ember-container-query-typescript/output/ember-container-query/rollup.config.mjs index e704c415..07c6ea4d 100644 --- a/tests/fixtures/ember-container-query-typescript/output/ember-container-query/rollup.config.mjs +++ b/tests/fixtures/ember-container-query-typescript/output/ember-container-query/rollup.config.mjs @@ -30,6 +30,7 @@ export default { 'helpers/**/*.js', 'modifiers/**/*.js', 'services/**/*.js', + 'utils/**/*.js', ]), // Follow the V2 Addon rules about dependencies. Your code can import from @@ -54,6 +55,9 @@ export default { // Ensure that .gjs files are properly integrated as Javascript addon.gjs(), + // Emit .d.ts declaration files + addon.declarations('declarations'), + // addons are allowed to contain imports of .css files, which we want rollup // to leave alone and keep in the published output. addon.keepAssets(['**/*.css']), diff --git a/tests/fixtures/ember-container-query-typescript/output/ember-container-query/tsconfig.json b/tests/fixtures/ember-container-query-typescript/output/ember-container-query/tsconfig.json index 21ba7094..d9755052 100644 --- a/tests/fixtures/ember-container-query-typescript/output/ember-container-query/tsconfig.json +++ b/tests/fixtures/ember-container-query-typescript/output/ember-container-query/tsconfig.json @@ -7,7 +7,10 @@ "emitDeclarationOnly": true, "noEmit": false, "noEmitOnError": false, - "rootDir": "./src" + "rootDir": "./src", + "types": [ + "ember-source/types" + ] }, "include": [ "src/**/*", diff --git a/tests/fixtures/ember-container-query-typescript/output/package.json b/tests/fixtures/ember-container-query-typescript/output/package.json index cec3db55..86c7b613 100644 --- a/tests/fixtures/ember-container-query-typescript/output/package.json +++ b/tests/fixtures/ember-container-query-typescript/output/package.json @@ -14,7 +14,7 @@ "lint": "yarn workspaces run lint", "lint:fix": "yarn workspaces run lint:fix", "prepare": "yarn build", - "start": "concurrently 'yarn:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", + "start": "concurrently \"yarn:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow", "start:addon": "yarn workspace ember-container-query run start", "start:test-app": "yarn workspace test-app run start", "test": "yarn workspaces run test" diff --git a/tests/fixtures/ember-container-query-typescript/output/test-app/types/global.d.ts b/tests/fixtures/ember-container-query-typescript/output/test-app/types/global.d.ts index 45a2e8ab..e69de29b 100644 --- a/tests/fixtures/ember-container-query-typescript/output/test-app/types/global.d.ts +++ b/tests/fixtures/ember-container-query-typescript/output/test-app/types/global.d.ts @@ -1,7 +0,0 @@ -// Types for compiled templates -declare module 'test-app/templates/*' { - import { TemplateFactory } from 'ember-cli-htmlbars'; - - const tmpl: TemplateFactory; - export default tmpl; -} diff --git a/tests/fixtures/hello-world/output/hello-world/package.json b/tests/fixtures/hello-world/output/hello-world/package.json index 40965781..a3c32257 100644 --- a/tests/fixtures/hello-world/output/hello-world/package.json +++ b/tests/fixtures/hello-world/output/hello-world/package.json @@ -13,21 +13,17 @@ "test": "tests" }, "scripts": { - "build": "concurrently 'pnpm:build:*'", - "build:js": "rollup --config", - "build:types": "tsc", - "lint": "concurrently 'pnpm:lint:*(!fix)' --names 'lint:'", - "lint:fix": "concurrently 'pnpm:lint:*:fix' --names 'fix:'", + "build": "rollup --config", + "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"", "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern", "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "lint:types": "tsc --emitDeclarationOnly false --noEmit", - "prepack": "concurrently 'pnpm:build:*'", - "start": "concurrently 'pnpm:start:*'", - "start:js": "rollup --config --watch --no-watch.clearScreen", - "start:types": "tsc --watch", - "test": "echo 'A v2 addon does not have tests, run tests in test-app'" + "prepack": "rollup --config", + "start": "rollup --config --watch", + "test": "echo \"A v2 addon does not have tests, run tests in test-app\"" }, "dependencies": { "@embroider/addon-shim": "^1.9.0", @@ -35,26 +31,26 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@babel/plugin-transform-typescript": "^7.26.3", + "@babel/plugin-transform-typescript": "^7.26.5", "@babel/runtime": "^7.26.0", "@embroider/addon-dev": "^7.1.1", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^3.0.8", - "@typescript-eslint/eslint-plugin": "^8.18.2", - "@typescript-eslint/parser": "^8.18.2", + "@typescript-eslint/eslint-plugin": "^8.20.0", + "@typescript-eslint/parser": "^8.20.0", "babel-plugin-ember-template-compilation": "^2.3.0", - "concurrently": "^9.1.0", + "concurrently": "^9.1.2", "ember-template-lint": "^6.0.0", "eslint": "^8.57.1", - "eslint-config-prettier": "^9.1.0", + "eslint-config-prettier": "^10.0.1", "eslint-plugin-ember": "^12.3.3", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.15.1", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "prettier": "^3.4.2", - "rollup": "^4.29.1", + "rollup": "^4.30.1", "rollup-plugin-copy": "^3.5.0", - "typescript": "^5.7.2" + "typescript": "^5.7.3" }, "peerDependencies": { "ember-source": "^3.28.0 || ^4.0.0" diff --git a/tests/fixtures/hello-world/output/hello-world/rollup.config.mjs b/tests/fixtures/hello-world/output/hello-world/rollup.config.mjs index e704c415..07c6ea4d 100644 --- a/tests/fixtures/hello-world/output/hello-world/rollup.config.mjs +++ b/tests/fixtures/hello-world/output/hello-world/rollup.config.mjs @@ -30,6 +30,7 @@ export default { 'helpers/**/*.js', 'modifiers/**/*.js', 'services/**/*.js', + 'utils/**/*.js', ]), // Follow the V2 Addon rules about dependencies. Your code can import from @@ -54,6 +55,9 @@ export default { // Ensure that .gjs files are properly integrated as Javascript addon.gjs(), + // Emit .d.ts declaration files + addon.declarations('declarations'), + // addons are allowed to contain imports of .css files, which we want rollup // to leave alone and keep in the published output. addon.keepAssets(['**/*.css']), diff --git a/tests/fixtures/hello-world/output/hello-world/tsconfig.json b/tests/fixtures/hello-world/output/hello-world/tsconfig.json index 21ba7094..d9755052 100644 --- a/tests/fixtures/hello-world/output/hello-world/tsconfig.json +++ b/tests/fixtures/hello-world/output/hello-world/tsconfig.json @@ -7,7 +7,10 @@ "emitDeclarationOnly": true, "noEmit": false, "noEmitOnError": false, - "rootDir": "./src" + "rootDir": "./src", + "types": [ + "ember-source/types" + ] }, "include": [ "src/**/*", diff --git a/tests/fixtures/hello-world/output/package.json b/tests/fixtures/hello-world/output/package.json index bc3b7310..1e8522b4 100644 --- a/tests/fixtures/hello-world/output/package.json +++ b/tests/fixtures/hello-world/output/package.json @@ -7,13 +7,13 @@ "author": "", "scripts": { "build": "pnpm --filter hello-world build", - "lint": "pnpm --filter '*' lint", - "lint:fix": "pnpm --filter '*' lint:fix", + "lint": "pnpm --filter \"*\" lint", + "lint:fix": "pnpm --filter \"*\" lint:fix", "prepare": "pnpm build", - "start": "concurrently 'pnpm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", + "start": "concurrently \"pnpm:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow", "start:addon": "pnpm --filter hello-world start", "start:test-app": "pnpm --filter test-app start", - "test": "pnpm --filter '*' test" + "test": "pnpm --filter \"*\" test" }, "devDependencies": { "concurrently": "^7.6.0" diff --git a/tests/fixtures/hello-world/output/test-app/types/global.d.ts b/tests/fixtures/hello-world/output/test-app/types/global.d.ts index 45a2e8ab..e69de29b 100644 --- a/tests/fixtures/hello-world/output/test-app/types/global.d.ts +++ b/tests/fixtures/hello-world/output/test-app/types/global.d.ts @@ -1,7 +0,0 @@ -// Types for compiled templates -declare module 'test-app/templates/*' { - import { TemplateFactory } from 'ember-cli-htmlbars'; - - const tmpl: TemplateFactory; - export default tmpl; -} diff --git a/tests/fixtures/new-v1-addon-customizations/output/demo-app/types/global.d.ts b/tests/fixtures/new-v1-addon-customizations/output/demo-app/types/global.d.ts index e2e9bff2..e69de29b 100644 --- a/tests/fixtures/new-v1-addon-customizations/output/demo-app/types/global.d.ts +++ b/tests/fixtures/new-v1-addon-customizations/output/demo-app/types/global.d.ts @@ -1,7 +0,0 @@ -// Types for compiled templates -declare module 'demo-app-for-new-v1-addon/templates/*' { - import { TemplateFactory } from 'ember-cli-htmlbars'; - - const tmpl: TemplateFactory; - export default tmpl; -} diff --git a/tests/fixtures/new-v1-addon-customizations/output/package.json b/tests/fixtures/new-v1-addon-customizations/output/package.json index c0721a5f..2e15701d 100644 --- a/tests/fixtures/new-v1-addon-customizations/output/package.json +++ b/tests/fixtures/new-v1-addon-customizations/output/package.json @@ -14,7 +14,7 @@ "lint": "yarn workspaces run lint", "lint:fix": "yarn workspaces run lint:fix", "prepare": "yarn build", - "start": "concurrently 'yarn:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", + "start": "concurrently \"yarn:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow", "start:addon": "yarn workspace new-v1-addon run start", "start:test-app": "yarn workspace demo-app-for-new-v1-addon run start", "test": "yarn workspaces run test" diff --git a/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/package.json b/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/package.json index a50de411..07fa2322 100644 --- a/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/package.json +++ b/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/package.json @@ -13,21 +13,17 @@ "test": "tests" }, "scripts": { - "build": "concurrently 'yarn:build:*'", - "build:js": "rollup --config", - "build:types": "tsc", - "lint": "concurrently 'yarn:lint:*(!fix)' --names 'lint:'", - "lint:fix": "concurrently 'yarn:lint:*:fix' --names 'fix:'", + "build": "rollup --config", + "lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"", "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern", "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "lint:types": "tsc --emitDeclarationOnly false --noEmit", - "prepack": "concurrently 'yarn:build:*'", - "start": "concurrently 'yarn:start:*'", - "start:js": "rollup --config --watch --no-watch.clearScreen", - "start:types": "tsc --watch", - "test": "echo 'A v2 addon does not have tests, run tests in demo-app'" + "prepack": "rollup --config", + "start": "rollup --config --watch", + "test": "echo \"A v2 addon does not have tests, run tests in demo-app\"" }, "dependencies": { "@embroider/addon-shim": "^1.9.0", @@ -35,26 +31,26 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@babel/plugin-transform-typescript": "^7.26.3", + "@babel/plugin-transform-typescript": "^7.26.5", "@babel/runtime": "^7.26.0", "@embroider/addon-dev": "^7.1.1", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^3.0.8", - "@typescript-eslint/eslint-plugin": "^8.18.2", - "@typescript-eslint/parser": "^8.18.2", + "@typescript-eslint/eslint-plugin": "^8.20.0", + "@typescript-eslint/parser": "^8.20.0", "babel-plugin-ember-template-compilation": "^2.3.0", - "concurrently": "^9.1.0", + "concurrently": "^9.1.2", "ember-template-lint": "^6.0.0", "eslint": "^8.57.1", - "eslint-config-prettier": "^9.1.0", + "eslint-config-prettier": "^10.0.1", "eslint-plugin-ember": "^12.3.3", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.15.1", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "prettier": "^3.4.2", - "rollup": "^4.29.1", + "rollup": "^4.30.1", "rollup-plugin-copy": "^3.5.0", - "typescript": "^5.7.2" + "typescript": "^5.7.3" }, "peerDependencies": { "ember-source": "^3.28.0 || ^4.0.0" diff --git a/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/rollup.config.mjs b/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/rollup.config.mjs index e704c415..07c6ea4d 100644 --- a/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/rollup.config.mjs +++ b/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/rollup.config.mjs @@ -30,6 +30,7 @@ export default { 'helpers/**/*.js', 'modifiers/**/*.js', 'services/**/*.js', + 'utils/**/*.js', ]), // Follow the V2 Addon rules about dependencies. Your code can import from @@ -54,6 +55,9 @@ export default { // Ensure that .gjs files are properly integrated as Javascript addon.gjs(), + // Emit .d.ts declaration files + addon.declarations('declarations'), + // addons are allowed to contain imports of .css files, which we want rollup // to leave alone and keep in the published output. addon.keepAssets(['**/*.css']), diff --git a/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/tsconfig.json b/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/tsconfig.json index 21ba7094..d9755052 100644 --- a/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/tsconfig.json +++ b/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/tsconfig.json @@ -7,7 +7,10 @@ "emitDeclarationOnly": true, "noEmit": false, "noEmitOnError": false, - "rootDir": "./src" + "rootDir": "./src", + "types": [ + "ember-source/types" + ] }, "include": [ "src/**/*", diff --git a/tests/fixtures/new-v1-addon-javascript/output/new-v1-addon/package.json b/tests/fixtures/new-v1-addon-javascript/output/new-v1-addon/package.json index b0ba449b..def94c03 100644 --- a/tests/fixtures/new-v1-addon-javascript/output/new-v1-addon/package.json +++ b/tests/fixtures/new-v1-addon-javascript/output/new-v1-addon/package.json @@ -14,15 +14,15 @@ }, "scripts": { "build": "rollup --config", - "lint": "concurrently 'yarn:lint:*(!fix)' --names 'lint:'", - "lint:fix": "concurrently 'yarn:lint:*:fix' --names 'fix:'", + "lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"", "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern", "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "prepack": "rollup --config", "start": "rollup --config --watch", - "test": "echo 'A v2 addon does not have tests, run tests in test-app'" + "test": "echo \"A v2 addon does not have tests, run tests in test-app\"" }, "dependencies": { "@embroider/addon-shim": "^1.9.0", @@ -30,21 +30,21 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@babel/eslint-parser": "^7.25.9", + "@babel/eslint-parser": "^7.26.5", "@babel/runtime": "^7.26.0", "@embroider/addon-dev": "^7.1.1", "@rollup/plugin-babel": "^6.0.4", "babel-plugin-ember-template-compilation": "^2.3.0", - "concurrently": "^9.1.0", + "concurrently": "^9.1.2", "ember-template-lint": "^6.0.0", "eslint": "^8.57.1", - "eslint-config-prettier": "^9.1.0", + "eslint-config-prettier": "^10.0.1", "eslint-plugin-ember": "^12.3.3", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.15.1", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "prettier": "^3.4.2", - "rollup": "^4.29.1", + "rollup": "^4.30.1", "rollup-plugin-copy": "^3.5.0" }, "peerDependencies": { diff --git a/tests/fixtures/new-v1-addon-javascript/output/new-v1-addon/rollup.config.mjs b/tests/fixtures/new-v1-addon-javascript/output/new-v1-addon/rollup.config.mjs index 182d14e2..2914e184 100644 --- a/tests/fixtures/new-v1-addon-javascript/output/new-v1-addon/rollup.config.mjs +++ b/tests/fixtures/new-v1-addon-javascript/output/new-v1-addon/rollup.config.mjs @@ -30,6 +30,7 @@ export default { 'helpers/**/*.js', 'modifiers/**/*.js', 'services/**/*.js', + 'utils/**/*.js', ]), // Follow the V2 Addon rules about dependencies. Your code can import from diff --git a/tests/fixtures/new-v1-addon-javascript/output/package.json b/tests/fixtures/new-v1-addon-javascript/output/package.json index d5b3b19a..7da89531 100644 --- a/tests/fixtures/new-v1-addon-javascript/output/package.json +++ b/tests/fixtures/new-v1-addon-javascript/output/package.json @@ -14,7 +14,7 @@ "lint": "yarn workspaces run lint", "lint:fix": "yarn workspaces run lint:fix", "prepare": "yarn build", - "start": "concurrently 'yarn:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", + "start": "concurrently \"yarn:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow", "start:addon": "yarn workspace new-v1-addon run start", "start:test-app": "yarn workspace test-app run start", "test": "yarn workspaces run test" diff --git a/tests/fixtures/new-v1-addon-npm/output/new-v1-addon/package.json b/tests/fixtures/new-v1-addon-npm/output/new-v1-addon/package.json index f2c53298..63cf4856 100644 --- a/tests/fixtures/new-v1-addon-npm/output/new-v1-addon/package.json +++ b/tests/fixtures/new-v1-addon-npm/output/new-v1-addon/package.json @@ -14,15 +14,15 @@ }, "scripts": { "build": "rollup --config", - "lint": "concurrently 'npm:lint:*(!fix)' --names 'lint:'", - "lint:fix": "concurrently 'npm:lint:*:fix' --names 'fix:'", + "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern", "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "prepack": "rollup --config", "start": "rollup --config --watch", - "test": "echo 'A v2 addon does not have tests, run tests in test-app'" + "test": "echo \"A v2 addon does not have tests, run tests in test-app\"" }, "dependencies": { "@embroider/addon-shim": "^1.9.0", @@ -30,21 +30,21 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@babel/eslint-parser": "^7.25.9", + "@babel/eslint-parser": "^7.26.5", "@babel/runtime": "^7.26.0", "@embroider/addon-dev": "^7.1.1", "@rollup/plugin-babel": "^6.0.4", "babel-plugin-ember-template-compilation": "^2.3.0", - "concurrently": "^9.1.0", + "concurrently": "^9.1.2", "ember-template-lint": "^6.0.0", "eslint": "^8.57.1", - "eslint-config-prettier": "^9.1.0", + "eslint-config-prettier": "^10.0.1", "eslint-plugin-ember": "^12.3.3", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.15.1", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "prettier": "^3.4.2", - "rollup": "^4.29.1", + "rollup": "^4.30.1", "rollup-plugin-copy": "^3.5.0" }, "peerDependencies": { diff --git a/tests/fixtures/new-v1-addon-npm/output/new-v1-addon/rollup.config.mjs b/tests/fixtures/new-v1-addon-npm/output/new-v1-addon/rollup.config.mjs index 182d14e2..2914e184 100644 --- a/tests/fixtures/new-v1-addon-npm/output/new-v1-addon/rollup.config.mjs +++ b/tests/fixtures/new-v1-addon-npm/output/new-v1-addon/rollup.config.mjs @@ -30,6 +30,7 @@ export default { 'helpers/**/*.js', 'modifiers/**/*.js', 'services/**/*.js', + 'utils/**/*.js', ]), // Follow the V2 Addon rules about dependencies. Your code can import from diff --git a/tests/fixtures/new-v1-addon-npm/output/package.json b/tests/fixtures/new-v1-addon-npm/output/package.json index dd22ad4d..e761d3e4 100644 --- a/tests/fixtures/new-v1-addon-npm/output/package.json +++ b/tests/fixtures/new-v1-addon-npm/output/package.json @@ -14,7 +14,7 @@ "lint": "npm run lint --workspaces --if-present", "lint:fix": "npm run lint:fix --workspaces --if-present", "prepare": "npm run build", - "start": "concurrently 'npm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", + "start": "concurrently \"npm:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow", "start:addon": "npm start --workspace new-v1-addon", "start:test-app": "npm start --workspace test-app", "test": "npm run test --workspaces --if-present" diff --git a/tests/fixtures/new-v1-addon-pnpm/output/new-v1-addon/package.json b/tests/fixtures/new-v1-addon-pnpm/output/new-v1-addon/package.json index 8e005d53..2480a10c 100644 --- a/tests/fixtures/new-v1-addon-pnpm/output/new-v1-addon/package.json +++ b/tests/fixtures/new-v1-addon-pnpm/output/new-v1-addon/package.json @@ -14,15 +14,15 @@ }, "scripts": { "build": "rollup --config", - "lint": "concurrently 'pnpm:lint:*(!fix)' --names 'lint:'", - "lint:fix": "concurrently 'pnpm:lint:*:fix' --names 'fix:'", + "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"", "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern", "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "prepack": "rollup --config", "start": "rollup --config --watch", - "test": "echo 'A v2 addon does not have tests, run tests in test-app'" + "test": "echo \"A v2 addon does not have tests, run tests in test-app\"" }, "dependencies": { "@embroider/addon-shim": "^1.9.0", @@ -30,21 +30,21 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@babel/eslint-parser": "^7.25.9", + "@babel/eslint-parser": "^7.26.5", "@babel/runtime": "^7.26.0", "@embroider/addon-dev": "^7.1.1", "@rollup/plugin-babel": "^6.0.4", "babel-plugin-ember-template-compilation": "^2.3.0", - "concurrently": "^9.1.0", + "concurrently": "^9.1.2", "ember-template-lint": "^6.0.0", "eslint": "^8.57.1", - "eslint-config-prettier": "^9.1.0", + "eslint-config-prettier": "^10.0.1", "eslint-plugin-ember": "^12.3.3", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.15.1", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "prettier": "^3.4.2", - "rollup": "^4.29.1", + "rollup": "^4.30.1", "rollup-plugin-copy": "^3.5.0" }, "peerDependencies": { diff --git a/tests/fixtures/new-v1-addon-pnpm/output/new-v1-addon/rollup.config.mjs b/tests/fixtures/new-v1-addon-pnpm/output/new-v1-addon/rollup.config.mjs index 182d14e2..2914e184 100644 --- a/tests/fixtures/new-v1-addon-pnpm/output/new-v1-addon/rollup.config.mjs +++ b/tests/fixtures/new-v1-addon-pnpm/output/new-v1-addon/rollup.config.mjs @@ -30,6 +30,7 @@ export default { 'helpers/**/*.js', 'modifiers/**/*.js', 'services/**/*.js', + 'utils/**/*.js', ]), // Follow the V2 Addon rules about dependencies. Your code can import from diff --git a/tests/fixtures/new-v1-addon-pnpm/output/package.json b/tests/fixtures/new-v1-addon-pnpm/output/package.json index bbdabb62..ffd89944 100644 --- a/tests/fixtures/new-v1-addon-pnpm/output/package.json +++ b/tests/fixtures/new-v1-addon-pnpm/output/package.json @@ -7,13 +7,13 @@ "author": "", "scripts": { "build": "pnpm --filter new-v1-addon build", - "lint": "pnpm --filter '*' lint", - "lint:fix": "pnpm --filter '*' lint:fix", + "lint": "pnpm --filter \"*\" lint", + "lint:fix": "pnpm --filter \"*\" lint:fix", "prepare": "pnpm build", - "start": "concurrently 'pnpm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", + "start": "concurrently \"pnpm:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow", "start:addon": "pnpm --filter new-v1-addon start", "start:test-app": "pnpm --filter test-app start", - "test": "pnpm --filter '*' test" + "test": "pnpm --filter \"*\" test" }, "devDependencies": { "concurrently": "^7.6.0" diff --git a/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/package.json b/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/package.json index 5900596a..3017bb66 100644 --- a/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/package.json +++ b/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/package.json @@ -13,21 +13,17 @@ "test": "tests" }, "scripts": { - "build": "concurrently 'yarn:build:*'", - "build:js": "rollup --config", - "build:types": "tsc", - "lint": "concurrently 'yarn:lint:*(!fix)' --names 'lint:'", - "lint:fix": "concurrently 'yarn:lint:*:fix' --names 'fix:'", + "build": "rollup --config", + "lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"", "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern", "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "lint:types": "tsc --emitDeclarationOnly false --noEmit", - "prepack": "concurrently 'yarn:build:*'", - "start": "concurrently 'yarn:start:*'", - "start:js": "rollup --config --watch --no-watch.clearScreen", - "start:types": "tsc --watch", - "test": "echo 'A v2 addon does not have tests, run tests in test-app'" + "prepack": "rollup --config", + "start": "rollup --config --watch", + "test": "echo \"A v2 addon does not have tests, run tests in test-app\"" }, "dependencies": { "@embroider/addon-shim": "^1.9.0", @@ -35,26 +31,26 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@babel/plugin-transform-typescript": "^7.26.3", + "@babel/plugin-transform-typescript": "^7.26.5", "@babel/runtime": "^7.26.0", "@embroider/addon-dev": "^7.1.1", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^3.0.8", - "@typescript-eslint/eslint-plugin": "^8.18.2", - "@typescript-eslint/parser": "^8.18.2", + "@typescript-eslint/eslint-plugin": "^8.20.0", + "@typescript-eslint/parser": "^8.20.0", "babel-plugin-ember-template-compilation": "^2.3.0", - "concurrently": "^9.1.0", + "concurrently": "^9.1.2", "ember-template-lint": "^6.0.0", "eslint": "^8.57.1", - "eslint-config-prettier": "^9.1.0", + "eslint-config-prettier": "^10.0.1", "eslint-plugin-ember": "^12.3.3", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.15.1", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "prettier": "^3.4.2", - "rollup": "^4.29.1", + "rollup": "^4.30.1", "rollup-plugin-copy": "^3.5.0", - "typescript": "^5.7.2" + "typescript": "^5.7.3" }, "peerDependencies": { "ember-source": "^3.28.0 || ^4.0.0" diff --git a/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/rollup.config.mjs b/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/rollup.config.mjs index e704c415..07c6ea4d 100644 --- a/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/rollup.config.mjs +++ b/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/rollup.config.mjs @@ -30,6 +30,7 @@ export default { 'helpers/**/*.js', 'modifiers/**/*.js', 'services/**/*.js', + 'utils/**/*.js', ]), // Follow the V2 Addon rules about dependencies. Your code can import from @@ -54,6 +55,9 @@ export default { // Ensure that .gjs files are properly integrated as Javascript addon.gjs(), + // Emit .d.ts declaration files + addon.declarations('declarations'), + // addons are allowed to contain imports of .css files, which we want rollup // to leave alone and keep in the published output. addon.keepAssets(['**/*.css']), diff --git a/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/tsconfig.json b/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/tsconfig.json index 21ba7094..d9755052 100644 --- a/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/tsconfig.json +++ b/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/tsconfig.json @@ -7,7 +7,10 @@ "emitDeclarationOnly": true, "noEmit": false, "noEmitOnError": false, - "rootDir": "./src" + "rootDir": "./src", + "types": [ + "ember-source/types" + ] }, "include": [ "src/**/*", diff --git a/tests/fixtures/new-v1-addon-typescript/output/package.json b/tests/fixtures/new-v1-addon-typescript/output/package.json index d5b3b19a..7da89531 100644 --- a/tests/fixtures/new-v1-addon-typescript/output/package.json +++ b/tests/fixtures/new-v1-addon-typescript/output/package.json @@ -14,7 +14,7 @@ "lint": "yarn workspaces run lint", "lint:fix": "yarn workspaces run lint:fix", "prepare": "yarn build", - "start": "concurrently 'yarn:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", + "start": "concurrently \"yarn:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow", "start:addon": "yarn workspace new-v1-addon run start", "start:test-app": "yarn workspace test-app run start", "test": "yarn workspaces run test" diff --git a/tests/fixtures/new-v1-addon-typescript/output/test-app/types/global.d.ts b/tests/fixtures/new-v1-addon-typescript/output/test-app/types/global.d.ts index 45a2e8ab..e69de29b 100644 --- a/tests/fixtures/new-v1-addon-typescript/output/test-app/types/global.d.ts +++ b/tests/fixtures/new-v1-addon-typescript/output/test-app/types/global.d.ts @@ -1,7 +0,0 @@ -// Types for compiled templates -declare module 'test-app/templates/*' { - import { TemplateFactory } from 'ember-cli-htmlbars'; - - const tmpl: TemplateFactory; - export default tmpl; -} diff --git a/tests/fixtures/steps/create-files-from-blueprints/customizations/output/demo-app/types/global.d.ts b/tests/fixtures/steps/create-files-from-blueprints/customizations/output/demo-app/types/global.d.ts index b702c4f0..5bfd1c5a 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/customizations/output/demo-app/types/global.d.ts +++ b/tests/fixtures/steps/create-files-from-blueprints/customizations/output/demo-app/types/global.d.ts @@ -1,7 +1,2 @@ -// Types for compiled templates -declare module 'demo-app-for-ember-container-query/templates/*' { - import { TemplateFactory } from 'ember-cli-htmlbars'; - - const tmpl: TemplateFactory; - export default tmpl; -} +import '@glint/environment-ember-loose'; +import '@glint/environment-ember-template-imports'; diff --git a/tests/fixtures/steps/create-files-from-blueprints/customizations/output/package.json b/tests/fixtures/steps/create-files-from-blueprints/customizations/output/package.json index 3cb0cbd5..08bde303 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/customizations/output/package.json +++ b/tests/fixtures/steps/create-files-from-blueprints/customizations/output/package.json @@ -14,7 +14,7 @@ "lint": "yarn workspaces run lint", "lint:fix": "yarn workspaces run lint:fix", "prepare": "yarn build", - "start": "concurrently 'yarn:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", + "start": "concurrently \"yarn:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow", "start:addon": "yarn workspace ember-container-query run start", "start:test-app": "yarn workspace demo-app-for-ember-container-query run start", "test": "yarn workspaces run test" diff --git a/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/rollup.config.mjs b/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/rollup.config.mjs index e0794c07..c862dca3 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/rollup.config.mjs +++ b/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/rollup.config.mjs @@ -30,6 +30,7 @@ export default { 'helpers/**/*.js', 'modifiers/**/*.js', 'services/**/*.js', + 'utils/**/*.js', ]), // Follow the V2 Addon rules about dependencies. Your code can import from @@ -54,6 +55,9 @@ export default { // Ensure that .gjs files are properly integrated as Javascript addon.gjs(), + // Emit .d.ts declaration files + addon.declarations('declarations'), + // addons are allowed to contain imports of .css files, which we want rollup // to leave alone and keep in the published output. addon.keepAssets(['**/*.css']), diff --git a/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/tsconfig.json b/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/tsconfig.json index d6c89f58..31597961 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/tsconfig.json +++ b/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/tsconfig.json @@ -7,7 +7,10 @@ "emitDeclarationOnly": true, "noEmit": false, "noEmitOnError": false, - "rootDir": "./src" + "rootDir": "./src", + "types": [ + "ember-source/types" + ] }, "include": [ "src/**/*", diff --git a/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/unpublished-development-types/index.d.ts b/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/unpublished-development-types/index.d.ts index 179d359d..45276a70 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/unpublished-development-types/index.d.ts +++ b/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/unpublished-development-types/index.d.ts @@ -3,7 +3,6 @@ import '@glint/environment-ember-loose'; import '@glint/environment-ember-template-imports'; -import 'ember-source/types'; // Uncomment if you need to support consuming projects in loose mode // diff --git a/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/rollup.config.mjs b/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/rollup.config.mjs index e0794c07..c862dca3 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/rollup.config.mjs +++ b/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/rollup.config.mjs @@ -30,6 +30,7 @@ export default { 'helpers/**/*.js', 'modifiers/**/*.js', 'services/**/*.js', + 'utils/**/*.js', ]), // Follow the V2 Addon rules about dependencies. Your code can import from @@ -54,6 +55,9 @@ export default { // Ensure that .gjs files are properly integrated as Javascript addon.gjs(), + // Emit .d.ts declaration files + addon.declarations('declarations'), + // addons are allowed to contain imports of .css files, which we want rollup // to leave alone and keep in the published output. addon.keepAssets(['**/*.css']), diff --git a/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/tsconfig.json b/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/tsconfig.json index d6c89f58..31597961 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/tsconfig.json +++ b/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/tsconfig.json @@ -7,7 +7,10 @@ "emitDeclarationOnly": true, "noEmit": false, "noEmitOnError": false, - "rootDir": "./src" + "rootDir": "./src", + "types": [ + "ember-source/types" + ] }, "include": [ "src/**/*", diff --git a/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/unpublished-development-types/index.d.ts b/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/unpublished-development-types/index.d.ts index 179d359d..45276a70 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/unpublished-development-types/index.d.ts +++ b/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/unpublished-development-types/index.d.ts @@ -3,7 +3,6 @@ import '@glint/environment-ember-loose'; import '@glint/environment-ember-template-imports'; -import 'ember-source/types'; // Uncomment if you need to support consuming projects in loose mode // diff --git a/tests/fixtures/steps/create-files-from-blueprints/glint/output/package.json b/tests/fixtures/steps/create-files-from-blueprints/glint/output/package.json index cec3db55..86c7b613 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/glint/output/package.json +++ b/tests/fixtures/steps/create-files-from-blueprints/glint/output/package.json @@ -14,7 +14,7 @@ "lint": "yarn workspaces run lint", "lint:fix": "yarn workspaces run lint:fix", "prepare": "yarn build", - "start": "concurrently 'yarn:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", + "start": "concurrently \"yarn:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow", "start:addon": "yarn workspace ember-container-query run start", "start:test-app": "yarn workspace test-app run start", "test": "yarn workspaces run test" diff --git a/tests/fixtures/steps/create-files-from-blueprints/glint/output/test-app/types/global.d.ts b/tests/fixtures/steps/create-files-from-blueprints/glint/output/test-app/types/global.d.ts index 45a2e8ab..5bfd1c5a 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/glint/output/test-app/types/global.d.ts +++ b/tests/fixtures/steps/create-files-from-blueprints/glint/output/test-app/types/global.d.ts @@ -1,7 +1,2 @@ -// Types for compiled templates -declare module 'test-app/templates/*' { - import { TemplateFactory } from 'ember-cli-htmlbars'; - - const tmpl: TemplateFactory; - export default tmpl; -} +import '@glint/environment-ember-loose'; +import '@glint/environment-ember-template-imports'; diff --git a/tests/fixtures/steps/create-files-from-blueprints/javascript/output/ember-container-query/rollup.config.mjs b/tests/fixtures/steps/create-files-from-blueprints/javascript/output/ember-container-query/rollup.config.mjs index 182d14e2..2914e184 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/javascript/output/ember-container-query/rollup.config.mjs +++ b/tests/fixtures/steps/create-files-from-blueprints/javascript/output/ember-container-query/rollup.config.mjs @@ -30,6 +30,7 @@ export default { 'helpers/**/*.js', 'modifiers/**/*.js', 'services/**/*.js', + 'utils/**/*.js', ]), // Follow the V2 Addon rules about dependencies. Your code can import from diff --git a/tests/fixtures/steps/create-files-from-blueprints/javascript/output/package.json b/tests/fixtures/steps/create-files-from-blueprints/javascript/output/package.json index cec3db55..86c7b613 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/javascript/output/package.json +++ b/tests/fixtures/steps/create-files-from-blueprints/javascript/output/package.json @@ -14,7 +14,7 @@ "lint": "yarn workspaces run lint", "lint:fix": "yarn workspaces run lint:fix", "prepare": "yarn build", - "start": "concurrently 'yarn:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", + "start": "concurrently \"yarn:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow", "start:addon": "yarn workspace ember-container-query run start", "start:test-app": "yarn workspace test-app run start", "test": "yarn workspaces run test" diff --git a/tests/fixtures/steps/create-files-from-blueprints/npm/output/ember-container-query/rollup.config.mjs b/tests/fixtures/steps/create-files-from-blueprints/npm/output/ember-container-query/rollup.config.mjs index e704c415..07c6ea4d 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/npm/output/ember-container-query/rollup.config.mjs +++ b/tests/fixtures/steps/create-files-from-blueprints/npm/output/ember-container-query/rollup.config.mjs @@ -30,6 +30,7 @@ export default { 'helpers/**/*.js', 'modifiers/**/*.js', 'services/**/*.js', + 'utils/**/*.js', ]), // Follow the V2 Addon rules about dependencies. Your code can import from @@ -54,6 +55,9 @@ export default { // Ensure that .gjs files are properly integrated as Javascript addon.gjs(), + // Emit .d.ts declaration files + addon.declarations('declarations'), + // addons are allowed to contain imports of .css files, which we want rollup // to leave alone and keep in the published output. addon.keepAssets(['**/*.css']), diff --git a/tests/fixtures/steps/create-files-from-blueprints/npm/output/ember-container-query/tsconfig.json b/tests/fixtures/steps/create-files-from-blueprints/npm/output/ember-container-query/tsconfig.json index 21ba7094..d9755052 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/npm/output/ember-container-query/tsconfig.json +++ b/tests/fixtures/steps/create-files-from-blueprints/npm/output/ember-container-query/tsconfig.json @@ -7,7 +7,10 @@ "emitDeclarationOnly": true, "noEmit": false, "noEmitOnError": false, - "rootDir": "./src" + "rootDir": "./src", + "types": [ + "ember-source/types" + ] }, "include": [ "src/**/*", diff --git a/tests/fixtures/steps/create-files-from-blueprints/npm/output/package.json b/tests/fixtures/steps/create-files-from-blueprints/npm/output/package.json index 3d475a1e..24c6502f 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/npm/output/package.json +++ b/tests/fixtures/steps/create-files-from-blueprints/npm/output/package.json @@ -14,7 +14,7 @@ "lint": "npm run lint --workspaces --if-present", "lint:fix": "npm run lint:fix --workspaces --if-present", "prepare": "npm run build", - "start": "concurrently 'npm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", + "start": "concurrently \"npm:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow", "start:addon": "npm start --workspace ember-container-query", "start:test-app": "npm start --workspace test-app", "test": "npm run test --workspaces --if-present" diff --git a/tests/fixtures/steps/create-files-from-blueprints/npm/output/test-app/types/global.d.ts b/tests/fixtures/steps/create-files-from-blueprints/npm/output/test-app/types/global.d.ts index 45a2e8ab..e69de29b 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/npm/output/test-app/types/global.d.ts +++ b/tests/fixtures/steps/create-files-from-blueprints/npm/output/test-app/types/global.d.ts @@ -1,7 +0,0 @@ -// Types for compiled templates -declare module 'test-app/templates/*' { - import { TemplateFactory } from 'ember-cli-htmlbars'; - - const tmpl: TemplateFactory; - export default tmpl; -} diff --git a/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/ember-container-query/rollup.config.mjs b/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/ember-container-query/rollup.config.mjs index e704c415..07c6ea4d 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/ember-container-query/rollup.config.mjs +++ b/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/ember-container-query/rollup.config.mjs @@ -30,6 +30,7 @@ export default { 'helpers/**/*.js', 'modifiers/**/*.js', 'services/**/*.js', + 'utils/**/*.js', ]), // Follow the V2 Addon rules about dependencies. Your code can import from @@ -54,6 +55,9 @@ export default { // Ensure that .gjs files are properly integrated as Javascript addon.gjs(), + // Emit .d.ts declaration files + addon.declarations('declarations'), + // addons are allowed to contain imports of .css files, which we want rollup // to leave alone and keep in the published output. addon.keepAssets(['**/*.css']), diff --git a/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/ember-container-query/tsconfig.json b/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/ember-container-query/tsconfig.json index 21ba7094..d9755052 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/ember-container-query/tsconfig.json +++ b/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/ember-container-query/tsconfig.json @@ -7,7 +7,10 @@ "emitDeclarationOnly": true, "noEmit": false, "noEmitOnError": false, - "rootDir": "./src" + "rootDir": "./src", + "types": [ + "ember-source/types" + ] }, "include": [ "src/**/*", diff --git a/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/package.json b/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/package.json index 65cf1993..7a689bca 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/package.json +++ b/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/package.json @@ -7,13 +7,13 @@ "author": "", "scripts": { "build": "pnpm --filter ember-container-query build", - "lint": "pnpm --filter '*' lint", - "lint:fix": "pnpm --filter '*' lint:fix", + "lint": "pnpm --filter \"*\" lint", + "lint:fix": "pnpm --filter \"*\" lint:fix", "prepare": "pnpm build", - "start": "concurrently 'pnpm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", + "start": "concurrently \"pnpm:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow", "start:addon": "pnpm --filter ember-container-query start", "start:test-app": "pnpm --filter test-app start", - "test": "pnpm --filter '*' test" + "test": "pnpm --filter \"*\" test" }, "devDependencies": { "concurrently": "^7.6.0" diff --git a/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/test-app/types/global.d.ts b/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/test-app/types/global.d.ts index 45a2e8ab..e69de29b 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/test-app/types/global.d.ts +++ b/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/test-app/types/global.d.ts @@ -1,7 +0,0 @@ -// Types for compiled templates -declare module 'test-app/templates/*' { - import { TemplateFactory } from 'ember-cli-htmlbars'; - - const tmpl: TemplateFactory; - export default tmpl; -} diff --git a/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/rollup.config.mjs b/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/rollup.config.mjs index e0794c07..c862dca3 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/rollup.config.mjs +++ b/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/rollup.config.mjs @@ -30,6 +30,7 @@ export default { 'helpers/**/*.js', 'modifiers/**/*.js', 'services/**/*.js', + 'utils/**/*.js', ]), // Follow the V2 Addon rules about dependencies. Your code can import from @@ -54,6 +55,9 @@ export default { // Ensure that .gjs files are properly integrated as Javascript addon.gjs(), + // Emit .d.ts declaration files + addon.declarations('declarations'), + // addons are allowed to contain imports of .css files, which we want rollup // to leave alone and keep in the published output. addon.keepAssets(['**/*.css']), diff --git a/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/tsconfig.json b/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/tsconfig.json index d6c89f58..31597961 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/tsconfig.json +++ b/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/tsconfig.json @@ -7,7 +7,10 @@ "emitDeclarationOnly": true, "noEmit": false, "noEmitOnError": false, - "rootDir": "./src" + "rootDir": "./src", + "types": [ + "ember-source/types" + ] }, "include": [ "src/**/*", diff --git a/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/unpublished-development-types/index.d.ts b/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/unpublished-development-types/index.d.ts index 179d359d..45276a70 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/unpublished-development-types/index.d.ts +++ b/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/unpublished-development-types/index.d.ts @@ -3,7 +3,6 @@ import '@glint/environment-ember-loose'; import '@glint/environment-ember-template-imports'; -import 'ember-source/types'; // Uncomment if you need to support consuming projects in loose mode // diff --git a/tests/fixtures/steps/create-files-from-blueprints/scoped/output/package.json b/tests/fixtures/steps/create-files-from-blueprints/scoped/output/package.json index e0419dc7..825feaa2 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/scoped/output/package.json +++ b/tests/fixtures/steps/create-files-from-blueprints/scoped/output/package.json @@ -14,7 +14,7 @@ "lint": "yarn workspaces run lint", "lint:fix": "yarn workspaces run lint:fix", "prepare": "yarn build", - "start": "concurrently 'yarn:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", + "start": "concurrently \"yarn:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow", "start:addon": "yarn workspace @ijlee2/ember-container-query run start", "start:test-app": "yarn workspace test-app run start", "test": "yarn workspaces run test" diff --git a/tests/fixtures/steps/create-files-from-blueprints/scoped/output/test-app/types/global.d.ts b/tests/fixtures/steps/create-files-from-blueprints/scoped/output/test-app/types/global.d.ts index 45a2e8ab..5bfd1c5a 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/scoped/output/test-app/types/global.d.ts +++ b/tests/fixtures/steps/create-files-from-blueprints/scoped/output/test-app/types/global.d.ts @@ -1,7 +1,2 @@ -// Types for compiled templates -declare module 'test-app/templates/*' { - import { TemplateFactory } from 'ember-cli-htmlbars'; - - const tmpl: TemplateFactory; - export default tmpl; -} +import '@glint/environment-ember-loose'; +import '@glint/environment-ember-template-imports'; diff --git a/tests/fixtures/steps/create-files-from-blueprints/typescript/output/ember-container-query/rollup.config.mjs b/tests/fixtures/steps/create-files-from-blueprints/typescript/output/ember-container-query/rollup.config.mjs index e704c415..07c6ea4d 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/typescript/output/ember-container-query/rollup.config.mjs +++ b/tests/fixtures/steps/create-files-from-blueprints/typescript/output/ember-container-query/rollup.config.mjs @@ -30,6 +30,7 @@ export default { 'helpers/**/*.js', 'modifiers/**/*.js', 'services/**/*.js', + 'utils/**/*.js', ]), // Follow the V2 Addon rules about dependencies. Your code can import from @@ -54,6 +55,9 @@ export default { // Ensure that .gjs files are properly integrated as Javascript addon.gjs(), + // Emit .d.ts declaration files + addon.declarations('declarations'), + // addons are allowed to contain imports of .css files, which we want rollup // to leave alone and keep in the published output. addon.keepAssets(['**/*.css']), diff --git a/tests/fixtures/steps/create-files-from-blueprints/typescript/output/ember-container-query/tsconfig.json b/tests/fixtures/steps/create-files-from-blueprints/typescript/output/ember-container-query/tsconfig.json index 21ba7094..d9755052 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/typescript/output/ember-container-query/tsconfig.json +++ b/tests/fixtures/steps/create-files-from-blueprints/typescript/output/ember-container-query/tsconfig.json @@ -7,7 +7,10 @@ "emitDeclarationOnly": true, "noEmit": false, "noEmitOnError": false, - "rootDir": "./src" + "rootDir": "./src", + "types": [ + "ember-source/types" + ] }, "include": [ "src/**/*", diff --git a/tests/fixtures/steps/create-files-from-blueprints/typescript/output/package.json b/tests/fixtures/steps/create-files-from-blueprints/typescript/output/package.json index cec3db55..86c7b613 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/typescript/output/package.json +++ b/tests/fixtures/steps/create-files-from-blueprints/typescript/output/package.json @@ -14,7 +14,7 @@ "lint": "yarn workspaces run lint", "lint:fix": "yarn workspaces run lint:fix", "prepare": "yarn build", - "start": "concurrently 'yarn:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", + "start": "concurrently \"yarn:start:*\" --restart-after 5000 --prefix-colors cyan,white,yellow", "start:addon": "yarn workspace ember-container-query run start", "start:test-app": "yarn workspace test-app run start", "test": "yarn workspaces run test" diff --git a/tests/fixtures/steps/create-files-from-blueprints/typescript/output/test-app/types/global.d.ts b/tests/fixtures/steps/create-files-from-blueprints/typescript/output/test-app/types/global.d.ts index 45a2e8ab..e69de29b 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/typescript/output/test-app/types/global.d.ts +++ b/tests/fixtures/steps/create-files-from-blueprints/typescript/output/test-app/types/global.d.ts @@ -1,7 +0,0 @@ -// Types for compiled templates -declare module 'test-app/templates/*' { - import { TemplateFactory } from 'ember-cli-htmlbars'; - - const tmpl: TemplateFactory; - export default tmpl; -} diff --git a/tests/fixtures/steps/update-addon-package-json/blueprints/output/ember-container-query/package.json b/tests/fixtures/steps/update-addon-package-json/blueprints/output/ember-container-query/package.json index eb16466e..2f1f0c27 100644 --- a/tests/fixtures/steps/update-addon-package-json/blueprints/output/ember-container-query/package.json +++ b/tests/fixtures/steps/update-addon-package-json/blueprints/output/ember-container-query/package.json @@ -24,21 +24,17 @@ "test": "tests" }, "scripts": { - "build": "concurrently 'yarn:build:*'", - "build:js": "rollup --config", - "build:types": "tsc", - "lint": "concurrently 'yarn:lint:*(!fix)' --names 'lint:'", - "lint:fix": "concurrently 'yarn:lint:*:fix' --names 'fix:'", + "build": "rollup --config", + "lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"", "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern", "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "lint:types": "tsc --emitDeclarationOnly false --noEmit", - "prepack": "concurrently 'yarn:build:*'", - "start": "concurrently 'yarn:start:*'", - "start:js": "rollup --config --watch --no-watch.clearScreen", - "start:types": "tsc --watch", - "test": "echo 'A v2 addon does not have tests, run tests in test-app'" + "prepack": "rollup --config", + "start": "rollup --config --watch", + "test": "echo \"A v2 addon does not have tests, run tests in test-app\"" }, "changelog": { "labels": { @@ -60,26 +56,26 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@babel/plugin-transform-typescript": "^7.26.3", + "@babel/plugin-transform-typescript": "^7.26.5", "@babel/runtime": "^7.26.0", "@embroider/addon-dev": "^7.1.1", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^3.0.8", - "@typescript-eslint/eslint-plugin": "^8.18.2", - "@typescript-eslint/parser": "^8.18.2", + "@typescript-eslint/eslint-plugin": "^8.20.0", + "@typescript-eslint/parser": "^8.20.0", "babel-plugin-ember-template-compilation": "^2.3.0", - "concurrently": "^9.1.0", + "concurrently": "^9.1.2", "ember-template-lint": "^6.0.0", "eslint": "^8.57.1", - "eslint-config-prettier": "^9.1.0", + "eslint-config-prettier": "^10.0.1", "eslint-plugin-ember": "^12.3.3", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.15.1", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "prettier": "^3.4.2", - "rollup": "^4.29.1", + "rollup": "^4.30.1", "rollup-plugin-copy": "^3.5.0", - "typescript": "^5.7.2" + "typescript": "^5.7.3" }, "engines": { "node": "14.* || 16.* || >= 18" diff --git a/tests/fixtures/steps/update-addon-package-json/customizations/output/packages/ember-container-query/package.json b/tests/fixtures/steps/update-addon-package-json/customizations/output/packages/ember-container-query/package.json index 06b07988..62634eb8 100644 --- a/tests/fixtures/steps/update-addon-package-json/customizations/output/packages/ember-container-query/package.json +++ b/tests/fixtures/steps/update-addon-package-json/customizations/output/packages/ember-container-query/package.json @@ -24,21 +24,17 @@ "test": "tests" }, "scripts": { - "build": "concurrently 'yarn:build:*'", - "build:js": "rollup --config", - "build:types": "glint --declaration", - "lint": "concurrently 'yarn:lint:*(!fix)' --names 'lint:'", - "lint:fix": "concurrently 'yarn:lint:*:fix' --names 'fix:'", + "build": "rollup --config", + "lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"", "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern", "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "lint:types": "glint", - "prepack": "concurrently 'yarn:build:*'", - "start": "concurrently 'yarn:start:*'", - "start:js": "rollup --config --watch --no-watch.clearScreen", - "start:types": "glint --declaration --watch", - "test": "echo 'A v2 addon does not have tests, run tests in demo-app'" + "prepack": "rollup --config", + "start": "rollup --config --watch", + "test": "echo \"A v2 addon does not have tests, run tests in demo-app\"" }, "changelog": { "labels": { @@ -60,31 +56,31 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@babel/plugin-transform-typescript": "^7.26.3", + "@babel/plugin-transform-typescript": "^7.26.5", "@babel/runtime": "^7.26.0", "@embroider/addon-dev": "^7.1.1", - "@glint/core": "^1.5.0", - "@glint/environment-ember-loose": "^1.5.0", - "@glint/environment-ember-template-imports": "^1.5.0", - "@glint/template": "^1.5.0", + "@glint/core": "^1.5.1", + "@glint/environment-ember-loose": "^1.5.1", + "@glint/environment-ember-template-imports": "^1.5.1", + "@glint/template": "^1.5.1", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^3.0.8", - "@typescript-eslint/eslint-plugin": "^8.18.2", - "@typescript-eslint/parser": "^8.18.2", + "@typescript-eslint/eslint-plugin": "^8.20.0", + "@typescript-eslint/parser": "^8.20.0", "babel-plugin-ember-template-compilation": "^2.3.0", - "concurrently": "^9.1.0", + "concurrently": "^9.1.2", "ember-source": "^6.1.0", "ember-template-lint": "^6.0.0", "eslint": "^8.57.1", - "eslint-config-prettier": "^9.1.0", + "eslint-config-prettier": "^10.0.1", "eslint-plugin-ember": "^12.3.3", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.15.1", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "prettier": "^3.4.2", - "rollup": "^4.29.1", + "rollup": "^4.30.1", "rollup-plugin-copy": "^3.5.0", - "typescript": "^5.7.2" + "typescript": "^5.7.3" }, "engines": { "node": "14.* || 16.* || >= 18" diff --git a/tests/fixtures/steps/update-addon-package-json/glint/output/ember-container-query/package.json b/tests/fixtures/steps/update-addon-package-json/glint/output/ember-container-query/package.json index 0877c9a8..88ed2cc9 100644 --- a/tests/fixtures/steps/update-addon-package-json/glint/output/ember-container-query/package.json +++ b/tests/fixtures/steps/update-addon-package-json/glint/output/ember-container-query/package.json @@ -24,21 +24,17 @@ "test": "tests" }, "scripts": { - "build": "concurrently 'yarn:build:*'", - "build:js": "rollup --config", - "build:types": "glint --declaration", - "lint": "concurrently 'yarn:lint:*(!fix)' --names 'lint:'", - "lint:fix": "concurrently 'yarn:lint:*:fix' --names 'fix:'", + "build": "rollup --config", + "lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"", "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern", "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "lint:types": "glint", - "prepack": "concurrently 'yarn:build:*'", - "start": "concurrently 'yarn:start:*'", - "start:js": "rollup --config --watch --no-watch.clearScreen", - "start:types": "glint --declaration --watch", - "test": "echo 'A v2 addon does not have tests, run tests in test-app'" + "prepack": "rollup --config", + "start": "rollup --config --watch", + "test": "echo \"A v2 addon does not have tests, run tests in test-app\"" }, "changelog": { "labels": { @@ -60,31 +56,31 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@babel/plugin-transform-typescript": "^7.26.3", + "@babel/plugin-transform-typescript": "^7.26.5", "@babel/runtime": "^7.26.0", "@embroider/addon-dev": "^7.1.1", - "@glint/core": "^1.5.0", - "@glint/environment-ember-loose": "^1.5.0", - "@glint/environment-ember-template-imports": "^1.5.0", - "@glint/template": "^1.5.0", + "@glint/core": "^1.5.1", + "@glint/environment-ember-loose": "^1.5.1", + "@glint/environment-ember-template-imports": "^1.5.1", + "@glint/template": "^1.5.1", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^3.0.8", - "@typescript-eslint/eslint-plugin": "^8.18.2", - "@typescript-eslint/parser": "^8.18.2", + "@typescript-eslint/eslint-plugin": "^8.20.0", + "@typescript-eslint/parser": "^8.20.0", "babel-plugin-ember-template-compilation": "^2.3.0", - "concurrently": "^9.1.0", + "concurrently": "^9.1.2", "ember-source": "^6.1.0", "ember-template-lint": "^6.0.0", "eslint": "^8.57.1", - "eslint-config-prettier": "^9.1.0", + "eslint-config-prettier": "^10.0.1", "eslint-plugin-ember": "^12.3.3", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.15.1", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "prettier": "^3.4.2", - "rollup": "^4.29.1", + "rollup": "^4.30.1", "rollup-plugin-copy": "^3.5.0", - "typescript": "^5.7.2" + "typescript": "^5.7.3" }, "engines": { "node": "14.* || 16.* || >= 18" diff --git a/tests/fixtures/steps/update-addon-package-json/javascript/output/ember-container-query/package.json b/tests/fixtures/steps/update-addon-package-json/javascript/output/ember-container-query/package.json index 39ca7e22..9cf3c0b1 100644 --- a/tests/fixtures/steps/update-addon-package-json/javascript/output/ember-container-query/package.json +++ b/tests/fixtures/steps/update-addon-package-json/javascript/output/ember-container-query/package.json @@ -25,15 +25,15 @@ }, "scripts": { "build": "rollup --config", - "lint": "concurrently 'yarn:lint:*(!fix)' --names 'lint:'", - "lint:fix": "concurrently 'yarn:lint:*:fix' --names 'fix:'", + "lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"", "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern", "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "prepack": "rollup --config", "start": "rollup --config --watch", - "test": "echo 'A v2 addon does not have tests, run tests in test-app'" + "test": "echo \"A v2 addon does not have tests, run tests in test-app\"" }, "changelog": { "labels": { @@ -55,21 +55,21 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@babel/eslint-parser": "^7.25.9", + "@babel/eslint-parser": "^7.26.5", "@babel/runtime": "^7.26.0", "@embroider/addon-dev": "^7.1.1", "@rollup/plugin-babel": "^6.0.4", "babel-plugin-ember-template-compilation": "^2.3.0", - "concurrently": "^9.1.0", + "concurrently": "^9.1.2", "ember-template-lint": "^6.0.0", "eslint": "^8.57.1", - "eslint-config-prettier": "^9.1.0", + "eslint-config-prettier": "^10.0.1", "eslint-plugin-ember": "^12.3.3", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.15.1", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "prettier": "^3.4.2", - "rollup": "^4.29.1", + "rollup": "^4.30.1", "rollup-plugin-copy": "^3.5.0" }, "engines": { diff --git a/tests/fixtures/steps/update-addon-package-json/public-assets/output/ember-container-query/package.json b/tests/fixtures/steps/update-addon-package-json/public-assets/output/ember-container-query/package.json index 2fec7efa..63f0dcbe 100644 --- a/tests/fixtures/steps/update-addon-package-json/public-assets/output/ember-container-query/package.json +++ b/tests/fixtures/steps/update-addon-package-json/public-assets/output/ember-container-query/package.json @@ -24,21 +24,17 @@ "test": "tests" }, "scripts": { - "build": "concurrently 'yarn:build:*'", - "build:js": "rollup --config", - "build:types": "tsc", - "lint": "concurrently 'yarn:lint:*(!fix)' --names 'lint:'", - "lint:fix": "concurrently 'yarn:lint:*:fix' --names 'fix:'", + "build": "rollup --config", + "lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"", "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern", "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "lint:types": "tsc --emitDeclarationOnly false --noEmit", - "prepack": "concurrently 'yarn:build:*'", - "start": "concurrently 'yarn:start:*'", - "start:js": "rollup --config --watch --no-watch.clearScreen", - "start:types": "tsc --watch", - "test": "echo 'A v2 addon does not have tests, run tests in test-app'" + "prepack": "rollup --config", + "start": "rollup --config --watch", + "test": "echo \"A v2 addon does not have tests, run tests in test-app\"" }, "changelog": { "labels": { @@ -60,26 +56,26 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@babel/plugin-transform-typescript": "^7.26.3", + "@babel/plugin-transform-typescript": "^7.26.5", "@babel/runtime": "^7.26.0", "@embroider/addon-dev": "^7.1.1", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^3.0.8", - "@typescript-eslint/eslint-plugin": "^8.18.2", - "@typescript-eslint/parser": "^8.18.2", + "@typescript-eslint/eslint-plugin": "^8.20.0", + "@typescript-eslint/parser": "^8.20.0", "babel-plugin-ember-template-compilation": "^2.3.0", - "concurrently": "^9.1.0", + "concurrently": "^9.1.2", "ember-template-lint": "^6.0.0", "eslint": "^8.57.1", - "eslint-config-prettier": "^9.1.0", + "eslint-config-prettier": "^10.0.1", "eslint-plugin-ember": "^12.3.3", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.15.1", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "prettier": "^3.4.2", - "rollup": "^4.29.1", + "rollup": "^4.30.1", "rollup-plugin-copy": "^3.5.0", - "typescript": "^5.7.2" + "typescript": "^5.7.3" }, "engines": { "node": "14.* || 16.* || >= 18" diff --git a/tests/fixtures/steps/update-addon-package-json/scoped/output/ember-container-query/package.json b/tests/fixtures/steps/update-addon-package-json/scoped/output/ember-container-query/package.json index 9d0c7240..9d6c16fd 100644 --- a/tests/fixtures/steps/update-addon-package-json/scoped/output/ember-container-query/package.json +++ b/tests/fixtures/steps/update-addon-package-json/scoped/output/ember-container-query/package.json @@ -24,21 +24,17 @@ "test": "tests" }, "scripts": { - "build": "concurrently 'yarn:build:*'", - "build:js": "rollup --config", - "build:types": "glint --declaration", - "lint": "concurrently 'yarn:lint:*(!fix)' --names 'lint:'", - "lint:fix": "concurrently 'yarn:lint:*:fix' --names 'fix:'", + "build": "rollup --config", + "lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"", "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern", "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "lint:types": "glint", - "prepack": "concurrently 'yarn:build:*'", - "start": "concurrently 'yarn:start:*'", - "start:js": "rollup --config --watch --no-watch.clearScreen", - "start:types": "glint --declaration --watch", - "test": "echo 'A v2 addon does not have tests, run tests in test-app'" + "prepack": "rollup --config", + "start": "rollup --config --watch", + "test": "echo \"A v2 addon does not have tests, run tests in test-app\"" }, "changelog": { "labels": { @@ -60,31 +56,31 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@babel/plugin-transform-typescript": "^7.26.3", + "@babel/plugin-transform-typescript": "^7.26.5", "@babel/runtime": "^7.26.0", "@embroider/addon-dev": "^7.1.1", - "@glint/core": "^1.5.0", - "@glint/environment-ember-loose": "^1.5.0", - "@glint/environment-ember-template-imports": "^1.5.0", - "@glint/template": "^1.5.0", + "@glint/core": "^1.5.1", + "@glint/environment-ember-loose": "^1.5.1", + "@glint/environment-ember-template-imports": "^1.5.1", + "@glint/template": "^1.5.1", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^3.0.8", - "@typescript-eslint/eslint-plugin": "^8.18.2", - "@typescript-eslint/parser": "^8.18.2", + "@typescript-eslint/eslint-plugin": "^8.20.0", + "@typescript-eslint/parser": "^8.20.0", "babel-plugin-ember-template-compilation": "^2.3.0", - "concurrently": "^9.1.0", + "concurrently": "^9.1.2", "ember-source": "^6.1.0", "ember-template-lint": "^6.0.0", "eslint": "^8.57.1", - "eslint-config-prettier": "^9.1.0", + "eslint-config-prettier": "^10.0.1", "eslint-plugin-ember": "^12.3.3", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.15.1", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "prettier": "^3.4.2", - "rollup": "^4.29.1", + "rollup": "^4.30.1", "rollup-plugin-copy": "^3.5.0", - "typescript": "^5.7.2" + "typescript": "^5.7.3" }, "engines": { "node": "14.* || 16.* || >= 18" diff --git a/tests/fixtures/steps/update-addon-package-json/typescript/output/ember-container-query/package.json b/tests/fixtures/steps/update-addon-package-json/typescript/output/ember-container-query/package.json index e497c891..72180ec2 100644 --- a/tests/fixtures/steps/update-addon-package-json/typescript/output/ember-container-query/package.json +++ b/tests/fixtures/steps/update-addon-package-json/typescript/output/ember-container-query/package.json @@ -24,21 +24,17 @@ "test": "tests" }, "scripts": { - "build": "concurrently 'yarn:build:*'", - "build:js": "rollup --config", - "build:types": "tsc", - "lint": "concurrently 'yarn:lint:*(!fix)' --names 'lint:'", - "lint:fix": "concurrently 'yarn:lint:*:fix' --names 'fix:'", + "build": "rollup --config", + "lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"", + "lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"", "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern", "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "lint:types": "tsc --emitDeclarationOnly false --noEmit", - "prepack": "concurrently 'yarn:build:*'", - "start": "concurrently 'yarn:start:*'", - "start:js": "rollup --config --watch --no-watch.clearScreen", - "start:types": "tsc --watch", - "test": "echo 'A v2 addon does not have tests, run tests in test-app'" + "prepack": "rollup --config", + "start": "rollup --config --watch", + "test": "echo \"A v2 addon does not have tests, run tests in test-app\"" }, "changelog": { "labels": { @@ -60,26 +56,26 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@babel/plugin-transform-typescript": "^7.26.3", + "@babel/plugin-transform-typescript": "^7.26.5", "@babel/runtime": "^7.26.0", "@embroider/addon-dev": "^7.1.1", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^3.0.8", - "@typescript-eslint/eslint-plugin": "^8.18.2", - "@typescript-eslint/parser": "^8.18.2", + "@typescript-eslint/eslint-plugin": "^8.20.0", + "@typescript-eslint/parser": "^8.20.0", "babel-plugin-ember-template-compilation": "^2.3.0", - "concurrently": "^9.1.0", + "concurrently": "^9.1.2", "ember-template-lint": "^6.0.0", "eslint": "^8.57.1", - "eslint-config-prettier": "^9.1.0", + "eslint-config-prettier": "^10.0.1", "eslint-plugin-ember": "^12.3.3", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.15.1", - "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-prettier": "^5.2.2", "prettier": "^3.4.2", - "rollup": "^4.29.1", + "rollup": "^4.30.1", "rollup-plugin-copy": "^3.5.0", - "typescript": "^5.7.2" + "typescript": "^5.7.3" }, "engines": { "node": "14.* || 16.* || >= 18"