File tree Expand file tree Collapse file tree 4 files changed +26
-4
lines changed
packages/schematics/angular Expand file tree Collapse file tree 4 files changed +26
-4
lines changed Original file line number Diff line number Diff line change 1818 "jsdom" : " ^27.1.0" ,
1919 "less" : " ^4.2.0" ,
2020 "postcss" : " ^8.5.3" ,
21+ "prettier" : " ^3.7.4" ,
2122 "protractor" : " ~7.0.0" ,
2223 "rxjs" : " ~7.8.0" ,
2324 "tailwindcss" : " ^4.1.12" ,
Original file line number Diff line number Diff line change 77 "build": "ng build",
88 "watch": "ng build --watch --configuration development"<% if (!minimal) { %>,
99 "test": "ng test"<% } %>
10- },
10+ },<% if (!skipPrettier) { %>
1111 "prettier": {
1212 "printWidth": 100,
1313 "singleQuote": true,
1919 }
2020 }
2121 ]
22- },
22+ },<% } %>
2323 "private": true,
2424 <% if (packageManagerWithVersion) { %>"packageManager": "<%= packageManagerWithVersion %>",<% } %>
2525 "dependencies": {
3434 },
3535 "devDependencies": {
3636 "@angular/cli": "<%= '^' + version %>",
37- "@angular/compiler-cli": "<%= latestVersions.Angular %>",
37+ "@angular/compiler-cli": "<%= latestVersions.Angular %>",<% if (!skipPrettier) { %>
38+ "prettier": "<%= latestVersions['prettier'] %>",<% } %>
3839 "typescript": "<%= latestVersions['typescript'] %>"
3940 }
4041}
Original file line number Diff line number Diff line change @@ -135,9 +135,24 @@ describe('Workspace Schematic', () => {
135135 expect ( tasks ) . not . toContain ( jasmine . objectContaining ( { type : 'npm' , script : 'test' } ) ) ;
136136 } ) ;
137137
138- it ( 'should include prettier config overrides for Angular templates ' , async ( ) => {
138+ it ( 'should include prettier config and dependency by default ' , async ( ) => {
139139 const tree = await schematicRunner . runSchematic ( 'workspace' , defaultOptions ) ;
140140 const pkg = JSON . parse ( tree . readContent ( '/package.json' ) ) ;
141141 expect ( pkg . prettier ) . withContext ( 'package.json#prettier is present' ) . toBeTruthy ( ) ;
142+ expect ( pkg . devDependencies [ 'prettier' ] )
143+ . withContext ( 'prettier is in devDependencies' )
144+ . toEqual ( latestVersions [ 'prettier' ] ) ;
145+ } ) ;
146+
147+ it ( 'should not include prettier config and dependency when skipPrettier is true' , async ( ) => {
148+ const tree = await schematicRunner . runSchematic ( 'workspace' , {
149+ ...defaultOptions ,
150+ skipPrettier : true ,
151+ } ) ;
152+ const pkg = JSON . parse ( tree . readContent ( '/package.json' ) ) ;
153+ expect ( pkg . prettier ) . withContext ( 'package.json#prettier should not be present' ) . toBeUndefined ( ) ;
154+ expect ( pkg . devDependencies [ 'prettier' ] )
155+ . withContext ( 'prettier should not be in devDependencies' )
156+ . toBeUndefined ( ) ;
142157 } ) ;
143158} ) ;
Original file line number Diff line number Diff line change 4444 "$default" : {
4545 "$source" : " packageManager"
4646 }
47+ },
48+ "skipPrettier" : {
49+ "description" : " Skip adding Prettier configuration and dependency to the workspace." ,
50+ "type" : " boolean" ,
51+ "default" : false
4752 }
4853 },
4954 "required" : [" name" , " version" ]
You can’t perform that action at this time.
0 commit comments