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
9 changes: 9 additions & 0 deletions .changeset/gentle-steaks-yell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
"embroider-css-modules": patch
"test-app-for-embroider-css-modules": patch
"my-v2-addon": patch
"my-v1-app": patch
"my-v2-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 @@ -24,12 +24,12 @@
"lint:js:fix": "eslint . --fix"
},
"dependencies": {
"@ijlee2-frontend-configs/eslint-config-ember": "^3.4.2"
"@ijlee2-frontend-configs/eslint-config-ember": "^3.4.3"
},
"devDependencies": {
"@shared-configs/eslint-config-node": "workspace:*",
"@shared-configs/prettier": "workspace:*",
"concurrently": "^10.0.0",
"concurrently": "^10.0.3",
"eslint": "^9.39.4",
"prettier": "^3.8.3"
},
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,11 +22,11 @@
"lint:js:fix": "eslint . --fix"
},
"dependencies": {
"@ijlee2-frontend-configs/eslint-config-node": "^3.4.2"
"@ijlee2-frontend-configs/eslint-config-node": "^3.4.3"
},
"devDependencies": {
"@shared-configs/prettier": "workspace:*",
"concurrently": "^10.0.0",
"concurrently": "^10.0.3",
"eslint": "^9.39.4",
"prettier": "^3.8.3"
},
Expand Down
2 changes: 1 addition & 1 deletion configs/stylelint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"prettier": "^3.8.3"
},
"peerDependencies": {
"stylelint": "^17.12.0"
"stylelint": "^17.13.0"
},
"peerDependenciesMeta": {
"stylelint": {
Expand Down
1 change: 0 additions & 1 deletion docs/my-v1-app/.netlifyredirects

This file was deleted.

8 changes: 8 additions & 0 deletions docs/my-v1-app/netlify.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[[redirects]]
from = "/*"
to = "/index.html"
status = 200
[redirects.rate_limit]
window_limit = 50
window_size = 60
aggregate_by = ["domain", "ip"]
15 changes: 7 additions & 8 deletions docs/my-v1-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"test": "tests"
},
"scripts": {
"build": "ember build --environment=production",
"build": "ember build --environment=production && ./post-build.sh",
"format": "prettier . --cache --write",
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"app/**/*.css\" --cache",
Expand All @@ -48,7 +48,7 @@
"@embroider/config-meta-loader": "^1.0.0",
"@embroider/core": "^3.5.9",
"@embroider/legacy-inspector-support": "^0.1.3",
"@embroider/macros": "^1.20.3",
"@embroider/macros": "^1.20.4",
"@embroider/router": "^2.1.12",
"@embroider/webpack": "^4.1.2",
"@glimmer/component": "^2.1.1",
Expand All @@ -66,9 +66,9 @@
"@shared-configs/typescript": "workspace:*",
"@types/qunit": "^2.19.14",
"autoprefixer": "^10.5.0",
"axe-core": "^4.11.4",
"axe-core": "^4.12.0",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^10.0.0",
"concurrently": "^10.0.3",
"d3-array": "^3.2.4",
"d3-axis": "^3.0.0",
"d3-scale": "^4.0.2",
Expand All @@ -83,8 +83,7 @@
"ember-cli-clean-css": "^3.0.0",
"ember-cli-htmlbars": "^7.0.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-netlify": "^0.4.1",
"ember-container-query": "^7.0.5",
"ember-container-query": "^7.0.7",
"ember-load-initializers": "^3.0.1",
"ember-modifier": "^4.3.0",
"ember-page-title": "^9.0.3",
Expand All @@ -104,9 +103,9 @@
"postcss": "^8.5.15",
"postcss-loader": "^8.2.1",
"prettier": "^3.8.3",
"qunit": "^2.25.0",
"qunit": "^2.26.0",
"qunit-dom": "^3.5.1",
"stylelint": "^17.12.0",
"stylelint": "^17.13.0",
"type-css-modules": "workspace:*",
"typescript": "^5.9.3",
"webpack": "^5.107.2"
Expand Down
3 changes: 3 additions & 0 deletions docs/my-v1-app/post-build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
cp "netlify.toml" "dist/netlify.toml"

echo "✓ Added Netlify configuration to dist"
1 change: 0 additions & 1 deletion docs/my-v1-app/tests/test-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import QUnit from 'qunit';
import { setup } from 'qunit-dom';

setApplication(Application.create(config.APP));

setup(QUnit.assert);
setupEmberOnerrorValidation();
loadTests();
Expand Down
10 changes: 5 additions & 5 deletions docs/my-v2-addon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"test": "echo \"A v2 addon does not have tests, run tests in docs/my-v1-app\""
},
"dependencies": {
"@embroider/addon-shim": "^1.10.2",
"@embroider/addon-shim": "^1.10.3",
"@glimmer/component": "^2.1.1",
"decorator-transforms": "^2.3.2",
"embroider-css-modules": "workspace:*"
Expand All @@ -73,22 +73,22 @@
"@glint/ember-tsc": "^1.8.0",
"@glint/template": "^1.7.7",
"@glint/tsserver-plugin": "^2.5.6",
"@rollup/plugin-babel": "^7.0.0",
"@rollup/plugin-babel": "^7.1.0",
"@shared-configs/ember-template-lint": "workspace:*",
"@shared-configs/eslint-config-ember": "workspace:*",
"@shared-configs/prettier": "workspace:*",
"@shared-configs/stylelint": "workspace:*",
"@shared-configs/typescript": "workspace:*",
"babel-plugin-ember-template-compilation": "^4.0.0",
"concurrently": "^10.0.0",
"concurrently": "^10.0.3",
"ember-source": "~6.12.0",
"ember-template-lint": "^7.9.3",
"eslint": "^9.39.4",
"postcss": "^8.5.15",
"prettier": "^3.8.3",
"rollup": "^4.60.4",
"rollup": "^4.61.1",
"rollup-plugin-postcss": "^4.0.2",
"stylelint": "^17.12.0",
"stylelint": "^17.13.0",
"type-css-modules": "workspace:*",
"typescript": "^5.9.3"
},
Expand Down
9 changes: 8 additions & 1 deletion docs/my-v2-app/babel.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import {
babelCompatSupport,
templateCompatSupport,
} from '@embroider/compat/babel';
import { stripPropertiesPlugin } from 'strip-test-selectors';

const isProduction = process.env.NODE_ENV === 'production';

export default {
generatorOpts: {
Expand All @@ -27,7 +30,10 @@ export default {
'ember-cli-htmlbars-inline-precompile',
'htmlbars-inline-precompile',
],
transforms: [...templateCompatSupport()],
transforms: [
...templateCompatSupport(),
...(isProduction ? ['strip-test-selectors'] : []),
],
},
],
[
Expand All @@ -49,5 +55,6 @@ export default {
},
],
...babelCompatSupport(),
...(isProduction ? [stripPropertiesPlugin()] : []),
],
};
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
'use strict';
import { compatBuild } from '@embroider/compat';
import EmberApp from 'ember-cli/lib/broccoli/ember-app.js';

const { compatBuild } = require('@embroider/compat');
const EmberApp = require('ember-cli/lib/broccoli/ember-app');

module.exports = async function (defaults) {
export default async function (defaults) {
const { buildOnce } = await import('@embroider/vite');

const app = new EmberApp(defaults, {
Expand All @@ -13,4 +11,4 @@ module.exports = async function (defaults) {
});

return compatBuild(app, buildOnce);
};
}
22 changes: 9 additions & 13 deletions docs/my-v2-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@
"@ember/optional-features": "^3.0.0",
"@ember/string": "^4.0.1",
"@ember/test-helpers": "^5.4.2",
"@embroider/compat": "^4.1.19",
"@embroider/compat": "^4.1.20",
"@embroider/config-meta-loader": "^1.0.0",
"@embroider/core": "^4.6.0",
"@embroider/core": "^4.6.1",
"@embroider/router": "^3.0.6",
"@embroider/vite": "^1.7.4",
"@embroider/vite": "^1.7.6",
"@glimmer/component": "^2.1.1",
"@glimmer/tracking": "^1.1.2",
"@glint/ember-tsc": "^1.8.0",
"@glint/template": "^1.7.7",
"@glint/tsserver-plugin": "^2.5.6",
"@rollup/plugin-babel": "^7.0.0",
"@rollup/plugin-babel": "^7.1.0",
"@shared-configs/ember-template-lint": "workspace:*",
"@shared-configs/eslint-config-ember": "workspace:*",
"@shared-configs/prettier": "workspace:*",
Expand All @@ -65,33 +65,29 @@
"@types/qunit": "^2.19.14",
"babel-plugin-ember-template-compilation": "^4.0.0",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^10.0.0",
"concurrently": "^10.0.3",
"decorator-transforms": "^2.3.2",
"ember-auto-import": "^2.13.1",
"ember-cli": "~6.12.0",
"ember-cli-app-version": "^7.0.0",
"ember-cli-babel": "^8.3.1",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-htmlbars": "^7.0.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-load-initializers": "^3.0.1",
"ember-modifier": "^4.3.0",
"ember-page-title": "^9.0.3",
"ember-qunit": "^9.0.4",
"ember-resolver": "^13.2.0",
"ember-source": "~6.12.0",
"ember-template-lint": "^7.9.3",
"ember-test-selectors": "^7.1.0",
"embroider-css-modules": "workspace:*",
"eslint": "^9.39.4",
"lightningcss": "^1.32.0",
"prettier": "^3.8.3",
"qunit": "^2.25.0",
"qunit": "^2.26.0",
"qunit-dom": "^3.5.1",
"stylelint": "^17.12.0",
"strip-test-selectors": "^0.1.0",
"stylelint": "^17.13.0",
"type-css-modules": "workspace:*",
"typescript": "^5.9.3",
"vite": "^8.0.14"
"vite": "^8.0.16"
},
"engines": {
"node": "22.* || >= 24"
Expand Down
1 change: 0 additions & 1 deletion docs/my-v2-app/tests/test-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { setup } from 'qunit-dom';

export function start(): void {
setApplication(Application.create(config.APP));

setup(QUnit.assert);
setupEmberOnerrorValidation();
qunitStart();
Expand Down
2 changes: 1 addition & 1 deletion docs/my-v2-app/vite.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default defineConfig({
css: {
lightningcss: {
cssModules: {
pattern: 'my-v2-app__[hash]-[local]',
pattern: '[hash]-[local]',
},
},
transformer: 'lightningcss',
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"devDependencies": {
"@changesets/cli": "^2.31.0",
"@ijlee2-frontend-configs/changesets": "^2.1.1",
"concurrently": "^10.0.0",
"sort-package-json": "^3.6.1",
"concurrently": "^10.0.3",
"sort-package-json": "^4.0.0",
"update-workspace-root-version": "^3.0.2"
},
"packageManager": "pnpm@10.34.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@sondr3/minitest": "^0.1.2",
"@types/node": "^22.19.19",
"@types/yargs": "^17.0.35",
"concurrently": "^10.0.0",
"concurrently": "^10.0.3",
"eslint": "^9.39.4",
"prettier": "^3.8.3",
"typescript": "^5.9.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-codemod-remove-global-styles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@sondr3/minitest": "^0.1.2",
"@types/node": "^22.19.19",
"@types/yargs": "^17.0.35",
"concurrently": "^10.0.0",
"concurrently": "^10.0.3",
"eslint": "^9.39.4",
"prettier": "^3.8.3",
"typescript": "^5.9.3"
Expand Down
8 changes: 4 additions & 4 deletions packages/embroider-css-modules/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"test": "echo \"A v2 addon does not have tests, run tests in tests/embroider-css-modules\""
},
"dependencies": {
"@embroider/addon-shim": "^1.10.2",
"@embroider/addon-shim": "^1.10.3",
"decorator-transforms": "^2.3.2"
},
"devDependencies": {
Expand All @@ -68,18 +68,18 @@
"@glint/ember-tsc": "^1.8.0",
"@glint/template": "^1.7.7",
"@glint/tsserver-plugin": "^2.5.6",
"@rollup/plugin-babel": "^7.0.0",
"@rollup/plugin-babel": "^7.1.0",
"@shared-configs/ember-template-lint": "workspace:*",
"@shared-configs/eslint-config-ember": "workspace:*",
"@shared-configs/prettier": "workspace:*",
"@shared-configs/typescript": "workspace:*",
"babel-plugin-ember-template-compilation": "^4.0.0",
"concurrently": "^10.0.0",
"concurrently": "^10.0.3",
"ember-source": "~6.12.0",
"ember-template-lint": "^7.9.3",
"eslint": "^9.39.4",
"prettier": "^3.8.3",
"rollup": "^4.60.4",
"rollup": "^4.61.1",
"typescript": "^5.9.3"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/type-css-modules/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@sondr3/minitest": "^0.1.2",
"@types/node": "^22.19.19",
"@types/yargs": "^17.0.35",
"concurrently": "^10.0.0",
"concurrently": "^10.0.3",
"eslint": "^9.39.4",
"prettier": "^3.8.3",
"typescript": "^5.9.3"
Expand Down
Loading
Loading