ember-cli 7.2.0-alpha.1 → 7.2.0-beta.1
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.
- package/CHANGELOG.md +40 -46
- package/RELEASE.md +6 -5
- package/docs/build/data.json +24 -9
- package/lib/models/project.js +13 -5
- package/lib/utilities/version-utils.js +6 -1
- package/package.json +23 -22
- package/packages/addon-blueprint/package.json +5 -5
- package/packages/app-blueprint/files/package.json +18 -18
- package/packages/app-blueprint/package.json +4 -4
- package/tests/helpers/acceptance.js +1 -7
- package/tests/helpers/fixturify-project.js +29 -137
- package/tests/helpers/per-bundle-addon-cache.js +17 -23
- package/packages/blueprint-blueprint/files/blueprints/__name__/files/.gitkeep +0 -0
- package/packages/blueprint-blueprint/files/blueprints/__name__/index.js +0 -16
- package/packages/blueprint-blueprint/index.js +0 -5
- package/packages/blueprint-blueprint/package.json +0 -13
- package/packages/blueprint-model/index.js +0 -1807
- package/packages/blueprint-model/node_modules/.bin/markdown-it +0 -21
- package/packages/blueprint-model/package.json +0 -31
- package/packages/blueprint-model/utilities/clean-remove.js +0 -31
- package/packages/blueprint-model/utilities/directory-for-package-name.js +0 -31
- package/packages/blueprint-model/utilities/edit-file-diff.js +0 -64
- package/packages/blueprint-model/utilities/experiments.js +0 -63
- package/packages/blueprint-model/utilities/file-info.js +0 -170
- package/packages/blueprint-model/utilities/insert-into-file.js +0 -125
- package/packages/blueprint-model/utilities/is-addon.js +0 -5
- package/packages/blueprint-model/utilities/markdown-color.js +0 -208
- package/packages/blueprint-model/utilities/open-editor.js +0 -44
- package/packages/blueprint-model/utilities/prepend-emoji.js +0 -12
- package/packages/blueprint-model/utilities/print-command.js +0 -102
- package/packages/blueprint-model/utilities/process-template.js +0 -10
- package/packages/blueprint-model/utilities/sequence.js +0 -42
- package/packages/blueprint-model/utilities/walk-up-path.js +0 -23
package/CHANGELOG.md
CHANGED
|
@@ -1,33 +1,35 @@
|
|
|
1
1
|
# ember-cli Changelog
|
|
2
2
|
|
|
3
|
-
## Release (2026-
|
|
3
|
+
## Release (2026-08-15)
|
|
4
4
|
|
|
5
|
-
* ember-cli 7.2.0-
|
|
6
|
-
* @ember-tooling/classic-build-addon-blueprint 7.2.0-
|
|
7
|
-
* @ember-tooling/classic-build-app-blueprint 7.2.0-
|
|
8
|
-
* @ember-tooling/blueprint-model 0.7.0 (minor)
|
|
5
|
+
* ember-cli 7.2.0-beta.1 (minor)
|
|
6
|
+
* @ember-tooling/classic-build-addon-blueprint 7.2.0-beta.1 (minor)
|
|
7
|
+
* @ember-tooling/classic-build-app-blueprint 7.2.0-beta.1 (minor)
|
|
9
8
|
|
|
10
9
|
#### :rocket: Enhancement
|
|
11
|
-
* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint
|
|
12
|
-
* [#
|
|
10
|
+
* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
|
|
11
|
+
* [#11042](https://github.com/ember-cli/ember-cli/pull/11042) Prepare 7.2 Beta ([@mansona](https://github.com/mansona))
|
|
13
12
|
* `@ember-tooling/classic-build-addon-blueprint`
|
|
14
13
|
* [#11035](https://github.com/ember-cli/ember-cli/pull/11035) Add placeholder for documenting exports from an addon ([@kategengler](https://github.com/kategengler))
|
|
15
|
-
* `ember-cli
|
|
14
|
+
* `ember-cli`
|
|
16
15
|
* [#10672](https://github.com/ember-cli/ember-cli/pull/10672) Separate blueprint model so it can be used outside of ember-cli ([@mansona](https://github.com/mansona))
|
|
17
16
|
|
|
18
17
|
#### :bug: Bug Fix
|
|
19
18
|
* `ember-cli`
|
|
19
|
+
* [#11050](https://github.com/ember-cli/ember-cli/pull/11050) fix default blueprint lookup ([@mansona](https://github.com/mansona))
|
|
20
20
|
* [#11027](https://github.com/ember-cli/ember-cli/pull/11027) Fix error when blueprint is missing keyword ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
|
|
21
|
-
* [#11028](https://github.com/ember-cli/ember-cli/pull/11028) [BUGFIX release] fix require(esm) of blueprint indexes ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
|
|
22
21
|
|
|
23
22
|
#### :house: Internal
|
|
24
23
|
* `ember-cli`
|
|
24
|
+
* [#11051](https://github.com/ember-cli/ember-cli/pull/11051) fix release-plan ([@mansona](https://github.com/mansona))
|
|
25
|
+
* [#11052](https://github.com/ember-cli/ember-cli/pull/11052) speed up windows CI ([@mansona](https://github.com/mansona))
|
|
26
|
+
* [#11049](https://github.com/ember-cli/ember-cli/pull/11049) fix help tests to stop relying on private APIs ([@mansona](https://github.com/mansona))
|
|
27
|
+
* [#11048](https://github.com/ember-cli/ember-cli/pull/11048) update fixturify-project from v2 to v7 ([@mansona](https://github.com/mansona))
|
|
28
|
+
* [#11044](https://github.com/ember-cli/ember-cli/pull/11044) add a notify discord webhook action for CI ([@mansona](https://github.com/mansona))
|
|
29
|
+
* [#11023](https://github.com/ember-cli/ember-cli/pull/11023) Update RELEASE.md ([@mansona](https://github.com/mansona))
|
|
25
30
|
* [#11037](https://github.com/ember-cli/ember-cli/pull/11037) bring test fixtures in line with updates from addon readme ([@void-mAlex](https://github.com/void-mAlex))
|
|
26
31
|
* [#11038](https://github.com/ember-cli/ember-cli/pull/11038) fix running tests on blueprint markdown changes ([@mansona](https://github.com/mansona))
|
|
27
32
|
* [#10880](https://github.com/ember-cli/ember-cli/pull/10880) stop using internal package cache in the addon smoke test and rely on pnpm caching ([@mansona](https://github.com/mansona))
|
|
28
|
-
* [#11033](https://github.com/ember-cli/ember-cli/pull/11033) Merge release into beta ([@mansona](https://github.com/mansona))
|
|
29
|
-
* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
|
|
30
|
-
* [#11029](https://github.com/ember-cli/ember-cli/pull/11029) Prepare Beta Release ([@mansona](https://github.com/mansona))
|
|
31
33
|
|
|
32
34
|
#### Committers: 4
|
|
33
35
|
- Alex ([@void-mAlex](https://github.com/void-mAlex))
|
|
@@ -35,28 +37,36 @@
|
|
|
35
37
|
- Katie Gengler ([@kategengler](https://github.com/kategengler))
|
|
36
38
|
- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
|
|
37
39
|
|
|
38
|
-
## Release (2026-
|
|
40
|
+
## Release (2026-07-01)
|
|
39
41
|
|
|
40
|
-
* ember-cli 7.1.0
|
|
41
|
-
* @ember-tooling/classic-build-addon-blueprint 7.1.0
|
|
42
|
-
* @ember-tooling/classic-build-app-blueprint 7.1.0
|
|
43
|
-
* @ember-tooling/blueprint-model 0.6.3 (patch)
|
|
42
|
+
* ember-cli 7.1.0 (minor)
|
|
43
|
+
* @ember-tooling/classic-build-addon-blueprint 7.1.0 (minor)
|
|
44
|
+
* @ember-tooling/classic-build-app-blueprint 7.1.0 (minor)
|
|
44
45
|
|
|
45
46
|
#### :rocket: Enhancement
|
|
47
|
+
* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
|
|
48
|
+
* [#11040](https://github.com/ember-cli/ember-cli/pull/11040) Promote Beta and update all dependencies for 7.1 release ([@mansona](https://github.com/mansona))
|
|
46
49
|
* `ember-cli`
|
|
47
50
|
* [#10610](https://github.com/ember-cli/ember-cli/pull/10610) use semver-deprecate instead of internal code ([@mansona](https://github.com/mansona))
|
|
48
51
|
* [#11008](https://github.com/ember-cli/ember-cli/pull/11008) update babel-remove-types to v2 ([@mansona](https://github.com/mansona))
|
|
49
52
|
* [#11009](https://github.com/ember-cli/ember-cli/pull/11009) update configstore to v8 ([@mansona](https://github.com/mansona))
|
|
53
|
+
* `@ember-tooling/classic-build-app-blueprint`, `ember-cli`
|
|
54
|
+
* [#11006](https://github.com/ember-cli/ember-cli/pull/11006) update ember-welcome-page to v8 in app blueprint ([@mansona](https://github.com/mansona))
|
|
55
|
+
* [#11005](https://github.com/ember-cli/ember-cli/pull/11005) update ember-cli-deprecation-workflow to v4 ([@mansona](https://github.com/mansona))
|
|
56
|
+
* [#11003](https://github.com/ember-cli/ember-cli/pull/11003) update @ember/optional-features to v3 ([@mansona](https://github.com/mansona))
|
|
50
57
|
|
|
51
58
|
#### :bug: Bug Fix
|
|
52
|
-
* `ember-cli
|
|
59
|
+
* `ember-cli`
|
|
53
60
|
* [#11020](https://github.com/ember-cli/ember-cli/pull/11020) Update diff to latest v8.x ([@mkszepp](https://github.com/mkszepp))
|
|
54
61
|
|
|
55
62
|
#### :house: Internal
|
|
56
63
|
* `ember-cli`
|
|
64
|
+
* [#11033](https://github.com/ember-cli/ember-cli/pull/11033) Merge release into beta ([@mansona](https://github.com/mansona))
|
|
57
65
|
* [#11017](https://github.com/ember-cli/ember-cli/pull/11017) Add Sync Output Repos check to release instructions ([@kategengler](https://github.com/kategengler))
|
|
58
66
|
* [#11016](https://github.com/ember-cli/ember-cli/pull/11016) fix: sync-output-repos workflow failing on tag pushes ([@Copilot](https://github.com/apps/copilot-swe-agent))
|
|
59
67
|
* [#10999](https://github.com/ember-cli/ember-cli/pull/10999) update RELEASE with update-blueprint-deps commands ([@mansona](https://github.com/mansona))
|
|
68
|
+
* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
|
|
69
|
+
* [#11029](https://github.com/ember-cli/ember-cli/pull/11029) Prepare Beta Release ([@mansona](https://github.com/mansona))
|
|
60
70
|
|
|
61
71
|
#### Committers: 4
|
|
62
72
|
- Chris Manson ([@mansona](https://github.com/mansona))
|
|
@@ -64,42 +74,26 @@
|
|
|
64
74
|
- Katie Gengler ([@kategengler](https://github.com/kategengler))
|
|
65
75
|
- Markus Sanin ([@mkszepp](https://github.com/mkszepp))
|
|
66
76
|
|
|
67
|
-
## Release (2026-
|
|
68
|
-
|
|
69
|
-
* ember-cli 7.1.0-alpha.2 (minor)
|
|
70
|
-
* @ember-tooling/classic-build-app-blueprint 7.1.0-alpha.2 (minor)
|
|
71
|
-
|
|
72
|
-
#### :rocket: Enhancement
|
|
73
|
-
* `@ember-tooling/classic-build-app-blueprint`, `ember-cli`
|
|
74
|
-
* [#11006](https://github.com/ember-cli/ember-cli/pull/11006) update ember-welcome-page to v8 in app blueprint ([@mansona](https://github.com/mansona))
|
|
75
|
-
* [#11005](https://github.com/ember-cli/ember-cli/pull/11005) update ember-cli-deprecation-workflow to v4 ([@mansona](https://github.com/mansona))
|
|
76
|
-
* [#11003](https://github.com/ember-cli/ember-cli/pull/11003) update @ember/optional-features to v3 ([@mansona](https://github.com/mansona))
|
|
77
|
-
|
|
78
|
-
#### Committers: 1
|
|
79
|
-
- Chris Manson ([@mansona](https://github.com/mansona))
|
|
80
|
-
|
|
81
|
-
## Release (2026-04-24)
|
|
77
|
+
## Release (2026-05-22)
|
|
82
78
|
|
|
83
|
-
* ember-cli 7.
|
|
84
|
-
* @ember-tooling/classic-build-addon-blueprint 7.1.0-alpha.1 (minor)
|
|
85
|
-
* @ember-tooling/classic-build-app-blueprint 7.1.0-alpha.1 (minor)
|
|
79
|
+
* ember-cli 7.0.1 (patch)
|
|
86
80
|
|
|
87
|
-
#### :
|
|
88
|
-
* `ember-cli
|
|
89
|
-
* [#
|
|
81
|
+
#### :bug: Bug Fix
|
|
82
|
+
* `ember-cli`
|
|
83
|
+
* [#11028](https://github.com/ember-cli/ember-cli/pull/11028) [BUGFIX release] fix require(esm) of blueprint indexes ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
|
|
90
84
|
|
|
91
85
|
#### Committers: 1
|
|
92
|
-
-
|
|
86
|
+
- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
|
|
93
87
|
|
|
94
|
-
## Release (2026-
|
|
88
|
+
## Release (2026-05-15)
|
|
95
89
|
|
|
96
|
-
* ember-cli 7.0.0
|
|
97
|
-
* @ember-tooling/classic-build-addon-blueprint 7.0.0
|
|
98
|
-
* @ember-tooling/classic-build-app-blueprint 7.0.0
|
|
90
|
+
* ember-cli 7.0.0 (major)
|
|
91
|
+
* @ember-tooling/classic-build-addon-blueprint 7.0.0 (major)
|
|
92
|
+
* @ember-tooling/classic-build-app-blueprint 7.0.0 (major)
|
|
99
93
|
|
|
100
|
-
#### :
|
|
94
|
+
#### :boom: Breaking Change
|
|
101
95
|
* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
|
|
102
|
-
* [#
|
|
96
|
+
* [#11022](https://github.com/ember-cli/ember-cli/pull/11022) Promote Beta and update all dependencies for 7.0 release ([@mansona](https://github.com/mansona))
|
|
103
97
|
|
|
104
98
|
#### Committers: 1
|
|
105
99
|
- Chris Manson ([@mansona](https://github.com/mansona))
|
package/RELEASE.md
CHANGED
|
@@ -41,11 +41,11 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i
|
|
|
41
41
|
- **make sure to not update the .github/workflows/plan-stable-release.yml file** this should still plan a stable release
|
|
42
42
|
- **make sure to not update the .github/workflows/publish-stable.yml file** this should still publish a stable release
|
|
43
43
|
- **make sure to not update the CHANGELOG.md file** so as not to include the beta or alpha changelogs in the next release
|
|
44
|
-
- make sure to not update the version in the package.json during this step, this will be release-plan's job
|
|
45
|
-
- make sure to not update the
|
|
46
|
-
- make sure to not add the `release-plan` config section to the package.json during this step. We are releasing a real release so we don't want to configure release-plan to do a pre-release.
|
|
44
|
+
- make sure to not update the version in the `package.json`, `packages/app-blueprint/package.json`, or `packages/addon-blueprint/package.json` files during this step, this will be release-plan's job
|
|
45
|
+
- make sure to not update update the `ember-cli` reference in `packages/app-blueprint/files/package.json`, this has been automated in the release-plan process
|
|
46
|
+
- make sure to not add the `release-plan` config section to the `package.json`, `packages/app-blueprint/package.json`, or `packages/addon-blueprint/package.json` files during this step. We are releasing a real release so we don't want to configure release-plan to do a pre-release.
|
|
47
47
|
- commit the merge `git commit -am "promote beta to release"`
|
|
48
|
-
- Update blueprint dependencies to latest.
|
|
48
|
+
- Update blueprint dependencies to latest.
|
|
49
49
|
|
|
50
50
|
```
|
|
51
51
|
pnpm dlx update-blueprint-deps --filter 'ember-source$' --tag latest ./packages/*-blueprint/**/*ackage.json ./tests/fixtures/**/package.json
|
|
@@ -53,13 +53,14 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i
|
|
|
53
53
|
pnpm dlx update-blueprint-deps --filter '.*' ./package.json ./packages/*-blueprint/**/*ackage.json ./tests/fixtures/*/package.json ./tests/fixtures/*/*/package.json
|
|
54
54
|
```
|
|
55
55
|
|
|
56
|
+
- run `pnpm install` to update your pacakge.lock and download any new dependencies
|
|
56
57
|
- run `pnpm lint:fix`
|
|
57
58
|
- update the @ember/app-blueprint dependency `pnpm i -w @ember/app-blueprint@latest`
|
|
58
59
|
- manually add a `~` back into the `@ember/app-blueprint` dependency in the root package.json
|
|
59
60
|
- run `pnpm install` to make sure the lock file is up to date
|
|
60
61
|
- commit this update `git commit -am "update blueprint dependencies to latest"`
|
|
61
62
|
- push and open a PR targeting `release` with a PR title like `Promote Beta and update all dependencies for 6.4 release`
|
|
62
|
-
- mark this PR as an `enhancement` if it is a minor release
|
|
63
|
+
- mark this PR as an `enhancement` if it is a minor release, or `breaking` if it is a major
|
|
63
64
|
- check that everything is ok (i.e. that CI has run correctly and that you have the changes you expect)
|
|
64
65
|
- merge branch
|
|
65
66
|
- check that the `Prepare Release` PR has been correctly opened by `release-plan`
|
package/docs/build/data.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"logo": "https://ember-cli.com/assets/images/ember-cli-logo-small-dark.png",
|
|
4
4
|
"name": "ember-cli",
|
|
5
5
|
"description": "Command line tool for developing ambitious ember.js apps",
|
|
6
|
-
"version": "7.2.0-
|
|
6
|
+
"version": "7.2.0-beta.1-beta-4798493e0d"
|
|
7
7
|
},
|
|
8
8
|
"files": {
|
|
9
9
|
"lib/broccoli/default-packager.js": {
|
|
@@ -4675,7 +4675,22 @@
|
|
|
4675
4675
|
},
|
|
4676
4676
|
{
|
|
4677
4677
|
"file": "lib/models/project.js",
|
|
4678
|
-
"line":
|
|
4678
|
+
"line": 532,
|
|
4679
|
+
"description": "Returns the built-in ember-cli path for looking up blueprints",
|
|
4680
|
+
"access": "private",
|
|
4681
|
+
"tagname": "",
|
|
4682
|
+
"itemtype": "method",
|
|
4683
|
+
"name": "builtInLookupPath",
|
|
4684
|
+
"return": {
|
|
4685
|
+
"description": "path to the ember-cli built-in blueprints",
|
|
4686
|
+
"type": "String"
|
|
4687
|
+
},
|
|
4688
|
+
"class": "Project",
|
|
4689
|
+
"module": "ember-cli"
|
|
4690
|
+
},
|
|
4691
|
+
{
|
|
4692
|
+
"file": "lib/models/project.js",
|
|
4693
|
+
"line": 543,
|
|
4679
4694
|
"description": "Returns a list of addon paths where blueprints will be looked up.",
|
|
4680
4695
|
"access": "private",
|
|
4681
4696
|
"tagname": "",
|
|
@@ -4690,7 +4705,7 @@
|
|
|
4690
4705
|
},
|
|
4691
4706
|
{
|
|
4692
4707
|
"file": "lib/models/project.js",
|
|
4693
|
-
"line":
|
|
4708
|
+
"line": 566,
|
|
4694
4709
|
"description": "Reloads package.json of the project. Clears and reloads the packageInfo and\nper-bundle addon cache, too.",
|
|
4695
4710
|
"access": "private",
|
|
4696
4711
|
"tagname": "",
|
|
@@ -4705,7 +4720,7 @@
|
|
|
4705
4720
|
},
|
|
4706
4721
|
{
|
|
4707
4722
|
"file": "lib/models/project.js",
|
|
4708
|
-
"line":
|
|
4723
|
+
"line": 594,
|
|
4709
4724
|
"description": "Re-initializes addons.",
|
|
4710
4725
|
"access": "private",
|
|
4711
4726
|
"tagname": "",
|
|
@@ -4716,7 +4731,7 @@
|
|
|
4716
4731
|
},
|
|
4717
4732
|
{
|
|
4718
4733
|
"file": "lib/models/project.js",
|
|
4719
|
-
"line":
|
|
4734
|
+
"line": 607,
|
|
4720
4735
|
"description": "Find an addon by its name",
|
|
4721
4736
|
"access": "public",
|
|
4722
4737
|
"tagname": "",
|
|
@@ -4738,7 +4753,7 @@
|
|
|
4738
4753
|
},
|
|
4739
4754
|
{
|
|
4740
4755
|
"file": "lib/models/project.js",
|
|
4741
|
-
"line":
|
|
4756
|
+
"line": 621,
|
|
4742
4757
|
"description": "Generate test file contents.\n\nThis method is supposed to be overwritten by test framework addons\nlike `ember-qunit`.",
|
|
4743
4758
|
"access": "public",
|
|
4744
4759
|
"tagname": "",
|
|
@@ -4765,7 +4780,7 @@
|
|
|
4765
4780
|
},
|
|
4766
4781
|
{
|
|
4767
4782
|
"file": "lib/models/project.js",
|
|
4768
|
-
"line":
|
|
4783
|
+
"line": 645,
|
|
4769
4784
|
"description": "Returns a new project based on the first `package.json` that is found\nin `pathName`.\n\nIf the above `package.json` specifies `ember-addon.projectRoot`, we load\nthe project based on the relative path between this directory and the\nspecified `projectRoot`.",
|
|
4770
4785
|
"access": "private",
|
|
4771
4786
|
"tagname": "",
|
|
@@ -4793,7 +4808,7 @@
|
|
|
4793
4808
|
},
|
|
4794
4809
|
{
|
|
4795
4810
|
"file": "lib/models/project.js",
|
|
4796
|
-
"line":
|
|
4811
|
+
"line": 696,
|
|
4797
4812
|
"description": "Returns a new project based on the first package.json that is found\nin `pathName`, or the nullProject.\n\nThe nullProject signifies no-project, but abides by the null object pattern",
|
|
4798
4813
|
"access": "private",
|
|
4799
4814
|
"tagname": "",
|
|
@@ -4816,7 +4831,7 @@
|
|
|
4816
4831
|
},
|
|
4817
4832
|
{
|
|
4818
4833
|
"file": "lib/models/project.js",
|
|
4819
|
-
"line":
|
|
4834
|
+
"line": 720,
|
|
4820
4835
|
"description": "Returns the project root based on the first package.json that is found",
|
|
4821
4836
|
"static": 1,
|
|
4822
4837
|
"itemtype": "method",
|
package/lib/models/project.js
CHANGED
|
@@ -523,15 +523,23 @@ class Project {
|
|
|
523
523
|
*/
|
|
524
524
|
blueprintLookupPaths() {
|
|
525
525
|
if (this.isEmberCLIProject()) {
|
|
526
|
-
|
|
527
|
-
let addonLookupPaths = this.addonBlueprintLookupPaths();
|
|
528
|
-
|
|
529
|
-
return lookupPaths.concat(addonLookupPaths);
|
|
526
|
+
return [this.localBlueprintLookupPath(), ...this.addonBlueprintLookupPaths(), this.builtInLookupPath()];
|
|
530
527
|
} else {
|
|
531
|
-
return this.addonBlueprintLookupPaths();
|
|
528
|
+
return [...this.addonBlueprintLookupPaths(), this.builtInLookupPath()];
|
|
532
529
|
}
|
|
533
530
|
}
|
|
534
531
|
|
|
532
|
+
/**
|
|
533
|
+
* Returns the built-in ember-cli path for looking up blueprints
|
|
534
|
+
*
|
|
535
|
+
* @private
|
|
536
|
+
* @method builtInLookupPath
|
|
537
|
+
* @return {string} path to the ember-cli built-in blueprints
|
|
538
|
+
*/
|
|
539
|
+
builtInLookupPath() {
|
|
540
|
+
return path.resolve(__dirname, '..', '..', 'blueprints');
|
|
541
|
+
}
|
|
542
|
+
|
|
535
543
|
/**
|
|
536
544
|
Returns a list of addon paths where blueprints will be looked up.
|
|
537
545
|
|
|
@@ -3,11 +3,12 @@
|
|
|
3
3
|
const fs = require('fs');
|
|
4
4
|
const path = require('path');
|
|
5
5
|
const getRepoInfo = require('git-repo-info');
|
|
6
|
+
const version = require('../../package.json').version;
|
|
6
7
|
|
|
7
8
|
module.exports = {
|
|
8
9
|
emberCLIVersion() {
|
|
9
10
|
let gitPath = path.join(__dirname, '..', '..', '.git');
|
|
10
|
-
let output = [
|
|
11
|
+
let output = [version];
|
|
11
12
|
|
|
12
13
|
if (fs.existsSync(gitPath)) {
|
|
13
14
|
let { branch, abbreviatedSha } = getRepoInfo(gitPath);
|
|
@@ -21,6 +22,10 @@ module.exports = {
|
|
|
21
22
|
return output.join('-');
|
|
22
23
|
},
|
|
23
24
|
|
|
25
|
+
emberCLIBareVersion() {
|
|
26
|
+
return version;
|
|
27
|
+
},
|
|
28
|
+
|
|
24
29
|
isDevelopment(version) {
|
|
25
30
|
// match postfix SHA in dev version
|
|
26
31
|
return /\b[0-9a-f]{5,40}\b/.test(version);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ember-cli",
|
|
3
|
-
"version": "7.2.0-
|
|
3
|
+
"version": "7.2.0-beta.1",
|
|
4
4
|
"description": "Command line tool for developing ambitious ember.js apps",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"app",
|
|
@@ -31,11 +31,13 @@
|
|
|
31
31
|
"minor": "prerelease",
|
|
32
32
|
"patch": "prerelease"
|
|
33
33
|
},
|
|
34
|
-
"semverIncrementTag": "
|
|
35
|
-
"publishTag": "
|
|
34
|
+
"semverIncrementTag": "beta",
|
|
35
|
+
"publishTag": "beta"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@ember/
|
|
38
|
+
"@ember-tooling/blueprint-blueprint": "^0.3.0",
|
|
39
|
+
"@ember-tooling/blueprint-model": "^0.7.1",
|
|
40
|
+
"@ember/app-blueprint": "~7.2.0-beta.1",
|
|
39
41
|
"@pnpm/find-workspace-dir": "^1000.1.5",
|
|
40
42
|
"babel-remove-types": "^2.0.0",
|
|
41
43
|
"broccoli": "^4.0.0",
|
|
@@ -70,10 +72,10 @@
|
|
|
70
72
|
"execa": "^9.6.1",
|
|
71
73
|
"exit": "^0.1.2",
|
|
72
74
|
"express": "^5.2.1",
|
|
73
|
-
"filesize": "^11.0.
|
|
75
|
+
"filesize": "^11.0.22",
|
|
74
76
|
"find-up": "^8.0.0",
|
|
75
77
|
"find-yarn-workspace-root": "^2.0.0",
|
|
76
|
-
"fs-extra": "^11.
|
|
78
|
+
"fs-extra": "^11.4.0",
|
|
77
79
|
"fs-tree-diff": "^2.0.1",
|
|
78
80
|
"get-caller-file": "^2.0.5",
|
|
79
81
|
"git-repo-info": "^2.1.1",
|
|
@@ -88,10 +90,10 @@
|
|
|
88
90
|
"is-git-url": "^1.0.0",
|
|
89
91
|
"is-language-code": "^5.1.3",
|
|
90
92
|
"lodash": "^4.18.1",
|
|
91
|
-
"markdown-it": "^14.
|
|
93
|
+
"markdown-it": "^14.3.0",
|
|
92
94
|
"markdown-it-terminal": "^0.4.0",
|
|
93
|
-
"minimatch": "^10.2.
|
|
94
|
-
"morgan": "^1.
|
|
95
|
+
"minimatch": "^10.2.6",
|
|
96
|
+
"morgan": "^1.11.0",
|
|
95
97
|
"nopt": "^3.0.6",
|
|
96
98
|
"npm-package-arg": "^13.0.2",
|
|
97
99
|
"os-locale": "^6.0.2",
|
|
@@ -104,22 +106,20 @@
|
|
|
104
106
|
"resolve-package-path": "^4.0.3",
|
|
105
107
|
"safe-stable-stringify": "^2.5.0",
|
|
106
108
|
"sane": "^5.0.1",
|
|
107
|
-
"semver": "^7.8.
|
|
109
|
+
"semver": "^7.8.5",
|
|
108
110
|
"semver-deprecate": "^1.1.0",
|
|
109
111
|
"silent-error": "^1.1.1",
|
|
110
|
-
"sort-package-json": "^3.
|
|
112
|
+
"sort-package-json": "^3.7.1",
|
|
111
113
|
"symlink-or-copy": "^1.3.1",
|
|
112
|
-
"testem": "^3.20.
|
|
114
|
+
"testem": "^3.20.1",
|
|
113
115
|
"tiny-lr": "^2.0.0",
|
|
114
116
|
"tree-sync": "^2.1.0",
|
|
115
117
|
"walk-sync": "^4.0.2",
|
|
116
118
|
"watch-detector": "^1.0.2",
|
|
117
|
-
"workerpool": "^10.0.
|
|
119
|
+
"workerpool": "^10.0.3",
|
|
118
120
|
"yam": "^1.0.0",
|
|
119
|
-
"@ember-tooling/
|
|
120
|
-
"@ember-tooling/classic-build-app-blueprint": "7.2.0-
|
|
121
|
-
"@ember-tooling/classic-build-addon-blueprint": "7.2.0-alpha.1",
|
|
122
|
-
"@ember-tooling/blueprint-model": "0.7.0"
|
|
121
|
+
"@ember-tooling/classic-build-addon-blueprint": "7.2.0-beta.1",
|
|
122
|
+
"@ember-tooling/classic-build-app-blueprint": "7.2.0-beta.1"
|
|
123
123
|
},
|
|
124
124
|
"devDependencies": {
|
|
125
125
|
"broccoli-plugin": "^4.0.7",
|
|
@@ -128,7 +128,8 @@
|
|
|
128
128
|
"chai-as-promised": "^8.0.2",
|
|
129
129
|
"chai-files": "^1.4.0",
|
|
130
130
|
"chai-jest-snapshot": "^2.0.0",
|
|
131
|
-
"concurrently": "^9.2.
|
|
131
|
+
"concurrently": "^9.2.4",
|
|
132
|
+
"ember-cli": "link:.",
|
|
132
133
|
"ember-cli-blueprint-test-helpers": "^0.19.2",
|
|
133
134
|
"ember-cli-internal-test-helpers": "^0.9.1",
|
|
134
135
|
"eslint": "^8.57.1",
|
|
@@ -137,18 +138,18 @@
|
|
|
137
138
|
"eslint-plugin-mocha": "^10.5.0",
|
|
138
139
|
"eslint-plugin-n": "^17.24.0",
|
|
139
140
|
"fixturify": "^3.0.0",
|
|
140
|
-
"fixturify-project": "^
|
|
141
|
+
"fixturify-project": "^7.1.3",
|
|
141
142
|
"jsdom": "^21.1.2",
|
|
142
143
|
"latest-version": "^9.0.0",
|
|
143
|
-
"mocha": "^11.
|
|
144
|
-
"nock": "^14.0.
|
|
144
|
+
"mocha": "^11.8.0",
|
|
145
|
+
"nock": "^14.0.17",
|
|
145
146
|
"nyc": "^17.1.0",
|
|
146
147
|
"prettier": "3.7.4",
|
|
147
148
|
"release-plan": "^0.17.4",
|
|
148
149
|
"strip-ansi": "^7.2.0",
|
|
149
150
|
"supertest": "^7.2.2",
|
|
150
151
|
"testdouble": "^3.20.2",
|
|
151
|
-
"tmp": "^0.2.
|
|
152
|
+
"tmp": "^0.2.7",
|
|
152
153
|
"tmp-promise": "^3.0.3",
|
|
153
154
|
"websocket": "^1.0.35",
|
|
154
155
|
"which": "6.0.0",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ember-tooling/classic-build-addon-blueprint",
|
|
3
|
-
"version": "7.2.0-
|
|
3
|
+
"version": "7.2.0-beta.1",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/ember-cli/ember-cli.git",
|
|
@@ -11,11 +11,11 @@
|
|
|
11
11
|
"ember-blueprint"
|
|
12
12
|
],
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@ember-tooling/blueprint-model": "
|
|
14
|
+
"@ember-tooling/blueprint-model": "^0.7.1",
|
|
15
15
|
"chalk": "^5.6.2",
|
|
16
16
|
"ember-cli-normalize-entity-name": "^1.0.0",
|
|
17
17
|
"ember-cli-string-utils": "^1.1.0",
|
|
18
|
-
"fs-extra": "^11.
|
|
18
|
+
"fs-extra": "^11.4.0",
|
|
19
19
|
"lodash": "^4.18.1",
|
|
20
20
|
"silent-error": "^1.1.1",
|
|
21
21
|
"sort-package-json": "^2.15.1",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"minor": "prerelease",
|
|
27
27
|
"patch": "prerelease"
|
|
28
28
|
},
|
|
29
|
-
"semverIncrementTag": "
|
|
30
|
-
"publishTag": "
|
|
29
|
+
"semverIncrementTag": "beta",
|
|
30
|
+
"publishTag": "beta"
|
|
31
31
|
}
|
|
32
32
|
}
|
|
@@ -28,9 +28,9 @@
|
|
|
28
28
|
"test:ember": "ember test"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
31
|
-
"@babel/core": "^7.29.
|
|
32
|
-
"@babel/eslint-parser": "^7.
|
|
33
|
-
"@babel/plugin-proposal-decorators": "^7.29.
|
|
31
|
+
"@babel/core": "^7.29.7",
|
|
32
|
+
"@babel/eslint-parser": "^7.29.7",
|
|
33
|
+
"@babel/plugin-proposal-decorators": "^7.29.7<% if (typescript && emberData) { %>",
|
|
34
34
|
"@ember-data/adapter": "~5.8.2",
|
|
35
35
|
"@ember-data/graph": "~5.8.2",
|
|
36
36
|
"@ember-data/json-api": "~5.8.2",
|
|
@@ -42,17 +42,17 @@
|
|
|
42
42
|
"@ember-data/store": "~5.8.2",
|
|
43
43
|
"@warp-drive/ember": "~5.8.2<% } %>",
|
|
44
44
|
"@ember/optional-features": "^3.0.0",
|
|
45
|
-
"@ember/test-helpers": "^5.4.
|
|
45
|
+
"@ember/test-helpers": "^5.4.3<% if (embroider) { %>",
|
|
46
46
|
"@embroider/compat": "^3.9.4",
|
|
47
47
|
"@embroider/core": "^3.5.10<% } %>",
|
|
48
|
-
"@embroider/macros": "^1.20.
|
|
48
|
+
"@embroider/macros": "^1.20.6<% if (embroider) { %>",
|
|
49
49
|
"@embroider/webpack": "^4.1.2<% } %>",
|
|
50
|
-
"@eslint/js": "^9.39.
|
|
50
|
+
"@eslint/js": "^9.39.5",
|
|
51
51
|
"@glimmer/component": "^2.1.1",
|
|
52
52
|
"@glimmer/tracking": "^1.1.2<% if (typescript) { %>",
|
|
53
53
|
"@glint/environment-ember-loose": "^1.5.2",
|
|
54
54
|
"@glint/environment-ember-template-imports": "^1.5.2",
|
|
55
|
-
"@glint/template": "^1.
|
|
55
|
+
"@glint/template": "^1.8.0",
|
|
56
56
|
"@tsconfig/ember": "^3.0.12",
|
|
57
57
|
"@types/qunit": "^2.19.14",
|
|
58
58
|
"@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>",
|
|
@@ -61,9 +61,9 @@
|
|
|
61
61
|
"@warp-drive/legacy": "~5.8.2",
|
|
62
62
|
"@warp-drive/utilities": "~5.8.2<% } %>",
|
|
63
63
|
"broccoli-asset-rev": "^3.0.0",
|
|
64
|
-
"concurrently": "^9.2.
|
|
64
|
+
"concurrently": "^9.2.4",
|
|
65
65
|
"ember-auto-import": "^2.13.1",
|
|
66
|
-
"ember-cli": "~7.2.0-
|
|
66
|
+
"ember-cli": "~7.2.0-beta.1",
|
|
67
67
|
"ember-cli-app-version": "^7.0.0",
|
|
68
68
|
"ember-cli-babel": "^8.3.1",
|
|
69
69
|
"ember-cli-clean-css": "^3.0.0",
|
|
@@ -77,13 +77,13 @@
|
|
|
77
77
|
"ember-load-initializers": "^3.0.1",
|
|
78
78
|
"ember-modifier": "^4.3.0",
|
|
79
79
|
"ember-page-title": "^9.0.3",
|
|
80
|
-
"ember-qunit": "^9.0
|
|
80
|
+
"ember-qunit": "^9.1.0",
|
|
81
81
|
"ember-resolver": "^13.2.0",
|
|
82
|
-
"ember-source": "~7.2.0
|
|
82
|
+
"ember-source": "~7.2.0",
|
|
83
83
|
"ember-template-imports": "^4.4.0",
|
|
84
84
|
"ember-template-lint": "^6.1.0<% if (welcome) { %>",
|
|
85
85
|
"ember-welcome-page": "^8.0.5<% } %>",
|
|
86
|
-
"eslint": "^9.39.
|
|
86
|
+
"eslint": "^9.39.5",
|
|
87
87
|
"eslint-config-prettier": "^9.1.2",
|
|
88
88
|
"eslint-plugin-ember": "^12.7.5",
|
|
89
89
|
"eslint-plugin-n": "^17.24.0",
|
|
@@ -91,15 +91,15 @@
|
|
|
91
91
|
"eslint-plugin-warp-drive": "^5.8.2<% } %>",
|
|
92
92
|
"globals": "^15.15.0",
|
|
93
93
|
"loader.js": "^4.7.0",
|
|
94
|
-
"prettier": "^3.
|
|
95
|
-
"prettier-plugin-ember-template-tag": "^2.1.
|
|
96
|
-
"qunit": "^2.
|
|
97
|
-
"qunit-dom": "^3.
|
|
94
|
+
"prettier": "^3.9.6",
|
|
95
|
+
"prettier-plugin-ember-template-tag": "^2.1.7",
|
|
96
|
+
"qunit": "^2.26.0",
|
|
97
|
+
"qunit-dom": "^3.6.0",
|
|
98
98
|
"stylelint": "^16.26.1",
|
|
99
99
|
"stylelint-config-standard": "^36.0.1<% if (typescript) { %>",
|
|
100
100
|
"typescript": "^5.9.3",
|
|
101
|
-
"typescript-eslint": "^8.
|
|
102
|
-
"webpack": "^5.
|
|
101
|
+
"typescript-eslint": "^8.66.0<% } %>",
|
|
102
|
+
"webpack": "^5.109.2"
|
|
103
103
|
},
|
|
104
104
|
"engines": {
|
|
105
105
|
"node": ">= 20.19"
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ember-tooling/classic-build-app-blueprint",
|
|
3
|
-
"version": "7.2.0-
|
|
3
|
+
"version": "7.2.0-beta.1",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/ember-cli/ember-cli.git",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"ember-blueprint"
|
|
12
12
|
],
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@ember-tooling/blueprint-model": "
|
|
14
|
+
"@ember-tooling/blueprint-model": "^0.7.1",
|
|
15
15
|
"chalk": "^5.6.2",
|
|
16
16
|
"ember-cli-string-utils": "^1.1.0"
|
|
17
17
|
},
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"minor": "prerelease",
|
|
21
21
|
"patch": "prerelease"
|
|
22
22
|
},
|
|
23
|
-
"semverIncrementTag": "
|
|
24
|
-
"publishTag": "
|
|
23
|
+
"semverIncrementTag": "beta",
|
|
24
|
+
"publishTag": "beta"
|
|
25
25
|
}
|
|
26
26
|
}
|
|
@@ -140,13 +140,7 @@ async function createAndInstallTestTargets(projectName, options) {
|
|
|
140
140
|
let result = await applyCommand(command, projectName, '--skip-npm', `--directory=${outputDir.path}`);
|
|
141
141
|
|
|
142
142
|
// we need to link these packages before we try to run pnpm install so it always uses the current version of ember-cli and the sub-packages
|
|
143
|
-
for (let pkg of [
|
|
144
|
-
'.',
|
|
145
|
-
'packages/blueprint-model',
|
|
146
|
-
'packages/blueprint-blueprint',
|
|
147
|
-
'packages/app-blueprint',
|
|
148
|
-
'packages/addon-blueprint',
|
|
149
|
-
]) {
|
|
143
|
+
for (let pkg of ['.', 'packages/app-blueprint', 'packages/addon-blueprint']) {
|
|
150
144
|
await execa('pnpm', ['link', path.join(__dirname, `../../${pkg}`)], {
|
|
151
145
|
preferLocal: true,
|
|
152
146
|
cwd: outputDir.path,
|