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
2 changes: 1 addition & 1 deletion config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"packages": [
{
"name": "@ember/addon-blueprint",
"version": "0.16.1",
"version": "0.17.0",
"blueprints": [
{
"name": "@ember/addon-blueprint",
Expand Down
2 changes: 1 addition & 1 deletion docs/.editorconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# editorconfig.org
# https://editorconfig.org/

root = true

Expand Down
1 change: 0 additions & 1 deletion docs/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

# compiled output
/dist/
/declarations/
/tmp/

# dependencies
Expand Down
4 changes: 1 addition & 3 deletions docs/.stylelintrc.cjs → docs/.stylelintrc.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

module.exports = {
export default {
extends: ['stylelint-config-standard'],
};
Empty file removed docs/app/models/.gitkeep
Empty file.
Empty file removed docs/app/services/.gitkeep
Empty file.
15 changes: 7 additions & 8 deletions docs/babel.config.cjs → docs/babel.config.mjs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
'use strict';

const {
import { dirname } from 'node:path';
import { fileURLToPath } from 'node:url';
import {
babelCompatSupport,
templateCompatSupport,
} = require('@embroider/compat/babel');
} from '@embroider/compat/babel';

module.exports = {
export default {
plugins: [
[
'@babel/plugin-transform-typescript',
Expand All @@ -18,7 +18,6 @@ module.exports = {
[
'babel-plugin-ember-template-compilation',
{
compilerPath: 'ember-source/dist/ember-template-compiler.js',
enableLegacyModules: [
'ember-cli-htmlbars',
'ember-cli-htmlbars-inline-precompile',
Expand All @@ -31,14 +30,14 @@ module.exports = {
'module:decorator-transforms',
{
runtime: {
import: require.resolve('decorator-transforms/runtime-esm'),
import: import.meta.resolve('decorator-transforms/runtime-esm'),
},
},
],
[
'@babel/plugin-transform-runtime',
{
absoluteRuntime: __dirname,
absoluteRuntime: dirname(fileURLToPath(import.meta.url)),
useESModules: true,
regenerator: false,
},
Expand Down
10 changes: 8 additions & 2 deletions docs/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,20 @@
"packages": [
{
"name": "ember-cli",
"version": "6.9.1",
"version": "6.10.0",
"blueprints": [
{
"name": "app",
"outputRepo": "https://github.com/ember-cli/ember-new-output",
"codemodsSource": "ember-app-codemods-manifest@1",
"isBaseBlueprint": true,
"options": ["--no-welcome", "--pnpm", "--typescript"]
"options": [
"--no-welcome",
"--pnpm",
"--typescript",
"--no-ember-data",
"--no-warp-drive"
]
}
]
}
Expand Down
40 changes: 14 additions & 26 deletions docs/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
*/
import globals from 'globals';
import js from '@eslint/js';
import { defineConfig, globalIgnores } from 'eslint/config';

import ts from 'typescript-eslint';

Expand All @@ -23,7 +24,7 @@ import eslintConfigPrettier from 'eslint-config-prettier';
import qunit from 'eslint-plugin-qunit';
import n from 'eslint-plugin-n';

import babelParser from '@babel/eslint-parser';
import babelParser from '@babel/eslint-parser/experimental-worker';

const parserOptions = {
esm: {
Expand All @@ -38,25 +39,18 @@ const parserOptions = {
},
};

export default ts.config(
export default defineConfig([
globalIgnores([
'dist/',
'coverage/',
'app/components/snippets/*-snippet.*',
'!**/.*',
]),
js.configs.recommended,
ember.configs.base,
ember.configs.gjs,
ember.configs.gts,
eslintConfigPrettier,
/**
* Ignores must be in their own object
* https://eslint.org/docs/latest/use/configure/ignore
*/
{
ignores: [
'dist/',
'node_modules/',
'coverage/',
'app/components/snippets/*-snippet.*',
'!**/.*',
],
},
/**
* https://eslint.org/docs/latest/use/configure/configuration-files#configuring-linter-options
*/
Expand Down Expand Up @@ -85,6 +79,9 @@ export default ts.config(
languageOptions: {
parser: ember.parser,
parserOptions: parserOptions.esm.ts,
globals: {
...globals.browser,
},
},
extends: [...ts.configs.recommendedTypeChecked, ember.configs.gts],
},
Expand All @@ -98,16 +95,7 @@ export default ts.config(
* CJS node files
*/
{
files: [
'**/*.cjs',
'config/**/*.js',
'testem.js',
'testem*.js',
'.prettierrc.js',
'.stylelintrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
],
files: ['**/*.cjs', 'config/**/*.js', 'ember-cli-build.js'],
plugins: {
n,
},
Expand Down Expand Up @@ -138,4 +126,4 @@ export default ts.config(
},
},
},
);
]);
63 changes: 31 additions & 32 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
"repository": "",
"license": "MIT",
"author": "",
"exports": {
"./tests/*": "./tests/*",
"./*": "./app/*"
},
"directories": {
"doc": "doc",
"test": "tests"
Expand Down Expand Up @@ -39,41 +43,36 @@
"type": "app",
"version": 2
},
"exports": {
"./tests/*": "./tests/*",
"./*": "./app/*"
},
"devDependencies": {
"@babel/core": "^7.28.5",
"@babel/eslint-parser": "^7.28.5",
"@babel/core": "^7.28.6",
"@babel/eslint-parser": "^7.28.6",
"@babel/plugin-transform-runtime": "^7.28.5",
"@babel/plugin-transform-typescript": "^7.28.5",
"@babel/runtime": "^7.28.4",
"@ember/app-tsconfig": "^1.0.3",
"@babel/plugin-transform-typescript": "^7.28.6",
"@babel/runtime": "^7.28.6",
"@ember/app-tsconfig": "^2.0.0",
"@ember/optional-features": "^2.3.0",
"@ember/string": "^4.0.1",
"@ember/test-helpers": "^5.4.1",
"@ember/test-waiters": "^4.1.1",
"@embroider/compat": "^4.1.11",
"@embroider/compat": "^4.1.12",
"@embroider/config-meta-loader": "^1.0.0",
"@embroider/core": "^4.4.1",
"@embroider/core": "^4.4.2",
"@embroider/legacy-inspector-support": "^0.1.3",
"@embroider/macros": "^1.19.5",
"@embroider/macros": "^1.19.6",
"@embroider/router": "^3.0.6",
"@embroider/vite": "^1.4.4",
"@embroider/vite": "^1.5.0",
"@eslint/js": "^9.39.2",
"@glimmer/component": "^2.0.0",
"@glint/core": "^1.5.2",
"@glint/ember-tsc": "^1.0.8",
"@glint/ember-tsc": "^1.0.9",
"@glint/template": "^1.7.3",
"@glint/tsserver-plugin": "^2.0.9",
"@rollup/plugin-babel": "^6.1.0",
"@types/qunit": "^2.19.13",
"@types/rsvp": "^4.0.9",
"babel-plugin-ember-template-compilation": "^2.4.1",
"babel-plugin-ember-template-compilation": "^3.1.0",
"concurrently": "^9.2.1",
"decorator-transforms": "^2.3.0",
"ember-auto-import": "^2.12.0",
"ember-cli": "~6.9.1",
"decorator-transforms": "^2.3.1",
"ember-cli": "~6.10.0",
"ember-cli-babel": "^8.2.0",
"ember-cli-deprecation-workflow": "^4.0.0",
"ember-concurrency": "^5.1.0",
Expand All @@ -82,29 +81,29 @@
"ember-page-title": "^9.0.3",
"ember-qunit": "^9.0.4",
"ember-resolver": "^13.1.1",
"ember-source": "~6.9.0",
"ember-source": "~6.10.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^7.9.3",
"ember-truth-helpers": "^5.0.0",
"eslint": "^9.39.2",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-ember": "^12.7.5",
"eslint-plugin-n": "^17.23.1",
"eslint-plugin-n": "^17.23.2",
"eslint-plugin-qunit": "^8.2.5",
"globals": "^16.5.0",
"prettier": "^3.7.4",
"eslint-plugin-warp-drive": "^5.8.1",
"globals": "^17.1.0",
"prettier": "^3.8.1",
"prettier-plugin-ember-template-tag": "^2.1.2",
"qunit": "^2.24.3",
"qunit": "^2.25.0",
"qunit-dom": "^3.5.0",
"rsvp": "^4.8.5",
"sass-embedded": "^1.97.1",
"shiki": "^3.20.0",
"stylelint": "^16.26.1",
"stylelint-config-standard": "^39.0.1",
"testem": "^3.16.0",
"tracked-built-ins": "^4.0.0",
"sass-embedded": "^1.97.3",
"shiki": "^3.21.0",
"stylelint": "^17.0.0",
"stylelint-config-standard": "^40.0.0",
"testem": "^3.17.0",
"typescript": "^5.9.3",
"typescript-eslint": "^8.50.1",
"vite": "^7.3.0"
"typescript-eslint": "^8.53.1",
"vite": "^7.3.1"
}
}
2 changes: 1 addition & 1 deletion docs/public/robots.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# http://www.robotstxt.org
# https://www.robotstxt.org/
User-agent: *
Disallow:
7 changes: 6 additions & 1 deletion docs/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
"docs/*": ["./app/*"],
"*": ["./types/*"]
},
"types": ["ember-source/types", "@embroider/core/virtual", "vite/client"]
"types": [
"ember-source/types",
"@embroider/core/virtual",
"vite/client",
"@glint/ember-tsc/types"
]
}
}
2 changes: 1 addition & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* npx eslint --inspect-config
*
*/
import babelParser from '@babel/eslint-parser';
import babelParser from '@babel/eslint-parser/experimental-worker';
import js from '@eslint/js';
import { defineConfig, globalIgnores } from 'eslint/config';
import prettier from 'eslint-config-prettier';
Expand Down
Loading