Skip to content

Commit

Permalink
Merge branch 'release-1.0.60'
Browse files Browse the repository at this point in the history
  • Loading branch information
entrotech committed Nov 10, 2021
2 parents 390e207 + fe90cfe commit b7b1201
Show file tree
Hide file tree
Showing 120 changed files with 7,486 additions and 6,883 deletions.
10 changes: 7 additions & 3 deletions .grenrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,13 @@
"override": true,
"onlyMilestones": false,
"groupBy": {
"Enhancements:": ["enhancement"],
"Bug Fixes:": ["bug"],
"Technical Debt:": ["refactor", "system update", "tech debt"]
"Enhancements:": ["Release Note: Enhancement"],
"Bug Fixes:": ["Release Note: Bug"],
"Technical Debt:": [
"Release Note: Refactor",
"Release Note: System Update",
"Release Note: Tech Debt"
]
},
"template": {
"issue": "- {{name}} [{{text}}]({{url}})"
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM node:alpine as clientBuilder

ENV NODE_ENV "development"
ENV NODE_OPTIONS=--openssl-legacy-provider

RUN mkdir /app
WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion client/.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
REACT_APP_TENANT_ID=1
REACT_APP_MAPBOX_TOKEN=pk.eyJ1IjoibHVjYXNob21lciIsImEiOiJjazFqcnRjcm0wNmZ1M2JwZXg2eDFzMXd3In0.yYpkKLrFCxF-qyBfZH1a8w
REACT_APP_MAPBOX_ACCESS_TOKEN=pk.eyJ1IjoibHVjYXNob21lciIsImEiOiJjazFqcnRjcm0wNmZ1M2JwZXg2eDFzMXd3In0.yYpkKLrFCxF-qyBfZH1a8w
REACT_APP_TAMU_GEOSERVICES_API_KEY=5c141ed805794a7a9562c22c090a71cb
7 changes: 7 additions & 0 deletions client/craco.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module.exports = {
babel: {
loaderOptions: {
ignore: ["./node_modules/mapbox-gl/dist/mapbox-gl.js"],
},
},
};
Loading

0 comments on commit b7b1201

Please sign in to comment.