-
-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/2.3.1' into main
# Conflicts: # README.md
- Loading branch information
Showing
6 changed files
with
294 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,200 @@ | ||
| ## GITATTRIBUTES FOR WEB PROJECTS | ||
| # | ||
| # These settings are for any web project. | ||
| # | ||
| # Details per file setting: | ||
| # text These files should be normalized (i.e. convert CRLF to LF). | ||
| # binary These files are binary and should be left untouched. | ||
| # | ||
| # Note that binary is a macro for -text -diff. | ||
| ###################################################################### | ||
|
|
||
| # Auto detect | ||
| ## Handle line endings automatically for files detected as | ||
| ## text and leave all files detected as binary untouched. | ||
| ## This will handle all files NOT defined below. | ||
| * text=auto | ||
|
|
||
| # Source code | ||
| *.bash text eol=lf | ||
| *.bat text eol=crlf | ||
| *.cmd text eol=crlf | ||
| *.coffee text | ||
| *.css text | ||
| *.htm text diff=html | ||
| *.html text diff=html | ||
| *.inc text | ||
| *.ini text | ||
| *.js text | ||
| *.json text | ||
| *.geojson text | ||
| *.jsx text | ||
| *.less text | ||
| *.ls text | ||
| *.map text -diff | ||
| *.od text | ||
| *.onlydata text | ||
| *.php text diff=php | ||
| *.pl text | ||
| *.ps1 text eol=crlf | ||
| *.py text diff=python | ||
| *.rb text diff=ruby | ||
| *.sass text | ||
| *.scm text | ||
| *.scss text diff=css | ||
| *.sh text eol=lf | ||
| *.sql text | ||
| *.styl text | ||
| *.tag text | ||
| *.ts text | ||
| *.tsx text | ||
| *.xml text | ||
| *.xhtml text diff=html | ||
|
|
||
| # Docker | ||
| Dockerfile text | ||
|
|
||
| # Documentation | ||
| *.ipynb text | ||
| *.markdown text | ||
| *.md text | ||
| *.mdwn text | ||
| *.mdown text | ||
| *.mkd text | ||
| *.mkdn text | ||
| *.mdtxt text | ||
| *.mdtext text | ||
| *.txt text | ||
| AUTHORS text | ||
| CHANGELOG text | ||
| CHANGES text | ||
| CONTRIBUTING text | ||
| COPYING text | ||
| copyright text | ||
| *COPYRIGHT* text | ||
| INSTALL text | ||
| license text | ||
| LICENSE text | ||
| NEWS text | ||
| readme text | ||
| *README* text | ||
| TODO text | ||
|
|
||
| # Templates | ||
| *.dot text | ||
| *.ejs text | ||
| *.haml text | ||
| *.handlebars text | ||
| *.hbs text | ||
| *.hbt text | ||
| *.jade text | ||
| *.latte text | ||
| *.mustache text | ||
| *.njk text | ||
| *.phtml text | ||
| *.tmpl text | ||
| *.tpl text | ||
| *.twig text | ||
| *.vue text | ||
|
|
||
| # Configs | ||
| *.cnf text | ||
| *.conf text | ||
| *.config text | ||
| .editorconfig text | ||
| .env text | ||
| .gitattributes text | ||
| .gitconfig text | ||
| .htaccess text | ||
| *.lock text -diff | ||
| package-lock.json text -diff | ||
| *.toml text | ||
| *.yaml text | ||
| *.yml text | ||
| browserslist text | ||
| Makefile text | ||
| makefile text | ||
|
|
||
| # Heroku | ||
| Procfile text | ||
|
|
||
| # Graphics | ||
| *.ai binary | ||
| *.bmp binary | ||
| *.eps binary | ||
| *.gif binary | ||
| *.gifv binary | ||
| *.ico binary | ||
| *.jng binary | ||
| *.jp2 binary | ||
| *.jpg binary | ||
| *.jpeg binary | ||
| *.jpx binary | ||
| *.jxr binary | ||
| *.pdf binary | ||
| *.png binary | ||
| *.psb binary | ||
| *.psd binary | ||
| # SVG treated as an asset (binary) by default. | ||
| *.svg text | ||
| # If you want to treat it as binary, | ||
| # use the following line instead. | ||
| # *.svg binary | ||
| *.svgz binary | ||
| *.tif binary | ||
| *.tiff binary | ||
| *.wbmp binary | ||
| *.webp binary | ||
|
|
||
| # Audio | ||
| *.kar binary | ||
| *.m4a binary | ||
| *.mid binary | ||
| *.midi binary | ||
| *.mp3 binary | ||
| *.ogg binary | ||
| *.ra binary | ||
|
|
||
| # Video | ||
| *.3gpp binary | ||
| *.3gp binary | ||
| *.as binary | ||
| *.asf binary | ||
| *.asx binary | ||
| *.fla binary | ||
| *.flv binary | ||
| *.m4v binary | ||
| *.mng binary | ||
| *.mov binary | ||
| *.mp4 binary | ||
| *.mpeg binary | ||
| *.mpg binary | ||
| *.ogv binary | ||
| *.swc binary | ||
| *.swf binary | ||
| *.webm binary | ||
|
|
||
| # Archives | ||
| *.7z binary | ||
| *.gz binary | ||
| *.jar binary | ||
| *.rar binary | ||
| *.tar binary | ||
| *.zip binary | ||
|
|
||
| # Fonts | ||
| *.ttf binary | ||
| *.eot binary | ||
| *.otf binary | ||
| *.woff binary | ||
| *.woff2 binary | ||
|
|
||
| # Executables | ||
| *.exe binary | ||
| *.pyc binary | ||
|
|
||
| # RC files (like .babelrc or .eslintrc) | ||
| *.*rc text | ||
|
|
||
| # Ignore files (like .npmignore or .gitignore) | ||
| *.*ignore text |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| name: Build | ||
|
|
||
| on: | ||
| push: | ||
| tags: | ||
| - 'main' | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| # Checkout code | ||
| - uses: actions/checkout@v2 | ||
|
|
||
| - name: Set tag | ||
| run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV | ||
|
|
||
| - uses: actions/setup-node@v2 | ||
| with: | ||
| node-version: 16 | ||
| registry-url: 'https://npm.pkg.github.com' | ||
|
|
||
| - name: Prepare authentication and NPM | ||
| env: | ||
| NODE_AUTH_TOKEN: ${{ secrets.ACCESS_TOKEN }} | ||
| run: | | ||
| npm install | ||
| - name: Publish NPM package on GitHub | ||
| env: | ||
| NODE_AUTH_TOKEN: ${{ secrets.ACCESS_TOKEN }} | ||
| run: | | ||
| npm publish | ||
| - uses: montudor/action-zip@v0.1.0 | ||
| if: (!startsWith(github.ref, 'refs/heads/release') && !startsWith(github.ref, 'refs/heads/hotfix')) | ||
| with: | ||
| args: zip -qq -r /tmp/dist.zip . | ||
|
|
||
| - uses: marvinpinto/action-automatic-releases@v1.2.1 | ||
| if: (success() && (!startsWith(github.ref, 'refs/heads/release') && !startsWith(github.ref, 'refs/heads/hotfix'))) | ||
| with: | ||
| repo_token: ${{ secrets.GITHUB_TOKEN }} | ||
| automatic_release_tag: ${{ env.RELEASE_VERSION }} | ||
| prerelease: false | ||
| title: Release ${{ env.RELEASE_VERSION }} | ||
| files: /tmp/dist.zip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| .idea | ||
| package-lock.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| # CHANGELOG | ||
|
|
||
| ## 1.0.0 | ||
| * New: countries boundaries | ||
|
|
||
| ## 2.0.0 | ||
| * New: areas boundaries | ||
|
|
||
| # 2.2.0 | ||
| * New: US and AU boundaries | ||
|
|
||
| ## 2.3.0 | ||
| * New: Canada provinces and territories boundaries (OSM / low quality) | ||
|
|
||
| ## 2.3.1 | ||
| * Fix: added missing Greek islands of Pitta and Kastellorizo | ||
| * Fix: fixed country file names for Mauritius, North Macedonia and Saint Vincent and the Grenadines; | ||
| * Fix: Bouvet Island moved out of Svalbard; | ||
| * * Fix: normalized countries coordinates (from -180 to 180); | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "name": "@georgique/world-geojson", | ||
| "license": "proprietary", | ||
| "repository": "git://github.com/georgique/world-geojson.git", | ||
| "version": "2.3.1", | ||
| "files": [ | ||
| "areas", | ||
| "countries", | ||
| "states", | ||
| "CHANGELOG.md", | ||
| "README.md", | ||
| "LICENSE" | ||
| ], | ||
| "dependencies": {}, | ||
| "devDependencies": {}, | ||
| "publishConfig": { | ||
| "registry": "https://npm.pkg.github.com/" | ||
| } | ||
| } |