Skip to content
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.

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

Update dependencies #5

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions .eslintrc.json

This file was deleted.

7 changes: 2 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: lts/*

Expand All @@ -24,8 +24,5 @@ jobs:
- name: Type-check
run: npm run type:check

- name: Lint
run: npm run lint

- name: Format-check
run: npm run format:check
3 changes: 0 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx --no lint-staged
3 changes: 1 addition & 2 deletions .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"*.js": ["eslint --fix", "prettier --write"],
"*.{json,md,yml}": "prettier --write"
"*.{js,json,md,yml}": "prettier --write"
}
4 changes: 4 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"arrowParens": "avoid",
"plugins": [
"prettier-plugin-organize-imports",
"prettier-plugin-packagejson"
],
"semi": false,
"singleQuote": true
}
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# [Countryquest](https://country.quest/)

[![Build status](https://img.shields.io/github/workflow/status/rbardini/countryquest/Main)](https://github.com/rbardini/countryquest/actions)
[![Build status](https://img.shields.io/github/actions/workflow/status/rbardini/countryquest/main.yml)](https://github.com/rbardini/countryquest/actions)
[![Deploy status](https://img.shields.io/netlify/12195d0a-3b08-456a-b49d-ed2f2465018d?label=deploy)](https://app.netlify.com/sites/countryquest/deploys)

🗺️ An interactive scratch off map. Keep track of which places you have been, how much of the world you have conquered, and where to go next.
Expand All @@ -13,7 +13,6 @@
- 📈 [amCharts](https://www.amcharts.com/) for map charts
- 🌎 [REST Countries](https://restcountries.com/) for country data
- 🤖 [TypeScript](https://www.typescriptlang.org/) for type-checking
- ⚠️ [ESLint](https://eslint.org/) for linting
- 💄 [Prettier](https://prettier.io/) for formatting
- 🐶 [Husky](https://typicode.github.io/husky) and [lint-staged](https://github.com/okonet/lint-staged) for commit hooks
- 🎬 [Framer Motion](https://www.framer.com/motion/) for animations
Expand Down
4 changes: 2 additions & 2 deletions data/preval/geodata.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @preval
const worldLowGeodata = require('@amcharts/amcharts5-geodata/json/worldLow.json')
const countries2 = require('@amcharts/amcharts5-geodata/json/data/countries2.json')
const { isEuMember } = require('is-eu-member')
const { euMember } = require('is-european')
const restcountries = require('./json/restcountries.json')

const UM_ID = 'UM'
Expand Down Expand Up @@ -31,7 +31,7 @@ module.exports = {
// Add extra information
feature => {
const blocks = [
isEuMember(feature.id) && { id: 'EU', name: 'European Union' },
euMember(feature.id) && { id: 'EU', name: 'European Union' },
].filter(Boolean)
const { continent: continentName, continent_code: continentId } =
countries2[feature.id]
Expand Down
Loading