ember-cli 6.7.0-beta.1 → 6.8.0-alpha.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 +92 -17
- package/docs/build/data.json +1 -1
- package/package.json +7 -7
- package/packages/addon-blueprint/package.json +4 -4
- package/packages/app-blueprint/files/package.json +15 -15
- package/packages/app-blueprint/package.json +4 -4
- package/packages/blueprint-blueprint/files/blueprints/__name__/files/.gitkeep +0 -0
- package/packages/blueprint-blueprint/files/blueprints/__name__/index.js +16 -0
- package/packages/blueprint-blueprint/index.js +5 -0
- package/packages/blueprint-blueprint/package.json +9 -0
- package/packages/blueprint-model/package.json +18 -0
- package/packages/blueprint-model/utilities/directory-for-package-name.js +31 -0
- package/packages/blueprint-model/utilities/edit-file-diff.js +64 -0
- package/packages/blueprint-model/utilities/experiments.js +54 -0
- package/packages/blueprint-model/utilities/file-info.js +170 -0
- package/packages/blueprint-model/utilities/open-editor.js +44 -0
- package/packages/blueprint-model/utilities/prepend-emoji.js +12 -0
- package/packages/blueprint-model/utilities/process-template.js +10 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,43 +1,116 @@
|
|
|
1
1
|
# ember-cli Changelog
|
|
2
2
|
|
|
3
|
-
## Release (2025-08-
|
|
3
|
+
## Release (2025-08-02)
|
|
4
4
|
|
|
5
|
-
* @ember-tooling/classic-build-addon-blueprint 6.
|
|
6
|
-
* @ember-tooling/classic-build-app-blueprint 6.
|
|
7
|
-
* ember-cli 6.
|
|
5
|
+
* @ember-tooling/classic-build-addon-blueprint 6.8.0-alpha.1 (minor)
|
|
6
|
+
* @ember-tooling/classic-build-app-blueprint 6.8.0-alpha.1 (minor)
|
|
7
|
+
* ember-cli 6.8.0-alpha.1 (patch)
|
|
8
8
|
|
|
9
9
|
#### :rocket: Enhancement
|
|
10
10
|
* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
|
|
11
11
|
* [#10755](https://github.com/ember-cli/ember-cli/pull/10755) Prepare 6.7-beta ([@mansona](https://github.com/mansona))
|
|
12
|
+
* Other
|
|
13
|
+
* [#10751](https://github.com/ember-cli/ember-cli/pull/10751) [BETA BACKPORT] Backport drop node 18 ([@mansona](https://github.com/mansona))
|
|
14
|
+
|
|
15
|
+
#### :house: Internal
|
|
16
|
+
* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
|
|
17
|
+
* [#10763](https://github.com/ember-cli/ember-cli/pull/10763) Prepare 6.8-alpha ([@mansona](https://github.com/mansona))
|
|
18
|
+
* [#10754](https://github.com/ember-cli/ember-cli/pull/10754) Prepare Beta Release ([@github-actions[bot]](https://github.com/apps/github-actions))
|
|
19
|
+
* Other
|
|
20
|
+
* [#10761](https://github.com/ember-cli/ember-cli/pull/10761) update release-plan ([@mansona](https://github.com/mansona))
|
|
21
|
+
|
|
22
|
+
#### Committers: 2
|
|
23
|
+
- Chris Manson ([@mansona](https://github.com/mansona))
|
|
24
|
+
- [@github-actions[bot]](https://github.com/apps/github-actions)
|
|
25
|
+
|
|
26
|
+
## Release (2025-07-26)
|
|
27
|
+
|
|
28
|
+
* @ember-tooling/classic-build-addon-blueprint 6.7.0-alpha.4 (minor)
|
|
29
|
+
* @ember-tooling/classic-build-app-blueprint 6.7.0-alpha.4 (minor)
|
|
30
|
+
* ember-cli 6.7.0-alpha.4 (patch)
|
|
31
|
+
|
|
32
|
+
#### :rocket: Enhancement
|
|
33
|
+
* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
|
|
34
|
+
* [#10742](https://github.com/ember-cli/ember-cli/pull/10742) Drop node 18, add node 24 ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
|
|
35
|
+
|
|
36
|
+
#### :bug: Bug Fix
|
|
37
|
+
* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
|
|
12
38
|
* [#10742](https://github.com/ember-cli/ember-cli/pull/10742) Drop node 18, add node 24 ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
|
|
13
39
|
|
|
14
40
|
#### :memo: Documentation
|
|
15
|
-
*
|
|
41
|
+
* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
|
|
42
|
+
* [#10742](https://github.com/ember-cli/ember-cli/pull/10742) Drop node 18, add node 24 ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
|
|
43
|
+
|
|
44
|
+
#### :house: Internal
|
|
45
|
+
* [#10748](https://github.com/ember-cli/ember-cli/pull/10748) update blueprint version of ember-cli as part of release plan ([@mansona](https://github.com/mansona))
|
|
46
|
+
* [#10747](https://github.com/ember-cli/ember-cli/pull/10747) only use the PAT for the PR creation in release-plan ([@mansona](https://github.com/mansona))
|
|
47
|
+
* [#10744](https://github.com/ember-cli/ember-cli/pull/10744) run tests on the release-plan PR ([@mansona](https://github.com/mansona))
|
|
48
|
+
|
|
49
|
+
#### Committers: 2
|
|
50
|
+
- Chris Manson ([@mansona](https://github.com/mansona))
|
|
51
|
+
- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
|
|
52
|
+
|
|
53
|
+
## Release (2025-06-30)
|
|
54
|
+
|
|
55
|
+
* @ember-tooling/classic-build-addon-blueprint 6.7.0-alpha.3 (patch)
|
|
56
|
+
* @ember-tooling/classic-build-app-blueprint 6.7.0-alpha.3 (patch)
|
|
57
|
+
* @ember-tooling/blueprint-blueprint 0.0.2 (patch)
|
|
58
|
+
* @ember-tooling/blueprint-model 0.0.2 (patch)
|
|
59
|
+
* ember-cli 6.7.0-alpha.3 (patch)
|
|
60
|
+
|
|
61
|
+
#### :house: Internal
|
|
62
|
+
* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `@ember-tooling/blueprint-blueprint`, `@ember-tooling/blueprint-model`
|
|
63
|
+
* [#10738](https://github.com/ember-cli/ember-cli/pull/10738) add a repository for each of the packages ([@mansona](https://github.com/mansona))
|
|
64
|
+
|
|
65
|
+
#### Committers: 1
|
|
66
|
+
- Chris Manson ([@mansona](https://github.com/mansona))
|
|
67
|
+
|
|
68
|
+
## Release (2025-06-30)
|
|
69
|
+
|
|
70
|
+
* @ember-tooling/classic-build-addon-blueprint 6.7.0-alpha.2 (patch)
|
|
71
|
+
* @ember-tooling/classic-build-app-blueprint 6.7.0-alpha.2 (patch)
|
|
72
|
+
* @ember-tooling/blueprint-blueprint 0.0.1 (patch)
|
|
73
|
+
* @ember-tooling/blueprint-model 0.0.1 (patch)
|
|
74
|
+
* ember-cli 6.7.0-alpha.2 (patch)
|
|
16
75
|
|
|
17
76
|
#### :house: Internal
|
|
18
77
|
* Other
|
|
19
|
-
* [#10761](https://github.com/ember-cli/ember-cli/pull/10761) update release-plan ([@mansona](https://github.com/mansona))
|
|
20
|
-
* [#10748](https://github.com/ember-cli/ember-cli/pull/10748) update blueprint version of ember-cli as part of release plan ([@mansona](https://github.com/mansona))
|
|
21
|
-
* [#10747](https://github.com/ember-cli/ember-cli/pull/10747) only use the PAT for the PR creation in release-plan ([@mansona](https://github.com/mansona))
|
|
22
|
-
* [#10744](https://github.com/ember-cli/ember-cli/pull/10744) run tests on the release-plan PR ([@mansona](https://github.com/mansona))
|
|
23
78
|
* [#10735](https://github.com/ember-cli/ember-cli/pull/10735) remove unnecessary project override ([@mansona](https://github.com/mansona))
|
|
24
|
-
* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
|
|
25
|
-
* [#10738](https://github.com/ember-cli/ember-cli/pull/10738) add a repository for each of the packages ([@mansona](https://github.com/mansona))
|
|
79
|
+
* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `@ember-tooling/blueprint-blueprint`, `@ember-tooling/blueprint-model`
|
|
26
80
|
* [#10736](https://github.com/ember-cli/ember-cli/pull/10736) update all sub-packages to have the @ember-tooling prefix ([@mansona](https://github.com/mansona))
|
|
27
81
|
* [#10671](https://github.com/ember-cli/ember-cli/pull/10671) Implement the built in app, addon, and blueprint blueprints by package lookup ([@mansona](https://github.com/mansona))
|
|
28
82
|
|
|
29
|
-
#### Committers:
|
|
83
|
+
#### Committers: 1
|
|
30
84
|
- Chris Manson ([@mansona](https://github.com/mansona))
|
|
31
|
-
- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
|
|
32
85
|
|
|
33
|
-
## Release (2025-
|
|
86
|
+
## Release (2025-06-16)
|
|
34
87
|
|
|
35
|
-
* ember-cli 6.
|
|
88
|
+
* ember-cli 6.7.0-alpha.1 (minor)
|
|
89
|
+
|
|
90
|
+
#### :rocket: Enhancement
|
|
91
|
+
* `ember-cli`
|
|
92
|
+
* [#10705](https://github.com/ember-cli/ember-cli/pull/10705) add `--strict` flag for new app and addon generation ([@mansona](https://github.com/mansona))
|
|
93
|
+
|
|
94
|
+
#### :memo: Documentation
|
|
95
|
+
* `ember-cli`
|
|
96
|
+
* [#10724](https://github.com/ember-cli/ember-cli/pull/10724) Update RELEASE.md to fully document new release-plan setup ([@mansona](https://github.com/mansona))
|
|
97
|
+
|
|
98
|
+
#### :house: Internal
|
|
99
|
+
* `ember-cli`
|
|
100
|
+
* [#10731](https://github.com/ember-cli/ember-cli/pull/10731) Prepare Alpha 6.7.0 ([@mansona](https://github.com/mansona))
|
|
101
|
+
* [#10728](https://github.com/ember-cli/ember-cli/pull/10728) Prepare Beta 6.6.0 ([@mansona](https://github.com/mansona))
|
|
102
|
+
* [#10726](https://github.com/ember-cli/ember-cli/pull/10726) use patched github-changelog for properly rolling up beta changelog ([@mansona](https://github.com/mansona))
|
|
103
|
+
* [#10717](https://github.com/ember-cli/ember-cli/pull/10717) pass --publish-branch to release-plan publish ([@mansona](https://github.com/mansona))
|
|
104
|
+
|
|
105
|
+
#### Committers: 1
|
|
106
|
+
- Chris Manson ([@mansona](https://github.com/mansona))
|
|
107
|
+
|
|
108
|
+
## Release (2025-06-16)
|
|
109
|
+
|
|
110
|
+
* ember-cli 6.6.0-beta.1 (minor)
|
|
36
111
|
|
|
37
112
|
#### :rocket: Enhancement
|
|
38
113
|
* `ember-cli`
|
|
39
|
-
* [#10749](https://github.com/ember-cli/ember-cli/pull/10749) Update all dependencies for 6.6 release ([@mansona](https://github.com/mansona))
|
|
40
|
-
* [#10751](https://github.com/ember-cli/ember-cli/pull/10751) [BETA BACKPORT] Backport drop node 18 ([@mansona](https://github.com/mansona))
|
|
41
114
|
* [#10701](https://github.com/ember-cli/ember-cli/pull/10701) [ENHANCEMENT] Support Bun ([@hexadecy](https://github.com/hexadecy))
|
|
42
115
|
* [#10664](https://github.com/ember-cli/ember-cli/pull/10664) [ENHANCEMENT] Remove ember-fetch ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
|
|
43
116
|
|
|
@@ -48,6 +121,8 @@
|
|
|
48
121
|
|
|
49
122
|
#### :house: Internal
|
|
50
123
|
* `ember-cli`
|
|
124
|
+
* [#10728](https://github.com/ember-cli/ember-cli/pull/10728) Prepare Beta 6.6.0 ([@mansona](https://github.com/mansona))
|
|
125
|
+
* [#10726](https://github.com/ember-cli/ember-cli/pull/10726) use patched github-changelog for properly rolling up beta changelog ([@mansona](https://github.com/mansona))
|
|
51
126
|
* [#10699](https://github.com/ember-cli/ember-cli/pull/10699) Start using release-plan for releasing ember-cli ([@mansona](https://github.com/mansona))
|
|
52
127
|
* [#10670](https://github.com/ember-cli/ember-cli/pull/10670) testing: don't generate temp directories in the repo ([@mansona](https://github.com/mansona))
|
|
53
128
|
|
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": "6.
|
|
6
|
+
"version": "6.8.0-alpha.1-master-4e559d67cd"
|
|
7
7
|
},
|
|
8
8
|
"files": {
|
|
9
9
|
"lib/broccoli/default-packager.js": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ember-cli",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.8.0-alpha.1",
|
|
4
4
|
"description": "Command line tool for developing ambitious ember.js apps",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"app",
|
|
@@ -31,12 +31,10 @@
|
|
|
31
31
|
"minor": "prerelease",
|
|
32
32
|
"patch": "prerelease"
|
|
33
33
|
},
|
|
34
|
-
"semverIncrementTag": "
|
|
35
|
-
"publishTag": "
|
|
34
|
+
"semverIncrementTag": "alpha",
|
|
35
|
+
"publishTag": "alpha"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@ember-tooling/blueprint-blueprint": "^0.0.2",
|
|
39
|
-
"@ember-tooling/blueprint-model": "^0.0.2",
|
|
40
38
|
"@pnpm/find-workspace-dir": "^1000.1.0",
|
|
41
39
|
"babel-remove-types": "^1.0.1",
|
|
42
40
|
"broccoli": "^3.5.2",
|
|
@@ -119,8 +117,10 @@
|
|
|
119
117
|
"watch-detector": "^1.0.2",
|
|
120
118
|
"workerpool": "^9.2.0",
|
|
121
119
|
"yam": "^1.0.0",
|
|
122
|
-
"@ember-tooling/
|
|
123
|
-
"@ember-tooling/classic-build-app-blueprint": "6.
|
|
120
|
+
"@ember-tooling/blueprint-blueprint": "0.0.2",
|
|
121
|
+
"@ember-tooling/classic-build-app-blueprint": "6.8.0-alpha.1",
|
|
122
|
+
"@ember-tooling/blueprint-model": "0.0.2",
|
|
123
|
+
"@ember-tooling/classic-build-addon-blueprint": "6.8.0-alpha.1"
|
|
124
124
|
},
|
|
125
125
|
"devDependencies": {
|
|
126
126
|
"@octokit/rest": "^19.0.7",
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ember-tooling/classic-build-addon-blueprint",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.8.0-alpha.1",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/ember-cli/ember-cli.git",
|
|
7
7
|
"directory": "packages/addon-blueprint"
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
10
|
-
"@ember-tooling/blueprint-model": "
|
|
10
|
+
"@ember-tooling/blueprint-model": "workspace:*",
|
|
11
11
|
"chalk": "^4.1.2",
|
|
12
12
|
"ember-cli-normalize-entity-name": "^1.0.0",
|
|
13
13
|
"ember-cli-string-utils": "^1.1.0",
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"minor": "prerelease",
|
|
23
23
|
"patch": "prerelease"
|
|
24
24
|
},
|
|
25
|
-
"semverIncrementTag": "
|
|
26
|
-
"publishTag": "
|
|
25
|
+
"semverIncrementTag": "alpha",
|
|
26
|
+
"publishTag": "alpha"
|
|
27
27
|
}
|
|
28
28
|
}
|
|
@@ -31,16 +31,16 @@
|
|
|
31
31
|
"@babel/core": "^7.28.0",
|
|
32
32
|
"@babel/eslint-parser": "^7.28.0",
|
|
33
33
|
"@babel/plugin-proposal-decorators": "^7.28.0<% if (typescript && emberData) { %>",
|
|
34
|
-
"@ember-data/adapter": "~5.
|
|
35
|
-
"@ember-data/graph": "~5.
|
|
36
|
-
"@ember-data/json-api": "~5.
|
|
37
|
-
"@ember-data/legacy-compat": "~5.
|
|
38
|
-
"@ember-data/model": "~5.
|
|
39
|
-
"@ember-data/request": "~5.
|
|
40
|
-
"@ember-data/request-utils": "~5.
|
|
41
|
-
"@ember-data/serializer": "~5.
|
|
42
|
-
"@ember-data/store": "~5.
|
|
43
|
-
"@warp-drive/ember": "~5.
|
|
34
|
+
"@ember-data/adapter": "~5.7.0-alpha.22",
|
|
35
|
+
"@ember-data/graph": "~5.7.0-alpha.22",
|
|
36
|
+
"@ember-data/json-api": "~5.7.0-alpha.22",
|
|
37
|
+
"@ember-data/legacy-compat": "~5.7.0-alpha.22",
|
|
38
|
+
"@ember-data/model": "~5.7.0-alpha.22",
|
|
39
|
+
"@ember-data/request": "~5.7.0-alpha.22",
|
|
40
|
+
"@ember-data/request-utils": "~5.7.0-alpha.22",
|
|
41
|
+
"@ember-data/serializer": "~5.7.0-alpha.22",
|
|
42
|
+
"@ember-data/store": "~5.7.0-alpha.22",
|
|
43
|
+
"@warp-drive/ember": "~5.7.0-alpha.22<% } %>",
|
|
44
44
|
"@ember/optional-features": "^2.2.0",
|
|
45
45
|
"@ember/test-helpers": "^5.2.2<% if (embroider) { %>",
|
|
46
46
|
"@embroider/compat": "^3.9.1",
|
|
@@ -56,11 +56,11 @@
|
|
|
56
56
|
"@tsconfig/ember": "^3.0.11",
|
|
57
57
|
"@types/qunit": "^2.19.12",
|
|
58
58
|
"@types/rsvp": "^4.0.9<% if (emberData) {%>",
|
|
59
|
-
"@warp-drive/core-types": "~5.
|
|
59
|
+
"@warp-drive/core-types": "~5.7.0-alpha.22<% }} %>",
|
|
60
60
|
"broccoli-asset-rev": "^3.0.0",
|
|
61
61
|
"concurrently": "^9.2.0",
|
|
62
62
|
"ember-auto-import": "^2.10.0",
|
|
63
|
-
"ember-cli": "~6.
|
|
63
|
+
"ember-cli": "~6.8.0-alpha.1",
|
|
64
64
|
"ember-cli-app-version": "^7.0.0",
|
|
65
65
|
"ember-cli-babel": "^8.2.0",
|
|
66
66
|
"ember-cli-clean-css": "^3.0.0",
|
|
@@ -70,13 +70,13 @@
|
|
|
70
70
|
"ember-cli-inject-live-reload": "^2.1.0<% if (!embroider) { %>",
|
|
71
71
|
"ember-cli-sri": "^2.1.1",
|
|
72
72
|
"ember-cli-terser": "^4.0.2<% } %><% if (emberData) { %>",
|
|
73
|
-
"ember-data": "~5.
|
|
73
|
+
"ember-data": "~5.7.0-alpha.22<% } %>",
|
|
74
74
|
"ember-load-initializers": "^3.0.1",
|
|
75
75
|
"ember-modifier": "^4.2.2",
|
|
76
76
|
"ember-page-title": "^9.0.2",
|
|
77
77
|
"ember-qunit": "^9.0.3",
|
|
78
78
|
"ember-resolver": "^13.1.1",
|
|
79
|
-
"ember-source": "~6.
|
|
79
|
+
"ember-source": "~6.8.0-alpha.2",
|
|
80
80
|
"ember-template-imports": "^4.3.0",
|
|
81
81
|
"ember-template-lint": "^6.1.0<% if (welcome) { %>",
|
|
82
82
|
"ember-welcome-page": "^7.0.2<% } %>",
|
|
@@ -94,7 +94,7 @@
|
|
|
94
94
|
"stylelint": "^16.23.0",
|
|
95
95
|
"stylelint-config-standard": "^36.0.1",
|
|
96
96
|
"tracked-built-ins": "^3.4.0<% if (typescript) { %>",
|
|
97
|
-
"typescript": "^5.
|
|
97
|
+
"typescript": "^5.9.2",
|
|
98
98
|
"typescript-eslint": "^8.38.0<% } %>",
|
|
99
99
|
"webpack": "^5.101.0"
|
|
100
100
|
},
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ember-tooling/classic-build-app-blueprint",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.8.0-alpha.1",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/ember-cli/ember-cli.git",
|
|
7
7
|
"directory": "packages/app-blueprint"
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
10
|
-
"@ember-tooling/blueprint-model": "
|
|
10
|
+
"@ember-tooling/blueprint-model": "workspace:*",
|
|
11
11
|
"chalk": "^4.1.2",
|
|
12
12
|
"ember-cli-string-utils": "^1.1.0"
|
|
13
13
|
},
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
"minor": "prerelease",
|
|
17
17
|
"patch": "prerelease"
|
|
18
18
|
},
|
|
19
|
-
"semverIncrementTag": "
|
|
20
|
-
"publishTag": "
|
|
19
|
+
"semverIncrementTag": "alpha",
|
|
20
|
+
"publishTag": "alpha"
|
|
21
21
|
}
|
|
22
22
|
}
|
|
File without changes
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
module.exports = {
|
|
4
|
+
description: ''
|
|
5
|
+
|
|
6
|
+
// locals(options) {
|
|
7
|
+
// // Return custom template variables here.
|
|
8
|
+
// return {
|
|
9
|
+
// foo: options.entity.options.foo
|
|
10
|
+
// };
|
|
11
|
+
// }
|
|
12
|
+
|
|
13
|
+
// afterInstall(options) {
|
|
14
|
+
// // Perform extra work here.
|
|
15
|
+
// }
|
|
16
|
+
};
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@ember-tooling/blueprint-model",
|
|
3
|
+
"version": "0.0.2",
|
|
4
|
+
"repository": {
|
|
5
|
+
"type": "git",
|
|
6
|
+
"url": "https://github.com/ember-cli/ember-cli.git",
|
|
7
|
+
"directory": "packages/blueprint-model"
|
|
8
|
+
},
|
|
9
|
+
"dependencies": {
|
|
10
|
+
"chalk": "^4.1.2",
|
|
11
|
+
"diff": "^7.0.0",
|
|
12
|
+
"isbinaryfile": "^5.0.4",
|
|
13
|
+
"lodash": "^4.17.21",
|
|
14
|
+
"promise.hash.helper": "^1.0.8",
|
|
15
|
+
"quick-temp": "^0.1.8",
|
|
16
|
+
"silent-error": "^1.1.1"
|
|
17
|
+
}
|
|
18
|
+
}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
const path = require('path');
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Derive a directory name from a package name.
|
|
7
|
+
* Takes scoped packages into account.
|
|
8
|
+
*
|
|
9
|
+
* @method directoryForPackageName
|
|
10
|
+
* @param {String} packageName
|
|
11
|
+
* @return {String} Derived directory name.
|
|
12
|
+
*/
|
|
13
|
+
module.exports = function directoryForPackageName(packageName) {
|
|
14
|
+
let isScoped = packageName[0] === '@' && packageName.includes('/');
|
|
15
|
+
|
|
16
|
+
if (isScoped) {
|
|
17
|
+
let slashIndex = packageName.indexOf('/');
|
|
18
|
+
let scopeName = packageName.substring(1, slashIndex);
|
|
19
|
+
let packageNameWithoutScope = packageName.substring(slashIndex + 1);
|
|
20
|
+
let pathParts = process.cwd().split(path.sep);
|
|
21
|
+
let parentDirectoryContainsScopeName = pathParts.includes(scopeName);
|
|
22
|
+
|
|
23
|
+
if (parentDirectoryContainsScopeName) {
|
|
24
|
+
return packageNameWithoutScope;
|
|
25
|
+
} else {
|
|
26
|
+
return `${scopeName}-${packageNameWithoutScope}`;
|
|
27
|
+
}
|
|
28
|
+
} else {
|
|
29
|
+
return packageName;
|
|
30
|
+
}
|
|
31
|
+
};
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
const fs = require('fs');
|
|
4
|
+
const util = require('util');
|
|
5
|
+
const jsdiff = require('diff');
|
|
6
|
+
const quickTemp = require('quick-temp');
|
|
7
|
+
const path = require('path');
|
|
8
|
+
const SilentError = require('silent-error');
|
|
9
|
+
const openEditor = require('./open-editor');
|
|
10
|
+
const hash = require('promise.hash.helper');
|
|
11
|
+
|
|
12
|
+
const readFile = util.promisify(fs.readFile);
|
|
13
|
+
const writeFile = util.promisify(fs.writeFile);
|
|
14
|
+
|
|
15
|
+
class EditFileDiff {
|
|
16
|
+
constructor(options) {
|
|
17
|
+
this.info = options.info;
|
|
18
|
+
|
|
19
|
+
quickTemp.makeOrRemake(this, 'tmpDifferenceDir');
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
edit() {
|
|
23
|
+
return hash({
|
|
24
|
+
input: this.info.render(),
|
|
25
|
+
output: readFile(this.info.outputPath),
|
|
26
|
+
})
|
|
27
|
+
.then(this.invokeEditor.bind(this))
|
|
28
|
+
.then(this.applyPatch.bind(this))
|
|
29
|
+
.finally(this.cleanUp.bind(this));
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
cleanUp() {
|
|
33
|
+
quickTemp.remove(this, 'tmpDifferenceDir');
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
applyPatch(resultHash) {
|
|
37
|
+
return hash({
|
|
38
|
+
diffString: readFile(resultHash.diffPath),
|
|
39
|
+
currentString: readFile(resultHash.outputPath),
|
|
40
|
+
}).then((result) => {
|
|
41
|
+
let appliedDiff = jsdiff.applyPatch(result.currentString.toString(), result.diffString.toString());
|
|
42
|
+
|
|
43
|
+
if (!appliedDiff) {
|
|
44
|
+
let message = 'Patch was not cleanly applied.';
|
|
45
|
+
this.info.ui.writeLine(`${message} Please choose another action.`);
|
|
46
|
+
throw new SilentError(message);
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
return writeFile(resultHash.outputPath, appliedDiff);
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
invokeEditor(result) {
|
|
54
|
+
let info = this.info;
|
|
55
|
+
let diff = jsdiff.createPatch(info.outputPath, result.output.toString(), result.input);
|
|
56
|
+
let diffPath = path.join(this.tmpDifferenceDir, 'currentDiff.diff');
|
|
57
|
+
|
|
58
|
+
return writeFile(diffPath, diff)
|
|
59
|
+
.then(() => openEditor(diffPath))
|
|
60
|
+
.then(() => ({ outputPath: info.outputPath, diffPath }));
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
module.exports = EditFileDiff;
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
const chalk = require('chalk');
|
|
4
|
+
const availableExperiments = Object.freeze(['EMBROIDER', 'CLASSIC']);
|
|
5
|
+
|
|
6
|
+
const deprecatedExperiments = Object.freeze([]);
|
|
7
|
+
const enabledExperiments = Object.freeze([]);
|
|
8
|
+
const deprecatedExperimentsDeprecationsIssued = [];
|
|
9
|
+
|
|
10
|
+
function isExperimentEnabled(experimentName) {
|
|
11
|
+
if (!availableExperiments.includes(experimentName)) {
|
|
12
|
+
return false;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
if (process.env.EMBER_CLI_ENABLE_ALL_EXPERIMENTS && deprecatedExperiments.includes(experimentName)) {
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
if (process.env.EMBER_CLI_ENABLE_ALL_EXPERIMENTS) {
|
|
20
|
+
return true;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
if (process.env.EMBER_CLI_CLASSIC && experimentName === 'EMBROIDER') {
|
|
24
|
+
return false;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
let experimentEnvironmentVariable = `EMBER_CLI_${experimentName}`;
|
|
28
|
+
let experimentValue = process.env[experimentEnvironmentVariable];
|
|
29
|
+
|
|
30
|
+
if (deprecatedExperiments.includes(experimentName)) {
|
|
31
|
+
let deprecationPreviouslyIssued = deprecatedExperimentsDeprecationsIssued.includes(experimentName);
|
|
32
|
+
let isSpecifiedByUser = experimentValue !== undefined;
|
|
33
|
+
|
|
34
|
+
if (!deprecationPreviouslyIssued && isSpecifiedByUser) {
|
|
35
|
+
console.warn(
|
|
36
|
+
chalk.yellow(`The ${experimentName} experiment in ember-cli has been deprecated and will be removed.`)
|
|
37
|
+
);
|
|
38
|
+
deprecatedExperimentsDeprecationsIssued.push(experimentName);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
if (enabledExperiments.includes(experimentName)) {
|
|
43
|
+
return experimentValue !== 'false';
|
|
44
|
+
} else {
|
|
45
|
+
return experimentValue !== undefined && experimentValue !== 'false';
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
module.exports = {
|
|
50
|
+
isExperimentEnabled,
|
|
51
|
+
|
|
52
|
+
// exported for testing purposes
|
|
53
|
+
_deprecatedExperimentsDeprecationsIssued: deprecatedExperimentsDeprecationsIssued,
|
|
54
|
+
};
|
|
@@ -0,0 +1,170 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
const fs = require('fs');
|
|
4
|
+
const util = require('util');
|
|
5
|
+
const chalk = require('chalk');
|
|
6
|
+
const EditFileDiff = require('./edit-file-diff');
|
|
7
|
+
const EOL = require('os').EOL;
|
|
8
|
+
const rxEOL = new RegExp(EOL, 'g');
|
|
9
|
+
const isBinaryFile = require('isbinaryfile').isBinaryFileSync;
|
|
10
|
+
const hash = require('promise.hash.helper');
|
|
11
|
+
const canEdit = require('./open-editor').canEdit;
|
|
12
|
+
const processTemplate = require('./process-template');
|
|
13
|
+
|
|
14
|
+
const readFile = util.promisify(fs.readFile);
|
|
15
|
+
const lstat = util.promisify(fs.stat);
|
|
16
|
+
|
|
17
|
+
function diffHighlight(line) {
|
|
18
|
+
if (line[0] === '+') {
|
|
19
|
+
return chalk.green(line);
|
|
20
|
+
} else if (line[0] === '-') {
|
|
21
|
+
return chalk.red(line);
|
|
22
|
+
} else if (/^@@/.test(line)) {
|
|
23
|
+
return chalk.cyan(line);
|
|
24
|
+
} else {
|
|
25
|
+
return line;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
const NOOP = (_) => _;
|
|
30
|
+
class FileInfo {
|
|
31
|
+
constructor(options) {
|
|
32
|
+
this.action = options.action;
|
|
33
|
+
this.outputBasePath = options.outputBasePath;
|
|
34
|
+
this.outputPath = options.outputPath;
|
|
35
|
+
this.displayPath = options.displayPath;
|
|
36
|
+
this.inputPath = options.inputPath;
|
|
37
|
+
this.templateVariables = options.templateVariables;
|
|
38
|
+
this.replacer = options.replacer || NOOP;
|
|
39
|
+
this.ui = options.ui;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
confirmOverwrite(path) {
|
|
43
|
+
let promptOptions = {
|
|
44
|
+
type: 'expand',
|
|
45
|
+
name: 'answer',
|
|
46
|
+
default: false,
|
|
47
|
+
message: `${chalk.red('Overwrite')} ${path}?`,
|
|
48
|
+
choices: [
|
|
49
|
+
{ key: 'y', name: 'Yes, overwrite', value: 'overwrite' },
|
|
50
|
+
{ key: 'n', name: 'No, skip', value: 'skip' },
|
|
51
|
+
],
|
|
52
|
+
};
|
|
53
|
+
|
|
54
|
+
let outputPathIsFile = false;
|
|
55
|
+
try {
|
|
56
|
+
outputPathIsFile = fs.statSync(this.outputPath).isFile();
|
|
57
|
+
} catch (err) {
|
|
58
|
+
/* ignore */
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
let canDiff = !isBinaryFile(this.inputPath) && (!outputPathIsFile || !isBinaryFile(this.outputPath));
|
|
62
|
+
|
|
63
|
+
if (canDiff) {
|
|
64
|
+
promptOptions.choices.push({ key: 'd', name: 'Diff', value: 'diff' });
|
|
65
|
+
|
|
66
|
+
if (canEdit()) {
|
|
67
|
+
promptOptions.choices.push({ key: 'e', name: 'Edit', value: 'edit' });
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
return this.ui.prompt(promptOptions).then((response) => response.answer);
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
displayDiff() {
|
|
75
|
+
let info = this,
|
|
76
|
+
jsdiff = require('diff');
|
|
77
|
+
return hash({
|
|
78
|
+
input: this.render(),
|
|
79
|
+
output: readFile(info.outputPath),
|
|
80
|
+
}).then((result) => {
|
|
81
|
+
let diff = jsdiff.createPatch(
|
|
82
|
+
info.outputPath,
|
|
83
|
+
result.output.toString().replace(rxEOL, '\n'),
|
|
84
|
+
result.input.replace(rxEOL, '\n')
|
|
85
|
+
);
|
|
86
|
+
let lines = diff.split('\n');
|
|
87
|
+
|
|
88
|
+
for (let i = 0; i < lines.length; i++) {
|
|
89
|
+
info.ui.write(diffHighlight(lines[i] + EOL));
|
|
90
|
+
}
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
async render() {
|
|
95
|
+
if (!this.rendered) {
|
|
96
|
+
let result = await this._render();
|
|
97
|
+
this.rendered = this.replacer(result, this);
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
return this.rendered;
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
_render() {
|
|
104
|
+
let path = this.inputPath;
|
|
105
|
+
let context = this.templateVariables;
|
|
106
|
+
|
|
107
|
+
return readFile(path).then((content) =>
|
|
108
|
+
lstat(path).then((fileStat) => {
|
|
109
|
+
if (isBinaryFile(content, fileStat.size)) {
|
|
110
|
+
return content;
|
|
111
|
+
} else {
|
|
112
|
+
try {
|
|
113
|
+
return processTemplate(content.toString(), context);
|
|
114
|
+
} catch (err) {
|
|
115
|
+
err.message += ` (Error in blueprint template: ${path})`;
|
|
116
|
+
throw err;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
})
|
|
120
|
+
);
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
checkForConflict() {
|
|
124
|
+
return this.render().then((input) => {
|
|
125
|
+
input = input.toString().replace(rxEOL, '\n');
|
|
126
|
+
|
|
127
|
+
return readFile(this.outputPath)
|
|
128
|
+
.then((output) => {
|
|
129
|
+
output = output.toString().replace(rxEOL, '\n');
|
|
130
|
+
|
|
131
|
+
return input === output ? 'identical' : 'confirm';
|
|
132
|
+
})
|
|
133
|
+
.catch((e) => {
|
|
134
|
+
if (e.code === 'ENOENT') {
|
|
135
|
+
return 'none';
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
throw e;
|
|
139
|
+
});
|
|
140
|
+
});
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
confirmOverwriteTask() {
|
|
144
|
+
let info = this;
|
|
145
|
+
|
|
146
|
+
return function () {
|
|
147
|
+
function doConfirm() {
|
|
148
|
+
return info.confirmOverwrite(info.displayPath).then((action) => {
|
|
149
|
+
if (action === 'diff') {
|
|
150
|
+
return info.displayDiff().then(doConfirm);
|
|
151
|
+
} else if (action === 'edit') {
|
|
152
|
+
let editFileDiff = new EditFileDiff({ info });
|
|
153
|
+
return editFileDiff
|
|
154
|
+
.edit()
|
|
155
|
+
.then(() => (info.action = action))
|
|
156
|
+
.catch(() => doConfirm())
|
|
157
|
+
.then(() => info);
|
|
158
|
+
} else {
|
|
159
|
+
info.action = action;
|
|
160
|
+
return info;
|
|
161
|
+
}
|
|
162
|
+
});
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
return doConfirm();
|
|
166
|
+
};
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
module.exports = FileInfo;
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
const spawn = require('child_process').spawn;
|
|
4
|
+
|
|
5
|
+
function openEditor(file) {
|
|
6
|
+
if (!openEditor.canEdit()) {
|
|
7
|
+
throw new Error('EDITOR environment variable is not set');
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
if (!file) {
|
|
11
|
+
throw new Error('No `file` option provided');
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
let editorArgs = openEditor._env().EDITOR.split(' ');
|
|
15
|
+
let editor = editorArgs.shift();
|
|
16
|
+
const args = [file].concat(editorArgs);
|
|
17
|
+
let editProcess = openEditor._spawn(editor, args, { stdio: 'inherit' });
|
|
18
|
+
|
|
19
|
+
return new Promise((resolve, reject) => {
|
|
20
|
+
editProcess.on('close', (code) => {
|
|
21
|
+
if (code === 0) {
|
|
22
|
+
resolve();
|
|
23
|
+
} else {
|
|
24
|
+
reject(
|
|
25
|
+
new Error(`Spawn('${editor}', [${args.join(',')}]) exited with a non zero error status code: '${code}'`)
|
|
26
|
+
);
|
|
27
|
+
}
|
|
28
|
+
});
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
openEditor.canEdit = function () {
|
|
33
|
+
return openEditor._env().EDITOR !== undefined;
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
openEditor._env = function () {
|
|
37
|
+
return process.env;
|
|
38
|
+
};
|
|
39
|
+
|
|
40
|
+
openEditor._spawn = function () {
|
|
41
|
+
return spawn.apply(this, arguments);
|
|
42
|
+
};
|
|
43
|
+
|
|
44
|
+
module.exports = openEditor;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
function supportEmoji() {
|
|
4
|
+
const hasEmojiTurnedOff = process.argv.indexOf('--no-emoji') > -1;
|
|
5
|
+
return process.stdout.isTTY && process.platform !== 'win32' && !hasEmojiTurnedOff;
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
const areEmojiSupported = supportEmoji();
|
|
9
|
+
|
|
10
|
+
module.exports = function prependEmoji(emoji, msg) {
|
|
11
|
+
return areEmojiSupported ? `${emoji} ${msg}` : msg;
|
|
12
|
+
};
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
module.exports = function processTemplate(content, context) {
|
|
4
|
+
let options = {
|
|
5
|
+
evaluate: /<%([\s\S]+?)%>/g,
|
|
6
|
+
interpolate: /<%=([\s\S]+?)%>/g,
|
|
7
|
+
escape: /<%-([\s\S]+?)%>/g,
|
|
8
|
+
};
|
|
9
|
+
return require('lodash/template')(content, options)(context);
|
|
10
|
+
};
|