Skip to content

Commit 5faafa7

Browse files
committed
feat(@schematics/angular): use Oxfmt in generated workspaces
1 parent f696eaa commit 5faafa7

5 files changed

Lines changed: 17 additions & 14 deletions

File tree

‎packages/schematics/angular/utility/latest-versions/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"karma": "~6.4.0",
1919
"jsdom": "^30.0.0",
2020
"less": "^4.2.0",
21+
"oxfmt": "^0.74.0",
2122
"postcss": "^8.5.3",
22-
"prettier": "^3.8.1",
2323
"rxjs": "~7.8.0",
2424
"tailwindcss": "^4.1.12",
2525
"@tailwindcss/postcss": "^4.1.12",
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"$schema": "./node_modules/oxfmt/configuration_schema.json",
3+
"printWidth": 100,
4+
"singleQuote": true,
5+
"sortPackageJson": false,
6+
"associations": [
7+
{
8+
"files": ["**/*.html"],
9+
"excludeFiles": ["**/index.html"],
10+
"language": "angular-html"
11+
}
12+
]
13+
}

‎packages/schematics/angular/workspace/files/.prettierrc.template‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎packages/schematics/angular/workspace/files/package.json.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"devDependencies": {
2424
"@angular/cli": "<%= '^' + version %>",
2525
"@angular/compiler-cli": "<%= latestVersions.Angular %>",
26-
"prettier": "<%= latestVersions['prettier'] %>",
26+
"oxfmt": "<%= latestVersions['oxfmt'] %>",
2727
"typescript": "<%= latestVersions['typescript'] %>"
2828
}
2929
}

‎packages/schematics/angular/workspace/index_spec.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ describe('Workspace Schematic', () => {
5757
const pkg = JSON.parse(tree.readContent('/package.json'));
5858
expect(pkg.dependencies['@angular/core']).toEqual(latestVersions.Angular);
5959
expect(pkg.dependencies['rxjs']).toEqual(latestVersions['rxjs']);
60+
expect(pkg.devDependencies['oxfmt']).toEqual(latestVersions['oxfmt']);
6061
expect(pkg.devDependencies['typescript']).toEqual(latestVersions['typescript']);
6162
});
6263

@@ -79,6 +80,7 @@ describe('Workspace Schematic', () => {
7980
]),
8081
);
8182

83+
expect(files).toContain('/.oxfmtrc.json');
8284
expect(files).not.toContain('/.editorconfig');
8385
});
8486

0 commit comments

Comments
 (0)