Skip to content

Commit 1ccf515

Browse files
mshimamshima
authored
generate typescript blueprint by default (#33096)
1 parent e57a7b0 commit 1ccf515

42 files changed

Lines changed: 1446 additions & 585 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.blueprint/generate-sample/templates/test-integration/generate-blueprint-samples/default/.yo-rc.json renamed to .blueprint/generate-sample/templates/test-integration/generate-blueprint-samples/javascript/.yo-rc.json

Lines changed: 15 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@
44
"baseName": "foo",
55
"cli": true,
66
"defaultCommand": "generate-blueprint",
7-
"localBlueprint": false,
7+
"entities": [],
88
"generators": {
9-
"client": {
10-
"command": false,
9+
"angular": {
10+
"command": true,
1111
"priorities": [
1212
"initializing",
1313
"prompting",
1414
"configuring",
1515
"composing",
1616
"loading",
1717
"preparing",
18+
"configuringEachEntity",
19+
"loadingEntities",
1820
"preparingEachEntity",
1921
"preparingEachEntityField",
2022
"preparingEachEntityRelationship",
@@ -25,11 +27,12 @@
2527
"postWriting",
2628
"postWritingEntities",
2729
"install",
30+
"postInstall",
2831
"end"
2932
],
3033
"sbs": false
3134
},
32-
"common": {
35+
"client": {
3336
"command": false,
3437
"priorities": [
3538
"initializing",
@@ -52,7 +55,7 @@
5255
],
5356
"sbs": false
5457
},
55-
"cypress": {
58+
"common": {
5659
"command": false,
5760
"priorities": [
5861
"initializing",
@@ -75,7 +78,7 @@
7578
],
7679
"sbs": false
7780
},
78-
"server": {
81+
"cypress": {
7982
"command": false,
8083
"priorities": [
8184
"initializing",
@@ -107,25 +110,15 @@
107110
"composing",
108111
"loading",
109112
"preparing",
110-
"configuringEachEntity",
111-
"loadingEntities",
112-
"preparingEachEntity",
113-
"preparingEachEntityField",
114-
"preparingEachEntityRelationship",
115-
"postPreparingEachEntity",
116113
"default",
117-
"writing",
118-
"writingEntities",
119114
"postWriting",
120-
"postWritingEntities",
121-
"loadingTranslations",
122115
"install",
123116
"postInstall",
124117
"end"
125118
],
126119
"sbs": false
127120
},
128-
"spring-data-relational": {
121+
"languages": {
129122
"command": true,
130123
"priorities": [
131124
"initializing",
@@ -145,24 +138,21 @@
145138
"writingEntities",
146139
"postWriting",
147140
"postWritingEntities",
148-
"loadingTranslations",
149141
"install",
150142
"postInstall",
151143
"end"
152144
],
153145
"sbs": false
154146
},
155-
"languages": {
156-
"command": true,
147+
"server": {
148+
"command": false,
157149
"priorities": [
158150
"initializing",
159151
"prompting",
160152
"configuring",
161153
"composing",
162154
"loading",
163155
"preparing",
164-
"configuringEachEntity",
165-
"loadingEntities",
166156
"preparingEachEntity",
167157
"preparingEachEntityField",
168158
"preparingEachEntityRelationship",
@@ -172,14 +162,12 @@
172162
"writingEntities",
173163
"postWriting",
174164
"postWritingEntities",
175-
"loadingTranslations",
176165
"install",
177-
"postInstall",
178166
"end"
179167
],
180168
"sbs": false
181169
},
182-
"angular": {
170+
"spring-data-relational": {
183171
"command": true,
184172
"priorities": [
185173
"initializing",
@@ -199,15 +187,15 @@
199187
"writingEntities",
200188
"postWriting",
201189
"postWritingEntities",
202-
"loadingTranslations",
203190
"install",
204191
"postInstall",
205192
"end"
206193
],
207194
"sbs": false
208195
}
209196
},
210-
"mainGenerator": "generate-blueprint",
197+
"jhipsterVersion": "9.0.0",
198+
"localBlueprint": false,
211199
"prettierDefaultIndent": 2,
212200
"projectName": "CiTest",
213201
"subGenerators": ["client", "common", "cypress", "server", "jdl", "spring-data-relational", "languages", "angular"]

‎.blueprint/generate-sample/templates/test-integration/generate-blueprint-samples/typescript/.yo-rc.json‎

Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
{
2+
"generator-jhipster": {
3+
"additionalSubGenerators": "",
4+
"baseName": "foo",
5+
"cli": true,
6+
"defaultCommand": "generate-blueprint",
7+
"entities": [],
8+
"generators": {
9+
"angular": {
10+
"command": true,
11+
"priorities": [
12+
"initializing",
13+
"prompting",
14+
"configuring",
15+
"composing",
16+
"loading",
17+
"preparing",
18+
"configuringEachEntity",
19+
"loadingEntities",
20+
"preparingEachEntity",
21+
"preparingEachEntityField",
22+
"preparingEachEntityRelationship",
23+
"postPreparingEachEntity",
24+
"default",
25+
"writing",
26+
"writingEntities",
27+
"postWriting",
28+
"postWritingEntities",
29+
"install",
30+
"postInstall",
31+
"end"
32+
],
33+
"sbs": false
34+
},
35+
"client": {
36+
"command": false,
37+
"priorities": [
38+
"initializing",
39+
"prompting",
40+
"configuring",
41+
"composing",
42+
"loading",
43+
"preparing",
44+
"preparingEachEntity",
45+
"preparingEachEntityField",
46+
"preparingEachEntityRelationship",
47+
"postPreparingEachEntity",
48+
"default",
49+
"writing",
50+
"writingEntities",
51+
"postWriting",
52+
"postWritingEntities",
53+
"install",
54+
"end"
55+
],
56+
"sbs": false
57+
},
58+
"common": {
59+
"command": false,
60+
"priorities": [
61+
"initializing",
62+
"prompting",
63+
"configuring",
64+
"composing",
65+
"loading",
66+
"preparing",
67+
"preparingEachEntity",
68+
"preparingEachEntityField",
69+
"preparingEachEntityRelationship",
70+
"postPreparingEachEntity",
71+
"default",
72+
"writing",
73+
"writingEntities",
74+
"postWriting",
75+
"postWritingEntities",
76+
"install",
77+
"end"
78+
],
79+
"sbs": false
80+
},
81+
"cypress": {
82+
"command": false,
83+
"priorities": [
84+
"initializing",
85+
"prompting",
86+
"configuring",
87+
"composing",
88+
"loading",
89+
"preparing",
90+
"preparingEachEntity",
91+
"preparingEachEntityField",
92+
"preparingEachEntityRelationship",
93+
"postPreparingEachEntity",
94+
"default",
95+
"writing",
96+
"writingEntities",
97+
"postWriting",
98+
"postWritingEntities",
99+
"install",
100+
"end"
101+
],
102+
"sbs": false
103+
},
104+
"jdl": {
105+
"command": true,
106+
"priorities": [
107+
"initializing",
108+
"prompting",
109+
"configuring",
110+
"composing",
111+
"loading",
112+
"preparing",
113+
"default",
114+
"postWriting",
115+
"install",
116+
"postInstall",
117+
"end"
118+
],
119+
"sbs": false
120+
},
121+
"languages": {
122+
"command": true,
123+
"priorities": [
124+
"initializing",
125+
"prompting",
126+
"configuring",
127+
"composing",
128+
"loading",
129+
"preparing",
130+
"configuringEachEntity",
131+
"loadingEntities",
132+
"preparingEachEntity",
133+
"preparingEachEntityField",
134+
"preparingEachEntityRelationship",
135+
"postPreparingEachEntity",
136+
"default",
137+
"writing",
138+
"writingEntities",
139+
"postWriting",
140+
"postWritingEntities",
141+
"install",
142+
"postInstall",
143+
"end"
144+
],
145+
"sbs": false
146+
},
147+
"server": {
148+
"command": false,
149+
"priorities": [
150+
"initializing",
151+
"prompting",
152+
"configuring",
153+
"composing",
154+
"loading",
155+
"preparing",
156+
"preparingEachEntity",
157+
"preparingEachEntityField",
158+
"preparingEachEntityRelationship",
159+
"postPreparingEachEntity",
160+
"default",
161+
"writing",
162+
"writingEntities",
163+
"postWriting",
164+
"postWritingEntities",
165+
"install",
166+
"end"
167+
],
168+
"sbs": false
169+
},
170+
"spring-data-relational": {
171+
"command": true,
172+
"priorities": [
173+
"initializing",
174+
"prompting",
175+
"configuring",
176+
"composing",
177+
"loading",
178+
"preparing",
179+
"configuringEachEntity",
180+
"loadingEntities",
181+
"preparingEachEntity",
182+
"preparingEachEntityField",
183+
"preparingEachEntityRelationship",
184+
"postPreparingEachEntity",
185+
"default",
186+
"writing",
187+
"writingEntities",
188+
"postWriting",
189+
"postWritingEntities",
190+
"install",
191+
"postInstall",
192+
"end"
193+
],
194+
"sbs": false
195+
}
196+
},
197+
"javascriptBlueprint": false,
198+
"jhipsterVersion": "9.0.1",
199+
"localBlueprint": false,
200+
"prettierDefaultIndent": 2,
201+
"projectName": "CiTest",
202+
"subGenerators": ["client", "common", "cypress", "server", "jdl", "spring-data-relational", "languages", "angular"]
203+
}
204+
}

‎.github/workflows/generator-generate-blueprint.yml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ jobs:
2828
run:
2929
working-directory: ${{ github.workspace }}/app
3030
strategy:
31+
fail-fast: false
3132
matrix:
32-
sample: [default]
33+
sample: ['javascript', 'typescript']
3334
if: >-
3435
!contains(github.event.head_commit.message, '[ci skip]') &&
3536
!contains(github.event.head_commit.message, '[skip ci]') &&
@@ -74,6 +75,19 @@ jobs:
7475
working-directory: ${{ github.workspace }}/generator-jhipster-foo
7576
env:
7677
JHI_FOLDER_APP: ${{ github.workspace }}/generator-jhipster-foo
78+
- uses: jhipster/actions/compare-sample@v1
79+
id: compare
80+
if: >-
81+
github.event.pull_request &&
82+
!contains(github.event.pull_request.labels.*.name, 'pr: disable-compare')
83+
with:
84+
generator-path: generator-jhipster
85+
application-folder: generator-jhipster-foo
86+
compare-folder: generator-jhipster-foo
87+
cmd: jhipster.cjs generate-sample generate-blueprint-samples/default --sample-yorc-folder --entities-sample none --link-jhipster-dependency --skip-checks --skip-install --no-insight
88+
env:
89+
# generate-sample uses JHI_FOLDER_APP to generate the application.
90+
JHI_FOLDER_APP: ${{ github.workspace }}/base/generator-jhipster-foo
7791
- name: 'GENERATION: project'
7892
run: jhipster-foo --defaults --client-test-frameworks cypress --skip-jhipster-dependencies
7993
env:

‎generators/app/generator.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@
1818
*/
1919
import { before, describe, expect, it } from 'esmocha';
2020

21-
import { createTestHelpers, result } from '../../lib/testing/index.ts';
21+
import { createTestHelpers, typedResult } from '../../lib/testing/index.ts';
2222
import { testBlueprintSupport } from '../../test/support/tests.ts';
2323

2424
import type Generator from './generator.ts';
2525

2626
const helpers = createTestHelpers<Generator>({
2727
importMeta: import.meta,
2828
});
29+
const result = typedResult<Generator>();
2930

3031
describe(`generator - ${helpers.commandName}`, () => {
3132
it('should support features parameter', async () => {

0 commit comments

Comments
 (0)