Skip to content

Commit 7617c45

Browse files
committed
Merge branch 'prettier-config' into main
2 parents 699e106 + 1f58596 commit 7617c45

File tree

214 files changed

+701
-524
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+701
-524
lines changed

.editorconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
insert_final_newline = true
7+
trim_trailing_whitespace = true
8+
indent_style = space
9+
indent_size = 4
10+
11+
[{data/deprecated.json,data/discarded.json,package.json,.package-lock.json}]
12+
indent_size = 2

.github/workflows/lint.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: prettier check
2+
on: [push, pull_request]
3+
jobs:
4+
lint:
5+
name: Check for code formatting mistakes
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: actions/checkout@v2
9+
- uses: actions/setup-node@v2
10+
with:
11+
node-version: '16'
12+
- run: npm install
13+
- run: npm run lint

.prettierignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package.json
2+
package-lock.json
3+
dist/
4+
*.yaml
5+
data/discarded.json
6+
data/deprecated.json

.prettierrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parser": "json-stringify",
3+
"proseWrap": "never",
4+
"bracketSpacing": true,
5+
"endOfLine": "lf"
6+
}

data/fields/access.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
{
2-
"keys": ["access", "foot", "motor_vehicle", "bicycle", "horse"],
3-
"reference": {"key": "access"},
2+
"keys": [
3+
"access",
4+
"foot",
5+
"motor_vehicle",
6+
"bicycle",
7+
"horse"
8+
],
9+
"reference": {
10+
"key": "access"
11+
},
412
"type": "access",
513
"label": "Allowed Access",
614
"placeholder": "Not Specified",

data/fields/access_simple.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"no": "None"
1414
}
1515
},
16-
"autoSuggestions" : false,
16+
"autoSuggestions": false,
1717
"terms": [
1818
"permitted",
1919
"private",

data/fields/activity.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
"Ski": "Skiing"
1818
}
1919
}
20-
}
20+
}

data/fields/addr/interpolation.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"odd": "Odd",
1010
"alphabetic": "Alphabetic"
1111
}
12-
},
13-
"autoSuggestions" : false,
14-
"customValues" : false
12+
},
13+
"autoSuggestions": false,
14+
"customValues": false
1515
}

data/fields/address.json

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -29,40 +29,40 @@
2929
"label": "Address",
3030
"strings": {
3131
"placeholders": {
32-
"block_number": "Block Number",
33-
"block_number!jp": "Block No.",
34-
"city": "City",
35-
"city!cn": "City/Prefecture/League",
36-
"city!jp": "City/Town/Village/Tokyo Special Ward",
37-
"city!vn": "City/Town",
38-
"conscriptionnumber": "123",
39-
"country": "Country",
40-
"county": "County",
41-
"county!jp": "District",
42-
"district": "District",
43-
"district!cn": "District/County/Banner",
44-
"district!vn": "Arrondissement/Town/District",
45-
"floor": "Floor",
46-
"hamlet": "Hamlet",
47-
"housename": "Housename",
48-
"housenumber": "123",
49-
"housenumber!jp": "Building No./Lot No.",
50-
"neighbourhood": "Neighbourhood",
51-
"neighbourhood!jp": "Chōme/Aza/Koaza",
52-
"place": "Place",
53-
"postcode": "Postcode",
54-
"province": "Province",
55-
"province!cn": "Province/Municipality/AR/SAR",
56-
"province!jp": "Prefecture",
57-
"quarter": "Quarter",
58-
"quarter!jp": "Ōaza/Machi",
59-
"state": "State",
60-
"street": "Street",
61-
"subdistrict": "Subdistrict",
62-
"subdistrict!vn": "Ward/Commune/Townlet",
63-
"suburb": "Suburb",
64-
"suburb!jp": "Ward",
65-
"unit": "Unit"
32+
"block_number": "Block Number",
33+
"block_number!jp": "Block No.",
34+
"city": "City",
35+
"city!cn": "City/Prefecture/League",
36+
"city!jp": "City/Town/Village/Tokyo Special Ward",
37+
"city!vn": "City/Town",
38+
"conscriptionnumber": "123",
39+
"country": "Country",
40+
"county": "County",
41+
"county!jp": "District",
42+
"district": "District",
43+
"district!cn": "District/County/Banner",
44+
"district!vn": "Arrondissement/Town/District",
45+
"floor": "Floor",
46+
"hamlet": "Hamlet",
47+
"housename": "Housename",
48+
"housenumber": "123",
49+
"housenumber!jp": "Building No./Lot No.",
50+
"neighbourhood": "Neighbourhood",
51+
"neighbourhood!jp": "Chōme/Aza/Koaza",
52+
"place": "Place",
53+
"postcode": "Postcode",
54+
"province": "Province",
55+
"province!cn": "Province/Municipality/AR/SAR",
56+
"province!jp": "Prefecture",
57+
"quarter": "Quarter",
58+
"quarter!jp": "Ōaza/Machi",
59+
"state": "State",
60+
"street": "Street",
61+
"subdistrict": "Subdistrict",
62+
"subdistrict!vn": "Ward/Commune/Townlet",
63+
"suburb": "Suburb",
64+
"suburb!jp": "Ward",
65+
"unit": "Unit"
6666
}
6767
},
6868
"terms": [

data/fields/aerialway.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
"key": "aerialway",
33
"type": "typeCombo",
44
"label": "Type"
5-
}
5+
}

0 commit comments

Comments
 (0)