Skip to content

Commit

Permalink
Revert "Use yarn instead of npm"
Browse files Browse the repository at this point in the history
  • Loading branch information
swsnr authored Dec 31, 2023
1 parent 12ad2c2 commit 668b471
Show file tree
Hide file tree
Showing 7 changed files with 2,869 additions and 2,168 deletions.
2 changes: 2 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ module.exports = {
// Build outputs
"/build/**/*",
"/dist/**/*",
// Node modules
"/node_modules/**/*",
// Generated types
"/@types/gir-generated/**/*",
],
Expand Down
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# Package manager artifacts
/.yarn/
/.pnp.*
/node_modules/

# Extension artifact
/dist/
Expand Down
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

# Node configuration and modules
/package.json
/.pnp.*
/node_modules/

# Files I prefer not to be formatted
*.md
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dist: compile
mkdir -p ./dist/
mkdir -p ./build/ui
cp -t ./build/ui $(UIDEFS)
yarn dist:format
npm run dist:format
gnome-extensions pack --force --out-dir dist build \
--extra-source=../metadata.json \
--extra-source=ui \
Expand Down Expand Up @@ -53,35 +53,35 @@ install-package: dist

.PHONY: compile
compile: $(UIDEFS)
yarn compile
npm run compile

.PHONY: clean
clean:
rm -rf ./dist/ ./build/

.PHONY: generate
generate:
yarn generate:gir-types
npm run generate:gir-types

.PHONY: format
format:
yarn format --write
npm run format -- --write

.PHONY: lint
lint:
yarn lint
npm run lint

.PHONY: check-types
check-types:
yarn check:types
npm run check:types

.PHONY: check
check: lint check-types
yarn format --check
npm run format -- --check

.PHONY: fix
fix: format
yarn lint --fix
npm run lint -- --fix

$(UIDEFS): %.ui: %.blp
blueprint-compiler compile --output $@ $<
Loading

0 comments on commit 668b471

Please sign in to comment.