Skip to content

Commit

Permalink
Merge branch 'biome'
Browse files Browse the repository at this point in the history
  • Loading branch information
lgarron committed Sep 1, 2023
2 parents dd40e98 + b43cb14 commit 7705631
Show file tree
Hide file tree
Showing 10 changed files with 198 additions and 175 deletions.
2 changes: 1 addition & 1 deletion .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Initial `make format` with Rome
# Initial `make format` with Rome (Biome)
5d4256efc96914b52c2bc98504a8e26ba68dbc36
# `make format` for Rome v0.10.1-next
4b8891790c651de031d8a35dd7687f59db5e84e2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- uses: rome/[email protected]
- uses: rome/[email protected] # TODO(https://github.com/cubing/cubing.js/issues/290)
with:
version: latest
- run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"recommendations": [
"rome.rome"
"biomejs.biome"
],
"unwantedRecommendations": [
"ms-vscode-remote.remote-containers"
Expand Down
5 changes: 2 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"typescript.tsdk": "node_modules/typescript/lib",
"editor.defaultFormatter": "rome.rome",
"editor.defaultFormatter": "biomejs.biome",
"[typescript]": {
"editor.defaultFormatter": "rome.rome"
"editor.defaultFormatter": "biomejs.biome"
},
"rome.lspBin": "./node_modules/.bin/rome",
"[jsonc]": {
"editor.defaultFormatter": "vscode.json-language-features"
}
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# TODO: see if we can make everything compatible with `bun`
NODE=node
ROME=./node_modules/.bin/rome
BIOME=npx @biomejs/biome
WEB_TEST_RUNNER=./node_modules/.bin/wtr

.PHONY: default
Expand Down Expand Up @@ -159,18 +159,18 @@ test-dist-sites-experiments: build-sites
${NODE} ./script/test/dist/experiments/main.js
.PHONY: format
format:
${ROME} format --write ./script ./src
${BIOME} format --write ./script ./src
.PHONY: setup
setup:
npm ci
.PHONY: quick-setup
quick-setup: | node_modules
.PHONY: lint
lint:
${ROME} check ./script ./src
${BIOME} check ./script ./src
.PHONY: lint-ci
lint-ci:
${ROME} ci ./script ./src
${BIOME} ci ./script ./src
.PHONY: prepack
prepack: clean build test-dist-esm-node-import test-dist-esm-plain-esbuild-compat
.PHONY: prepublishOnly
Expand Down
6 changes: 6 additions & 0 deletions rome.json → biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
"rules": {
"recommended": true,
"nursery": {},
"complexity": {
"useLiteralKeys": "off"
},
"correctness": {
"noUnreachableSuper": "off"
},
Expand Down Expand Up @@ -41,5 +44,8 @@
"./src/sites/experiments.cubing.net/cubing.js/rust/wasm/*.js",
"./src/sites/experiments.cubing.net/cubing.js/rust/wasm/*.d.ts"
]
},
"organizeImports": {
"enabled": false
}
}
Loading

0 comments on commit 7705631

Please sign in to comment.