Skip to content

feat(@schematics/angular): use Oxfmt in generated workspaces #34459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cexbrayat wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −14
Open

feat(@schematics/angular): use Oxfmt in generated workspaces #34459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/schematics/angular/utility/latest-versions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"karma": "~6.4.0",
"jsdom": "^30.0.0",
"less": "^4.2.0",
"oxfmt": "^0.74.0",
"postcss": "^8.5.3",
"prettier": "^3.8.1",
"rxjs": "~7.8.0",
"tailwindcss": "^4.1.12",
"@tailwindcss/postcss": "^4.1.12",
Expand Down
13 changes: 13 additions & 0 deletions packages/schematics/angular/workspace/files/.oxfmtrc.json.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"$schema": "./node_modules/oxfmt/configuration_schema.json",
"printWidth": 100,
"singleQuote": true,
"sortPackageJson": false,
"associations": [
{
"files": ["**/*.html"],
"excludeFiles": ["**/index.html"],
"language": "angular-html"
Comment thread
alan-agius4 marked this conversation as resolved.
}
]
}
12 changes: 0 additions & 12 deletions packages/schematics/angular/workspace/files/.prettierrc.template
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/schematics/angular/workspace/files/package.json.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"devDependencies": {
"@angular/cli": "<%= '^' + version %>",
"@angular/compiler-cli": "<%= latestVersions.Angular %>",
"prettier": "<%= latestVersions['prettier'] %>",
"oxfmt": "<%= latestVersions['oxfmt'] %>",
"typescript": "<%= latestVersions['typescript'] %>"
}
}
2 changes: 2 additions & 0 deletions packages/schematics/angular/workspace/index_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ describe('Workspace Schematic', () => {
const pkg = JSON.parse(tree.readContent('/package.json'));
expect(pkg.dependencies['@angular/core']).toEqual(latestVersions.Angular);
expect(pkg.dependencies['rxjs']).toEqual(latestVersions['rxjs']);
expect(pkg.devDependencies['oxfmt']).toEqual(latestVersions['oxfmt']);
expect(pkg.devDependencies['typescript']).toEqual(latestVersions['typescript']);
});

Expand All @@ -79,6 +80,7 @@ describe('Workspace Schematic', () => {
]),
);

expect(files).toContain('/.oxfmtrc.json');
expect(files).not.toContain('/.editorconfig');
});

Expand Down
Loading