Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/busy-animals-mix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"ember-container-query": patch
"docs-app": patch
"test-app": patch
---

Updated project configurations
7 changes: 7 additions & 0 deletions .changeset/vast-roses-obey.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"ember-container-query": patch
"docs-app": patch
"test-app": patch
---

Updated dependencies
4 changes: 2 additions & 2 deletions configs/eslint/ember/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"lint:js:fix": "eslint . --fix"
},
"dependencies": {
"@ijlee2-frontend-configs/eslint-config-ember": "^3.1.1"
"@ijlee2-frontend-configs/eslint-config-ember": "^3.2.0"
},
"devDependencies": {
"@shared-configs/eslint-config-node": "workspace:*",
Expand All @@ -33,7 +33,7 @@
"prettier": "^3.8.1"
},
"peerDependencies": {
"eslint": "^9.39.2",
"eslint": "^9.39.4",
"typescript": "^5.9.3"
},
"peerDependenciesMeta": {
Expand Down
4 changes: 2 additions & 2 deletions configs/eslint/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"lint:js:fix": "eslint . --fix"
},
"dependencies": {
"@ijlee2-frontend-configs/eslint-config-node": "^3.1.1"
"@ijlee2-frontend-configs/eslint-config-node": "^3.2.0"
},
"devDependencies": {
"@shared-configs/prettier": "workspace:*",
Expand All @@ -31,7 +31,7 @@
"prettier": "^3.8.1"
},
"peerDependencies": {
"eslint": "^9.39.2",
"eslint": "^9.39.4",
"typescript": "^5.9.3"
},
"peerDependenciesMeta": {
Expand Down
2 changes: 1 addition & 1 deletion configs/prettier/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"lint:fix": "prettier \"**/*.mjs\" --cache --write"
},
"dependencies": {
"@ijlee2-frontend-configs/prettier": "^3.0.1"
"@ijlee2-frontend-configs/prettier": "^3.0.2"
},
"devDependencies": {
"prettier": "^3.8.1"
Expand Down
6 changes: 2 additions & 4 deletions docs-app/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
"schemaVersion": "1.0.0",
"packages": [
{
"name": "ember-cli",
"name": "@ember/app-blueprint",
"version": "6.11.2",
"blueprints": [
{
"name": "app",
"outputRepo": "https://github.com/ember-cli/ember-new-output",
"codemodsSource": "ember-app-codemods-manifest@1",
"name": "@ember/app-blueprint",
"isBaseBlueprint": true,
"options": ["--typescript"]
}
Expand Down
3 changes: 2 additions & 1 deletion docs-app/config/optional-features.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"default-async-observers": true,
"jquery-integration": false,
"no-implicit-route-model": true,
"template-only-glimmer-components": true
"template-only-glimmer-components": true,
"use-ember-modules": true
}
14 changes: 7 additions & 7 deletions docs-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
"@embroider/macros": "^1.20.2",
"@embroider/router": "^2.1.12",
"@embroider/webpack": "^4.1.2",
"@glimmer/component": "^2.0.0",
"@glimmer/component": "^2.1.1",
"@glimmer/tracking": "^1.1.2",
"@glint/ember-tsc": "^1.4.0",
"@glint/ember-tsc": "^1.5.0",
"@glint/template": "^1.7.7",
"@glint/tsserver-plugin": "^2.3.1",
"@glint/tsserver-plugin": "^2.4.0",
"@percy/cli": "^1.31.11",
"@percy/ember": "^5.0.0",
"@shared-configs/ember-template-lint": "workspace:*",
Expand Down Expand Up @@ -91,7 +91,7 @@
"ember-load-initializers": "^3.0.1",
"ember-modifier": "^4.3.0",
"ember-page-title": "^9.0.3",
"ember-primitives": "^0.55.0",
"ember-primitives": "^0.55.1",
"ember-qunit": "^9.0.4",
"ember-resolver": "^13.2.0",
"ember-source": "~6.11.0",
Expand All @@ -100,16 +100,16 @@
"ember-template-lint": "^7.9.3",
"ember-test-selectors": "^7.1.0",
"ember-truth-helpers": "^5.0.0",
"embroider-css-modules": "^4.0.1",
"embroider-css-modules": "^4.0.2",
"eslint": "^9.39.4",
"loader.js": "^4.7.0",
"postcss": "^8.5.8",
"postcss": "^8.5.9",
"postcss-loader": "^8.2.1",
"prettier": "^3.8.1",
"qunit": "^2.25.0",
"qunit-dom": "^3.5.0",
"stylelint": "^17.6.0",
"type-css-modules": "^3.2.0",
"type-css-modules": "^3.2.1",
"typescript": "^5.9.3",
"webpack": "^5.105.4"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {
generatorOpts: {
compact: false,
},
Expand Down
8 changes: 4 additions & 4 deletions packages/ember-container-query/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,18 @@
"decorator-transforms": "^2.3.1",
"ember-element-helper": "^0.8.8",
"ember-modifier": "^4.3.0",
"ember-primitives": "^0.55.0"
"ember-primitives": "^0.55.1"
},
"devDependencies": {
"@babel/core": "^7.29.0",
"@babel/plugin-transform-typescript": "^7.28.6",
"@babel/runtime": "^7.29.2",
"@embroider/addon-dev": "^8.3.0",
"@glimmer/component": "^2.0.0",
"@glimmer/component": "^2.1.1",
"@glimmer/tracking": "^1.1.2",
"@glint/ember-tsc": "^1.4.0",
"@glint/ember-tsc": "^1.5.0",
"@glint/template": "^1.7.7",
"@glint/tsserver-plugin": "^2.3.1",
"@glint/tsserver-plugin": "^2.4.0",
"@rollup/plugin-babel": "^7.0.0",
"@shared-configs/ember-template-lint": "workspace:*",
"@shared-configs/eslint-config-ember": "workspace:*",
Expand Down
11 changes: 2 additions & 9 deletions packages/ember-container-query/rollup.config.mjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import { dirname, resolve } from 'node:path';
import { fileURLToPath } from 'node:url';

import { Addon } from '@embroider/addon-dev/rollup';
import { babel } from '@rollup/plugin-babel';

Expand All @@ -9,10 +6,6 @@ const addon = new Addon({
destDir: 'dist',
});

const rootDirectory = dirname(fileURLToPath(import.meta.url));
const babelConfig = resolve(rootDirectory, './babel.config.cjs');
const tsConfig = resolve(rootDirectory, './tsconfig.json');

export default {
// This provides defaults that work well alongside `publicEntrypoints` below.
// You can augment this if you need to.
Expand Down Expand Up @@ -52,7 +45,7 @@ export default {
// babel.config.json.
babel({
babelHelpers: 'bundled',
configFile: babelConfig,
configFile: './babel.config.mjs',
extensions: ['.gjs', '.gts', '.js', '.ts'],
}),

Expand All @@ -65,7 +58,7 @@ export default {
// Emit .d.ts declaration files
addon.declarations(
'declarations',
`pnpm ember-tsc --declaration --project ${tsConfig}`,
`pnpm ember-tsc --declaration --project tsconfig.json`,
),

// addons are allowed to contain imports of .css files, which we want rollup
Expand Down
Loading