chore: Updated fixtures

ijlee2 · Jan 15, 2025 · 06c1209 · 06c1209
1 parent 04d8edc
commit 06c1209
Show file tree

Hide file tree

Showing 43 changed files with 219 additions and 201 deletions.
diff --git 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/...s/ember-container-query-customizations/output/packages/ember-container-query/package.json b/...s/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": "concurrently \"yarn:build:*\"",
+    "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/...er-container-query-customizations/output/packages/ember-container-query/rollup.config.mjs b/...er-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/.../ember-container-query-customizations/output/packages/ember-container-query/tsconfig.json b/.../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/...omizations/output/packages/ember-container-query/unpublished-development-types/index.d.ts b/...omizations/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
@@ -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": "concurrently \"yarn:build:*\"",
+    "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
@@ -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
@@ -7,7 +7,10 @@
     "emitDeclarationOnly": true,
     "noEmit": false,
     "noEmitOnError": false,
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "types": [
+      "ember-source/types"
+    ]
   },
   "include": [
     "src/**/*",

diff --git a/...ntainer-query-glint/output/ember-container-query/unpublished-development-types/index.d.ts b/...ntainer-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
@@ -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-javascript/output/ember-container-query/package.json b/tests/fixtures/ember-container-query-javascript/output/ember-container-query/package.json
@@ -25,15 +25,14 @@
   },
   "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 +54,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/.../fixtures/ember-container-query-javascript/output/ember-container-query/rollup.config.mjs b/.../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
@@ -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
@@ -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": "concurrently \"yarn:build:*\"",
+    "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
@@ -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']),