Skip to content

Commit 41f6040

Browse files
committed
chore: merge into main
2 parents 5d6ef04 + 60039cc commit 41f6040

24 files changed

+8886
-6273
lines changed

.github/workflows/main.yml renamed to .github/workflows/build-release.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
#on:
2-
# push:
3-
# branches:
4-
# - main
51
on:
6-
workflow_dispatch:
7-
inputs:
8-
environment:
9-
description: 'git-tag'
10-
required: true
2+
push:
3+
branches:
4+
- main
5+
pull_request:
6+
branches:
7+
- main
118

129
env:
1310
project-directory: ./
Lines changed: 12 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,20 @@
1-
on: [push, pull_request]
2-
name: Build and Publish
1+
name: Publish NPM Package
2+
on:
3+
workflow_dispatch:
34
jobs:
4-
build:
5-
name: Build
6-
runs-on: ubuntu-latest
7-
steps:
8-
- uses: actions/checkout@v2
9-
- name: Use Node.js '16.x'
10-
uses: actions/setup-node@v1
11-
with:
12-
node-version: '16.x'
13-
- name: Cache node_modules
14-
id: cache-modules
15-
uses: actions/cache@v1
16-
with:
17-
path: node_modules
18-
key: 16.x-${{ runner.OS }}-build-${{ hashFiles('package.json') }}
19-
- name: Build
20-
if: steps.cache-modules.outputs.cache-hit != 'true'
21-
run: npm install
225
publish:
23-
name: Publish
246
runs-on: ubuntu-latest
25-
if: github.event_name == 'push' && ( github.ref == 'refs/heads/main' )
267
steps:
278
- uses: actions/checkout@v2
28-
- name: Cache node_modules
29-
id: cache-modules
30-
uses: actions/cache@v1
9+
- uses: actions/setup-node@v1
3110
with:
32-
path: node_modules
33-
key: 16.x-${{ runner.OS }}-build-${{ hashFiles('package.json') }}
34-
- name: Build
35-
if: steps.cache-modules.outputs.cache-hit != 'true'
36-
run: npm install
37-
11+
node-version: '16.x'
12+
registry-url: 'https://registry.npmjs.org'
3813
- name: Publish
39-
uses: mikeal/merge-release@master
14+
run: |
15+
npm config set '//registry.npmjs.org/:_authToken' "${{secrets.NPM_AUTH_TOKEN}}"
16+
npm install -D husky
17+
npx husky install
18+
npm publish --ignore-scripts
4019
env:
41-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
42-
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
20+
NPM_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}

CHANGELOG.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,47 @@
1+
## [1.3.1](https://github.com/Greenstand/treetracker-web-map-core/compare/v1.3.0...v1.3.1) (2022-01-13)
2+
3+
### Bug Fixes
4+
5+
- missing gen runtime" ([74ef59c](https://github.com/Greenstand/treetracker-web-map-core/commit/74ef59cadea4b5fc9b609e130e7874b3cc2a7b43))
6+
7+
# [1.3.0](https://github.com/Greenstand/treetracker-web-map-core/compare/v1.2.0...v1.3.0) (2022-01-13)
8+
9+
### Features
10+
11+
- deploy test ([de2c855](https://github.com/Greenstand/treetracker-web-map-core/commit/de2c855db81cb62f229bc77aa24bab9256d9e33f))
12+
13+
# [1.2.0](https://github.com/Greenstand/treetracker-web-map-core/compare/v1.1.0...v1.2.0) (2022-01-13)
14+
15+
### Bug Fixes
16+
17+
- install regenerator-runtime and import it to src/Map and src/Requestor ([2c8b7e7](https://github.com/Greenstand/treetracker-web-map-core/commit/2c8b7e7061860faad8f4088c2d3fa63685600696))
18+
- restore deleted css styles for old icons ([355c330](https://github.com/Greenstand/treetracker-web-map-core/commit/355c330d706bd1c651baf6e1f9e4d6df2df12292))
19+
20+
### Features
21+
22+
- set npm publishing to manual fixes [#56](https://github.com/Greenstand/treetracker-web-map-core/issues/56) ([#60](https://github.com/Greenstand/treetracker-web-map-core/issues/60)) ([932bed6](https://github.com/Greenstand/treetracker-web-map-core/commit/932bed6c2ef1742e5de83adc4474447a2566cab7))
23+
- update highlighted and selected tree icons ([080f0dc](https://github.com/Greenstand/treetracker-web-map-core/commit/080f0dc8818213ca488333459b83e246989a3bb7))
24+
25+
# [1.1.0](https://github.com/Greenstand/treetracker-web-map-core/compare/v1.0.4...v1.1.0) (2022-01-11)
26+
27+
### Bug Fixes
28+
29+
- automated npm package publishing ([#52](https://github.com/Greenstand/treetracker-web-map-core/issues/52)) ([fedfbce](https://github.com/Greenstand/treetracker-web-map-core/commit/fedfbceb22b71176de3878696e1fa851a265a9fd))
30+
- configuring npm auth token ([eabf9d0](https://github.com/Greenstand/treetracker-web-map-core/commit/eabf9d0f85afc19fd7088ea33e435faf116dcc2f))
31+
- configuring npm auth token ([36730de](https://github.com/Greenstand/treetracker-web-map-core/commit/36730deda22fd32ef20dec7eae9454b75175a130))
32+
- ignore husky installation in CI ([3ec9c18](https://github.com/Greenstand/treetracker-web-map-core/commit/3ec9c18e505a151a7fb442d3014138e05736b36d))
33+
- ignore husky installation in CI ([520c6d2](https://github.com/Greenstand/treetracker-web-map-core/commit/520c6d2f3678cd5cdd085da7ba63b20b0befd62f))
34+
- ignore husky installation in CI ([53fde39](https://github.com/Greenstand/treetracker-web-map-core/commit/53fde3963be2feb17140b6a208c0b2a58b8cbf1d))
35+
36+
### Features
37+
38+
- add babel to emit es5 ([d1c07a2](https://github.com/Greenstand/treetracker-web-map-core/commit/d1c07a2957ed8a218547dcfb159627daf3e1fdbd))
39+
- automated the NPM module release ([21b43c8](https://github.com/Greenstand/treetracker-web-map-core/commit/21b43c807fd4604cfbbc2604cb5f932403ff39a6))
40+
- change tile server url for new icons, add highlighted and selected state for icons ([416d8ad](https://github.com/Greenstand/treetracker-web-map-core/commit/416d8ade7d8905157ccf77ea9083ab010a95f93b))
41+
- install eslint ([c88d8ad](https://github.com/Greenstand/treetracker-web-map-core/commit/c88d8ad6886378ff0872928de24cc545a61cb2e9))
42+
- install prettier ([20d98a7](https://github.com/Greenstand/treetracker-web-map-core/commit/20d98a7cf5e5647561d031264b09b927c05ac603))
43+
- install sort-package-json ([6d23d2b](https://github.com/Greenstand/treetracker-web-map-core/commit/6d23d2b620adf9ed75c97ec88255e953437598bd))
44+
145
## [1.0.4](https://github.com/Greenstand/treetracker-web-map-core/compare/v1.0.3...v1.0.4) (2021-12-13)
246

347
### Bug Fixes

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
This is the core module for Greenstand web map application.
44

5+
[![NPM Version][npm-image]][npm-url]
6+
57
## Dev Server
68

79
```sh
@@ -63,3 +65,6 @@ import module in different app
6365
```js
6466
import { Map } from 'treetracker-web-map-core'
6567
```
68+
69+
[npm-image]: https://img.shields.io/npm/v/treetracker-web-map-core.svg
70+
[npm-url]: https://npmjs.org/package/treetracker-web-map-core

dist/1ca743837d7983e0d683.png

789 Bytes
Loading

dist/4aa9525c27aaca183c6a.png

789 Bytes
Loading

dist/553c0e8fc4644ec017cd.png

699 Bytes
Loading

dist/62f90e927385e9f834df.svg

Lines changed: 16 additions & 0 deletions
Loading

dist/78434a3575d257b28240.svg

Lines changed: 9 additions & 0 deletions
Loading

dist/cee156d2df03e4a0bf57.svg

Lines changed: 9 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)