@ember/app-blueprint 6.11.0 → 6.12.0-alpha.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,9 +3,11 @@ name: CI
3
3
  on:
4
4
  workflow_dispatch:
5
5
  pull_request:
6
+ paths-ignore:
7
+ - '**.md'
6
8
  push:
7
9
  paths-ignore:
8
- - '**/*.md'
10
+ - '**.md'
9
11
  branches:
10
12
  - main
11
13
 
@@ -0,0 +1,3 @@
1
+ export default {
2
+ singleQuote: true,
3
+ };
@@ -1,14 +1,14 @@
1
1
  {
2
2
  "solution": {
3
3
  "@ember/app-blueprint": {
4
- "impact": "minor",
5
- "oldVersion": "6.10.4",
6
- "newVersion": "6.11.0",
7
- "tagName": "latest",
4
+ "impact": "patch",
5
+ "oldVersion": "6.12.0-alpha.3",
6
+ "newVersion": "6.12.0-alpha.4",
7
+ "tagName": "alpha",
8
8
  "constraints": [
9
9
  {
10
- "impact": "minor",
11
- "reason": "Appears in changelog section :rocket: Enhancement"
10
+ "impact": "patch",
11
+ "reason": "Appears in changelog section :bug: Bug Fix"
12
12
  },
13
13
  {
14
14
  "impact": "patch",
@@ -18,5 +18,5 @@
18
18
  "pkgJSONPath": "./package.json"
19
19
  }
20
20
  },
21
- "description": "## Release (2026-02-17)\n\n* @ember/app-blueprint 6.11.0 (minor)\n\n#### :rocket: Enhancement\n* `@ember/app-blueprint`\n * [#222](https://github.com/ember-cli/ember-app-blueprint/pull/222) Promote Beta and update all dependencies for 6.11 release ([@mansona](https://github.com/mansona))\n\n#### :house: Internal\n* `@ember/app-blueprint`\n * [#158](https://github.com/ember-cli/ember-app-blueprint/pull/158) update RELEASE.md ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n"
21
+ "description": "## Release (2026-02-11)\n\n* @ember/app-blueprint 6.12.0-alpha.4 (patch)\n\n#### :bug: Bug Fix\n* `@ember/app-blueprint`\n * [#215](https://github.com/ember-cli/ember-app-blueprint/pull/215) upgrade ember/optional-features to clear install deprecation warnings ([@void-mAlex](https://github.com/void-mAlex))\n * [#209](https://github.com/ember-cli/ember-app-blueprint/pull/209) Remove unnecessary empty lines when `--no-warp-drive` was passed ([@mkszepp](https://github.com/mkszepp))\n * [#205](https://github.com/ember-cli/ember-app-blueprint/pull/205) [bugfix release] Auto-choose correct compilerPath ([@ef4](https://github.com/ef4))\n\n#### :house: Internal\n* `@ember/app-blueprint`\n * [#220](https://github.com/ember-cli/ember-app-blueprint/pull/220) Merge beta into main ([@mansona](https://github.com/mansona))\n * [#218](https://github.com/ember-cli/ember-app-blueprint/pull/218) Prepare Stable Release v6.10.4 ([@github-actions[bot]](https://github.com/apps/github-actions))\n * [#217](https://github.com/ember-cli/ember-app-blueprint/pull/217) update release-plan to support OIDC ([@mansona](https://github.com/mansona))\n * [#203](https://github.com/ember-cli/ember-app-blueprint/pull/203) Prepare Beta Release v6.11.0-beta.2 ([@github-actions[bot]](https://github.com/apps/github-actions))\n * [#206](https://github.com/ember-cli/ember-app-blueprint/pull/206) Merge release into beta ([@mansona](https://github.com/mansona))\n * [#201](https://github.com/ember-cli/ember-app-blueprint/pull/201) Prepare Stable Release v6.10.3 ([@github-actions[bot]](https://github.com/apps/github-actions))\n\n#### Committers: 5\n- Alex ([@void-mAlex](https://github.com/void-mAlex))\n- Chris Manson ([@mansona](https://github.com/mansona))\n- Edward Faulkner ([@ef4](https://github.com/ef4))\n- GitHub Actions [Bot] ([@github-actions](https://github.com/apps/github-actions))\n- Markus Sanin ([@mkszepp](https://github.com/mkszepp))\n"
22
22
  }
package/CHANGELOG.md CHANGED
@@ -1,46 +1,122 @@
1
1
  # Changelog
2
2
 
3
- ## Release (2026-02-17)
3
+ ## Release (2026-02-11)
4
4
 
5
- * @ember/app-blueprint 6.11.0 (minor)
5
+ * @ember/app-blueprint 6.12.0-alpha.4 (patch)
6
+
7
+ #### :bug: Bug Fix
8
+ * `@ember/app-blueprint`
9
+ * [#215](https://github.com/ember-cli/ember-app-blueprint/pull/215) upgrade ember/optional-features to clear install deprecation warnings ([@void-mAlex](https://github.com/void-mAlex))
10
+ * [#209](https://github.com/ember-cli/ember-app-blueprint/pull/209) Remove unnecessary empty lines when `--no-warp-drive` was passed ([@mkszepp](https://github.com/mkszepp))
11
+ * [#205](https://github.com/ember-cli/ember-app-blueprint/pull/205) [bugfix release] Auto-choose correct compilerPath ([@ef4](https://github.com/ef4))
12
+
13
+ #### :house: Internal
14
+ * `@ember/app-blueprint`
15
+ * [#220](https://github.com/ember-cli/ember-app-blueprint/pull/220) Merge beta into main ([@mansona](https://github.com/mansona))
16
+ * [#218](https://github.com/ember-cli/ember-app-blueprint/pull/218) Prepare Stable Release v6.10.4 ([@github-actions[bot]](https://github.com/apps/github-actions))
17
+ * [#217](https://github.com/ember-cli/ember-app-blueprint/pull/217) update release-plan to support OIDC ([@mansona](https://github.com/mansona))
18
+ * [#203](https://github.com/ember-cli/ember-app-blueprint/pull/203) Prepare Beta Release v6.11.0-beta.2 ([@github-actions[bot]](https://github.com/apps/github-actions))
19
+ * [#206](https://github.com/ember-cli/ember-app-blueprint/pull/206) Merge release into beta ([@mansona](https://github.com/mansona))
20
+ * [#201](https://github.com/ember-cli/ember-app-blueprint/pull/201) Prepare Stable Release v6.10.3 ([@github-actions[bot]](https://github.com/apps/github-actions))
21
+
22
+ #### Committers: 5
23
+ - Alex ([@void-mAlex](https://github.com/void-mAlex))
24
+ - Chris Manson ([@mansona](https://github.com/mansona))
25
+ - Edward Faulkner ([@ef4](https://github.com/ef4))
26
+ - GitHub Actions [Bot] ([@github-actions](https://github.com/apps/github-actions))
27
+ - Markus Sanin ([@mkszepp](https://github.com/mkszepp))
28
+
29
+ ## Release (2026-02-08)
30
+
31
+ * @ember/app-blueprint 6.12.0-alpha.3 (minor)
6
32
 
7
33
  #### :rocket: Enhancement
8
34
  * `@ember/app-blueprint`
9
- * [#222](https://github.com/ember-cli/ember-app-blueprint/pull/222) Promote Beta and update all dependencies for 6.11 release ([@mansona](https://github.com/mansona))
35
+ * [#144](https://github.com/ember-cli/ember-app-blueprint/pull/144) feat: move ember-cli-build to `mjs` ([@aklkv](https://github.com/aklkv))
36
+
37
+ #### Committers: 1
38
+ - Alexey Kulakov ([@aklkv](https://github.com/aklkv))
39
+
40
+ ## Release (2026-02-08)
41
+
42
+ * @ember/app-blueprint 6.12.0-alpha.2 (patch)
43
+
44
+ #### :bug: Bug Fix
45
+ * `@ember/app-blueprint`
46
+ * [#119](https://github.com/ember-cli/ember-app-blueprint/pull/119) fix: align linters with recent changes in classic app blueprint ([@aklkv](https://github.com/aklkv))
47
+ * [#208](https://github.com/ember-cli/ember-app-blueprint/pull/208) [Bugfix release] Add `globals.browser` to eslint config for TS files ([@mkszepp](https://github.com/mkszepp))
48
+
49
+ #### Committers: 2
50
+ - Alexey Kulakov ([@aklkv](https://github.com/aklkv))
51
+ - Markus Sanin ([@mkszepp](https://github.com/mkszepp))
52
+
53
+ ## Release (2026-01-25)
54
+
55
+ * @ember/app-blueprint 6.12.0-alpha.1 (patch)
56
+
57
+ #### :memo: Documentation
58
+ * `@ember/app-blueprint`
59
+ * [#204](https://github.com/ember-cli/ember-app-blueprint/pull/204) Update Release.md ([@mansona](https://github.com/mansona))
10
60
 
11
61
  #### :house: Internal
12
62
  * `@ember/app-blueprint`
13
- * [#158](https://github.com/ember-cli/ember-app-blueprint/pull/158) update RELEASE.md ([@mansona](https://github.com/mansona))
63
+ * [#211](https://github.com/ember-cli/ember-app-blueprint/pull/211) fix release-plan alpha tag ([@mansona](https://github.com/mansona))
14
64
 
15
65
  #### Committers: 1
16
66
  - Chris Manson ([@mansona](https://github.com/mansona))
17
67
 
18
- ## Release (2026-02-09)
68
+ ## Release (2026-01-23)
69
+
70
+ * @ember/app-blueprint 6.12.0-beta.0 (minor)
19
71
 
20
- * @ember/app-blueprint 6.10.4 (patch)
72
+ #### :rocket: Enhancement
73
+ * `@ember/app-blueprint`
74
+ * [#190](https://github.com/ember-cli/ember-app-blueprint/pull/190) Promote Beta and update all dependencies for 6.10 release ([@mansona](https://github.com/mansona))
21
75
 
22
76
  #### :bug: Bug Fix
23
77
  * `@ember/app-blueprint`
24
- * [#209](https://github.com/ember-cli/ember-app-blueprint/pull/209) Remove unnecessary empty lines when `--no-warp-drive` was passed ([@mkszepp](https://github.com/mkszepp))
78
+ * [#197](https://github.com/ember-cli/ember-app-blueprint/pull/197) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))
79
+ * [#195](https://github.com/ember-cli/ember-app-blueprint/pull/195) add sort-package-json as a dependency ([@mansona](https://github.com/mansona))
80
+ * [#187](https://github.com/ember-cli/ember-app-blueprint/pull/187) [bugfix beta] Revert "Add --minimal and --no-compat" ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
81
+
82
+ #### :memo: Documentation
83
+ * `@ember/app-blueprint`
84
+ * [#158](https://github.com/ember-cli/ember-app-blueprint/pull/158) update RELEASE.md ([@mansona](https://github.com/mansona))
25
85
 
26
86
  #### :house: Internal
27
87
  * `@ember/app-blueprint`
28
- * [#217](https://github.com/ember-cli/ember-app-blueprint/pull/217) update release-plan to support OIDC ([@mansona](https://github.com/mansona))
88
+ * [#202](https://github.com/ember-cli/ember-app-blueprint/pull/202) Prepare 6.12-alpha ([@mansona](https://github.com/mansona))
89
+ * [#200](https://github.com/ember-cli/ember-app-blueprint/pull/200) Prepare Beta Release v6.11.0-beta.1 ([@github-actions[bot]](https://github.com/apps/github-actions))
90
+ * [#199](https://github.com/ember-cli/ember-app-blueprint/pull/199) Prepare 6.11 Beta ([@mansona](https://github.com/mansona))
29
91
 
30
- #### Committers: 2
92
+ #### Committers: 3
31
93
  - Chris Manson ([@mansona](https://github.com/mansona))
32
- - Markus Sanin ([@mkszepp](https://github.com/mkszepp))
94
+ - [@NullVoxPopuli](https://github.com/NullVoxPopuli)
95
+ - [@github-actions[bot]](https://github.com/apps/github-actions)
33
96
 
34
97
  ## Release (2026-01-23)
35
98
 
36
- * @ember/app-blueprint 6.10.3 (patch)
99
+ * @ember/app-blueprint 6.11.0-beta.1 (minor)
100
+
101
+ #### :rocket: Enhancement
102
+ * `@ember/app-blueprint`
103
+ * [#190](https://github.com/ember-cli/ember-app-blueprint/pull/190) Promote Beta and update all dependencies for 6.10 release ([@mansona](https://github.com/mansona))
37
104
 
38
105
  #### :bug: Bug Fix
39
106
  * `@ember/app-blueprint`
40
- * [#205](https://github.com/ember-cli/ember-app-blueprint/pull/205) [bugfix release] Auto-choose correct compilerPath ([@ef4](https://github.com/ef4))
107
+ * [#197](https://github.com/ember-cli/ember-app-blueprint/pull/197) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))
108
+ * [#195](https://github.com/ember-cli/ember-app-blueprint/pull/195) add sort-package-json as a dependency ([@mansona](https://github.com/mansona))
109
+
110
+ #### :memo: Documentation
111
+ * `@ember/app-blueprint`
112
+ * [#158](https://github.com/ember-cli/ember-app-blueprint/pull/158) update RELEASE.md ([@mansona](https://github.com/mansona))
113
+
114
+ #### :house: Internal
115
+ * `@ember/app-blueprint`
116
+ * [#199](https://github.com/ember-cli/ember-app-blueprint/pull/199) Prepare 6.11 Beta ([@mansona](https://github.com/mansona))
41
117
 
42
118
  #### Committers: 1
43
- - Edward Faulkner ([@ef4](https://github.com/ef4))
119
+ - Chris Manson ([@mansona](https://github.com/mansona))
44
120
 
45
121
  ## Release (2026-01-23)
46
122
 
package/RELEASE.md CHANGED
@@ -19,7 +19,8 @@ The release process during release week should look like this:
19
19
  - Wait for `ember-source` to be released first
20
20
  - Merge any outstanding `Prepare Alpha Release` branches
21
21
  - Do an intial stable release from the `release` branch
22
- - update the dependency on `ember-cli` to point at this release and go through the release process there
22
+ - do the initial stable release on the `ember-cli/ember-cli` repo
23
+ - update the ember-cli dependency on this repo and continue the release process here
23
24
  - Merge `release` into `beta`
24
25
  - Do a `beta` release
25
26
  - Merge `beta` into `main`
@@ -60,6 +61,28 @@ You can use [this saved search](https://github.com/ember-cli/ember-app-blueprint
60
61
  - Merge the `Prepare Release` branch when you are ready to release
61
62
  - Check the `Release Stable` GitHub action to make sure the release succeeded
62
63
 
64
+ ### Release ember-cli and update that dependency
65
+
66
+ - Go to the [ember-cli release process](https://github.com/ember-cli/ember-cli/blob/master/RELEASE.md) and complete the initial stable release
67
+ - Make sure that the ember-cli release process is completed and the new stabel release is on npm before continuing here
68
+ - fetch latest from origin `git fetch`
69
+ - create a new branch to update the ember-cli dependency e.g. `git checkout --no-track -b update-ember-cli origin/release`
70
+ - Update ember-cli
71
+
72
+ ```
73
+ pnpm dlx update-blueprint-deps --filter ember-cli --tag latest files/package.json
74
+ ```
75
+ - commit this update `git commit -am "update ember-cli dependency to latest"`
76
+ - push and open a PR targeting `release` with a PR title like `Update ember-cli to 6.4`
77
+ - mark this PR as a `bug` to make sure it goes out in a patch release
78
+ - check that everything is ok (i.e. that CI has run correctly and that you have the changes you expect)
79
+ - merge the PR
80
+ - check that the `Prepare Release` PR has been correctly opened by `release-plan`
81
+ - note: if there are a lot of unrelated PRs (e.g. for previous releases) that you don't want in the release notes you can add the `ignore` label to them
82
+ - Merge the `Prepare Release` branch when you are ready to release
83
+ - Check the `Release Stable` GitHub action to make sure the release succeeded
84
+
85
+
63
86
  ### Beta release from the `beta` branch
64
87
 
65
88
  - fetch latest from origin `git fetch`
@@ -70,11 +93,13 @@ You can use [this saved search](https://github.com/ember-cli/ember-app-blueprint
70
93
  - **make sure to not update any .github/workflows/publish.yml file** this should still publish a beta release
71
94
  - make sure to not update the version in the package.json during this step, that step comes later
72
95
  - make sure to not remove the `release-plan` config section of the the `package.json` during this step.
96
+ - commit this merge
73
97
  - merge master into this new branch too e.g. `git merge origin/main --no-ff`
74
98
  - **make sure to not update the .release-plan file** this should only ever be changed by the release-plan github scripts
75
99
  - **make sure to not update the CHANGELOG.md file** in this step. It should match the changelog on `origin/release` at this stage.
76
100
  - update the alpha version in package.json to be a beta i.e. if the incoming merge is `"version": "6.6.0-alpha.3",` update it to `"version": "6.6.0-beta.0",`
77
101
  - make sure not to update the `release-plan` config in `package.json`
102
+ - commit this merge
78
103
  - Update blueprint dependencies to beta
79
104
 
80
105
  ```
@@ -88,6 +113,7 @@ You can use [this saved search](https://github.com/ember-cli/ember-app-blueprint
88
113
  - merge the `merge-release` branch into `beta` in GitHub
89
114
  - check that the `Prepare Beta Release` PR has been correctly opened by `release-plan`
90
115
  - note: the release-plan config will automatically make this version a pre-release
116
+ - note: if there are a lot of PRs for previous releases that you don't want in the release notes you can add the `ignore` label to them
91
117
  - Merge the `Prepare Beta Release` when you are ready to release the next beta version
92
118
  - Check the `Release Beta` GitHub action to make sure the release succeeded
93
119
 
@@ -116,6 +142,8 @@ You can use [this saved search](https://github.com/ember-cli/ember-app-blueprint
116
142
  - check that everything is ok i.e. CI passes
117
143
  - merge the `merge-beta` branch into `main` in GitHub
118
144
  - check that the `Prepare Alpha Release` PR has been correctly opened by `release-plan`
145
+ - note: the release-plan config will automatically make this version a pre-release
146
+ - note: if there are a lot of PRs for previous releases that you don't want in the release notes you can add the `ignore` label to them
119
147
  - Merge the `Prepare Alpha Release` when you are ready to release the next alpha version
120
148
  - Check the `Release Alpha` GitHub action to make sure the release succeeded
121
149
 
@@ -60,6 +60,7 @@ export default defineConfig([
60
60
  },
61
61
  },
62
62
  {
63
+ ...qunit.configs.recommended,
63
64
  files: ['tests/**/*-test.{js,gjs}'],
64
65
  plugins: {
65
66
  qunit,
@@ -69,7 +70,8 @@ export default defineConfig([
69
70
  * CJS node files
70
71
  */
71
72
  {
72
- files: ['**/*.cjs', 'config/**/*.js', 'ember-cli-build.js'],
73
+ ...n.configs['flat/recommended-script'],
74
+ files: ['**/*.cjs', 'config/**/*.js'],
73
75
  plugins: {
74
76
  n,
75
77
  },
@@ -86,6 +88,7 @@ export default defineConfig([
86
88
  * ESM node files
87
89
  */
88
90
  {
91
+ ...n.configs['flat/recommended-module'],
89
92
  files: ['**/*.mjs'],
90
93
  plugins: {
91
94
  n,
@@ -12,6 +12,9 @@
12
12
  * npx eslint --inspect-config
13
13
  *
14
14
  */
15
+ import { dirname } from 'node:path';
16
+ import { fileURLToPath } from 'node:url';
17
+
15
18
  import globals from 'globals';
16
19
  import js from '@eslint/js';
17
20
  import { defineConfig, globalIgnores } from 'eslint/config';
@@ -35,7 +38,7 @@ const parserOptions = {
35
38
  },
36
39
  ts: {
37
40
  projectService: true,
38
- tsconfigRootDir: import.meta.dirname,
41
+ tsconfigRootDir: dirname(fileURLToPath(import.meta.url)),
39
42
  },
40
43
  },
41
44
  };
@@ -76,10 +79,14 @@ export default defineConfig([
76
79
  languageOptions: {
77
80
  parser: ember.parser,
78
81
  parserOptions: parserOptions.esm.ts,
82
+ globals: {
83
+ ...globals.browser,
84
+ },
79
85
  },
80
86
  extends: [...ts.configs.recommendedTypeChecked, ember.configs.gts],
81
87
  },
82
88
  {
89
+ ...qunit.configs.recommended,
83
90
  files: ['tests/**/*-test.{js,gjs,ts,gts}'],
84
91
  plugins: {
85
92
  qunit,
@@ -89,7 +96,8 @@ export default defineConfig([
89
96
  * CJS node files
90
97
  */
91
98
  {
92
- files: ['**/*.cjs', 'config/**/*.js', 'ember-cli-build.js'],
99
+ ...n.configs['flat/recommended-script'],
100
+ files: ['**/*.cjs', 'config/**/*.js'],
93
101
  plugins: {
94
102
  n,
95
103
  },
@@ -106,6 +114,7 @@ export default defineConfig([
106
114
  * ESM node files
107
115
  */
108
116
  {
117
+ ...n.configs['flat/recommended-module'],
109
118
  files: ['**/*.mjs'],
110
119
  plugins: {
111
120
  n,
package/eslint.config.mjs CHANGED
@@ -9,7 +9,7 @@ export default [
9
9
  },
10
10
  {
11
11
  files: [
12
- 'files/*/app/**/*.js',
12
+ 'files/app/**/*.js',
13
13
  'files-override/**/*.mjs',
14
14
  'files-override/*/app/**/*.js',
15
15
  'files-override/*/tests/**/*.js',
@@ -27,7 +27,7 @@ export default [
27
27
  {
28
28
  ignores: [
29
29
  'tests/fixtures/*',
30
- 'files/ember-cli-build.js',
30
+ 'files/ember-cli-build.mjs',
31
31
  'conditional-files/_js_*',
32
32
  'conditional-files/_ts_*',
33
33
  ],
@@ -1,36 +1,11 @@
1
1
  export default {
2
2
  plugins: ['prettier-plugin-ember-template-tag'],
3
- singleQuote: true,
4
3
  overrides: [
5
4
  {
6
- files: ['*.js', '*.ts', '*.cjs', '.mjs', '.cts', '.mts', '.cts'],
7
- options: {
8
- trailingComma: 'es5',
9
- },
10
- },
11
- {
12
- files: ['*.html'],
13
- options: {
14
- singleQuote: false,
15
- },
16
- },
17
- {
18
- files: ['*.json'],
19
- options: {
20
- singleQuote: false,
21
- },
22
- },
23
- {
24
- files: ['*.hbs'],
25
- options: {
26
- singleQuote: false,
27
- },
28
- },
29
- {
30
- files: ['*.gjs', '*.gts'],
5
+ files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
31
6
  options: {
7
+ singleQuote: true,
32
8
  templateSingleQuote: false,
33
- trailingComma: 'es5',
34
9
  },
35
10
  },
36
11
  ],
@@ -0,0 +1,27 @@
1
+ import loadConfigFromMeta from '@embroider/config-meta-loader';
2
+ import { assert } from '@ember/debug';
3
+
4
+ const config = loadConfigFromMeta('<%= name %>');
5
+
6
+ assert(
7
+ 'config is not an object',
8
+ typeof config === 'object' && config !== null,
9
+ );
10
+ assert(
11
+ 'modulePrefix was not detected on your config',
12
+ 'modulePrefix' in config && typeof config.modulePrefix === 'string',
13
+ );
14
+ assert(
15
+ 'locationType was not detected on your config',
16
+ 'locationType' in config && typeof config.locationType === 'string',
17
+ );
18
+ assert(
19
+ 'rootURL was not detected on your config',
20
+ 'rootURL' in config && typeof config.rootURL === 'string',
21
+ );
22
+ assert(
23
+ 'APP was not detected on your config',
24
+ 'APP' in config && typeof config.APP === 'object',
25
+ );
26
+
27
+ export default config;
@@ -5,23 +5,23 @@ const config = loadConfigFromMeta('<%= name %>') as unknown;
5
5
 
6
6
  assert(
7
7
  'config is not an object',
8
- typeof config === 'object' && config !== null
8
+ typeof config === 'object' && config !== null,
9
9
  );
10
10
  assert(
11
11
  'modulePrefix was not detected on your config',
12
- 'modulePrefix' in config && typeof config.modulePrefix === 'string'
12
+ 'modulePrefix' in config && typeof config.modulePrefix === 'string',
13
13
  );
14
14
  assert(
15
15
  'locationType was not detected on your config',
16
- 'locationType' in config && typeof config.locationType === 'string'
16
+ 'locationType' in config && typeof config.locationType === 'string',
17
17
  );
18
18
  assert(
19
19
  'rootURL was not detected on your config',
20
- 'rootURL' in config && typeof config.rootURL === 'string'
20
+ 'rootURL' in config && typeof config.rootURL === 'string',
21
21
  );
22
22
  assert(
23
23
  'APP was not detected on your config',
24
- 'APP' in config && typeof config.APP === 'object'
24
+ 'APP' in config && typeof config.APP === 'object',
25
25
  );
26
26
 
27
27
  export default config as {
@@ -1,17 +1,17 @@
1
- 'use strict';
1
+ <% if (warpDrive) {%>import { dirname } from 'node:path';
2
+ import { fileURLToPath } from 'node:url';
3
+ <% } %>import EmberApp from 'ember-cli/lib/broccoli/ember-app.js';
4
+ import { compatBuild } from '@embroider/compat';
2
5
 
3
- const EmberApp = require('ember-cli/lib/broccoli/ember-app');
4
- const { compatBuild } = require('@embroider/compat');
5
-
6
- module.exports = async function (defaults) {
6
+ export default async function (defaults) {
7
7
  <% if (warpDrive) {%>const { setConfig } = await import('@warp-drive/core/build-config');
8
8
  <% } %>const { buildOnce } = await import('@embroider/vite');
9
9
 
10
- let app = new EmberApp(defaults, {
10
+ const app = new EmberApp(defaults, {
11
11
  // Add options here
12
12
  });
13
13
  <% if (warpDrive) {%>
14
- setConfig(app, __dirname, {
14
+ setConfig(app, dirname(fileURLToPath(import.meta.url)), {
15
15
  // this should be the most recent <major>.<minor> version for
16
16
  // which all deprecations have been fully resolved
17
17
  // and should be updated when that changes
@@ -22,4 +22,4 @@ module.exports = async function (defaults) {
22
22
  });
23
23
  <% } %>
24
24
  return compatBuild(app, buildOnce);
25
- };
25
+ }
package/files/gitignore CHANGED
@@ -14,12 +14,5 @@
14
14
  /testem.log
15
15
  /yarn-error.log
16
16
 
17
- # ember-try
18
- /.node_modules.ember-try/
19
- /npm-shrinkwrap.json.ember-try
20
- /package.json.ember-try
21
- /package-lock.json.ember-try
22
- /yarn.lock.ember-try
23
-
24
17
  # broccoli-debug
25
18
  /DEBUG/
@@ -31,28 +31,28 @@
31
31
  "./*": "./app/*"
32
32
  },
33
33
  "devDependencies": {
34
- "@babel/core": "^7.29.0",
34
+ "@babel/core": "^7.28.6",
35
35
  "@babel/runtime": "^7.28.6",
36
- "@babel/plugin-transform-runtime": "^7.29.0<% if (typescript) { %>",
36
+ "@babel/plugin-transform-runtime": "^7.28.5<% if (typescript) { %>",
37
37
  "@babel/plugin-transform-typescript": "^7.28.6<% } %>",
38
38
  "@babel/eslint-parser": "^7.28.6<% if (typescript) { %>",
39
39
  "@ember/app-tsconfig": "^1.0.3<% } %>",
40
- "@ember/optional-features": "^2.3.0",
40
+ "@ember/optional-features": "^3.0.0",
41
41
  "@ember/string": "^4.0.1",
42
42
  "@ember/test-helpers": "^5.4.1",
43
43
  "@ember/test-waiters": "^4.1.1",
44
- "@embroider/macros": "^1.19.7",
45
- "@embroider/core": "^4.4.3",
46
- "@embroider/vite": "^1.5.2",
47
- "@embroider/compat": "^4.1.13",
44
+ "@embroider/macros": "^1.19.6",
45
+ "@embroider/core": "^4.4.2",
46
+ "@embroider/vite": "^1.5.0",
47
+ "@embroider/compat": "^4.1.12",
48
48
  "@embroider/router": "^3.0.6",
49
49
  "@embroider/config-meta-loader": "^1.0.0",
50
50
  "@embroider/legacy-inspector-support": "^0.1.3",
51
51
  "@eslint/js": "^9.39.2",
52
52
  "@glimmer/component": "^2.0.0<% if (typescript) { %>",
53
- "@glint/ember-tsc": "^1.1.1",
54
- "@glint/template": "^1.7.4",
55
- "@glint/tsserver-plugin": "^2.1.0<% } %>",
53
+ "@glint/ember-tsc": "^1.0.9",
54
+ "@glint/template": "^1.7.3",
55
+ "@glint/tsserver-plugin": "^2.0.9<% } %>",
56
56
  "@rollup/plugin-babel": "^6.1.0<% if (typescript) { %>",
57
57
  "@types/qunit": "^2.19.13",
58
58
  "@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>",
@@ -64,37 +64,37 @@
64
64
  "babel-plugin-ember-template-compilation": "^3.1.0",
65
65
  "concurrently": "^9.2.1",
66
66
  "decorator-transforms": "^2.3.1",
67
- "ember-cli": "~6.10.2",
68
- "ember-cli-babel": "^8.3.1",
67
+ "ember-cli": "~6.10.0",
68
+ "ember-cli-babel": "^8.2.0",
69
69
  "ember-cli-deprecation-workflow": "^3.4.0",
70
70
  "ember-load-initializers": "^3.0.1",
71
- "ember-modifier": "^4.3.0",
71
+ "ember-modifier": "^4.2.2",
72
72
  "ember-page-title": "^9.0.3",
73
73
  "ember-qunit": "^9.0.4",
74
74
  "ember-resolver": "^13.1.1",
75
- "ember-source": "~6.11.0",
75
+ "ember-source": "~6.11.0-alpha.6",
76
76
  "ember-template-lint": "^7.9.3<% if (welcome) { %>",
77
77
  "ember-welcome-page": "^8.0.5<% } %>",
78
78
  "eslint": "^9.39.2",
79
79
  "eslint-config-prettier": "^10.1.8",
80
80
  "eslint-plugin-ember": "^12.7.5",
81
- "eslint-plugin-n": "^17.24.0",
82
- "eslint-plugin-qunit": "^8.2.6<% if (warpDrive) { %>",
81
+ "eslint-plugin-n": "^17.23.2",
82
+ "eslint-plugin-qunit": "^8.2.5<% if (warpDrive) { %>",
83
83
  "eslint-plugin-warp-drive": "^5.8.1<% } %>",
84
84
  "globals": "^16.5.0",
85
- "prettier": "^3.8.1",
86
- "prettier-plugin-ember-template-tag": "^2.1.3",
85
+ "prettier": "^3.8.0",
86
+ "prettier-plugin-ember-template-tag": "^2.1.2",
87
87
  "qunit": "^2.25.0",
88
88
  "qunit-dom": "^3.5.0",
89
89
  "stylelint": "^16.26.1",
90
90
  "stylelint-config-standard": "^38.0.0",
91
91
  "testem": "^3.17.0<% if (typescript) { %>",
92
92
  "typescript": "^5.9.3",
93
- "typescript-eslint": "^8.56.0<% } %>",
93
+ "typescript-eslint": "^8.53.0<% } %>",
94
94
  "vite": "^7.3.1"
95
95
  },
96
96
  "engines": {
97
- "node": ">= 20"
97
+ "node": ">= 20.19.0"
98
98
  },
99
99
  "ember": {
100
100
  "edition": "octane"
package/index.js CHANGED
@@ -136,11 +136,20 @@ module.exports = {
136
136
  }
137
137
 
138
138
  if (!options.typescript) {
139
+ // Exclude TypeScript-only files for JavaScript apps.
140
+ // Note: app/config/environment.ts is excluded explicitly because
141
+ // shouldTransformTypeScript strips trailing commas when converting to JS,
142
+ // causing Prettier failures. We use a separate .js file instead.
139
143
  files = files.filter(
140
144
  (file) =>
141
- !['tsconfig.json', 'app/config/', 'types/'].includes(file) &&
145
+ file !== 'tsconfig.json' &&
146
+ file !== 'app/config/environment.ts' &&
147
+ !file.startsWith('types/') &&
142
148
  !file.endsWith('.d.ts'),
143
149
  );
150
+ } else {
151
+ // For TypeScript apps, exclude the JS version of app/config/environment
152
+ files = files.filter((file) => file !== 'app/config/environment.js');
144
153
  }
145
154
 
146
155
  const warpDrive = options.warpDrive || options.emberData;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ember/app-blueprint",
3
- "version": "6.11.0",
3
+ "version": "6.12.0-alpha.4",
4
4
  "description": "Blueprint for next generation of Ember apps",
5
5
  "keywords": [
6
6
  "ember-blueprint"
@@ -12,6 +12,14 @@
12
12
  "license": "MIT",
13
13
  "author": "",
14
14
  "main": "index.js",
15
+ "release-plan": {
16
+ "semverIncrementAs": {
17
+ "minor": "prerelease",
18
+ "patch": "prerelease"
19
+ },
20
+ "semverIncrementTag": "alpha",
21
+ "publishTag": "alpha"
22
+ },
15
23
  "dependencies": {
16
24
  "chalk": "^4.1.2",
17
25
  "ejs": "^3.1.10",
package/.prettierrc.cjs DELETED
@@ -1,13 +0,0 @@
1
- 'use strict';
2
-
3
- module.exports = {
4
- singleQuote: true,
5
- overrides: [
6
- {
7
- files: ['*.js', '*.ts', '*.cjs', '.mjs', '.cts', '.mts', '.cts'],
8
- options: {
9
- singleQuote: true,
10
- },
11
- },
12
- ],
13
- };