Bump node-fetch from 2.6.1 to 3.1.1

Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.1 to 3.1.1.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Changelog](https://github.com/node-fetch/node-fetch/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.1...v3.1.1)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/ci.yml

@@ -10,11 +10,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.head_ref }}
       - uses: actions/setup-node@v2-beta
         with:
           node-version: '12'
 
       - run: npm install
       - run: npm test
+        env:
+          CI: true
       - run: npm run lint
-
+        env:
+          CI: true

Dockerfile

@@ -4,12 +4,12 @@ LABEL authors="Lachlan Kermode <lk@forensic-architecture.org>"
 
 # Install app dependencies
 COPY package.json /www/package.json
-RUN cd /www; yarn
+RUN cd /www; npm install
 
 # Copy app source
 COPY . /www
 WORKDIR /www
-RUN yarn build
+RUN npm run build
 RUN mkdir -p data
 
 # set your port
@@ -17,4 +17,4 @@ ENV PORT 4040
 EXPOSE 4040
 
 # start command as per package.json
-CMD ["yarn", "start"]
+CMD ["npm", "start"]

package.json

@@ -30,7 +30,7 @@
     "graphql": "^0.13.2",
     "morgan": "^1.8.0",
     "mz": "^2.7.0",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^3.1.1",
     "object-hash": "^1.3.0",
     "ramda": "^0.25.0",
     "resource-router-middleware": "^0.6.0",

src/api/index.js

@@ -30,10 +30,10 @@ export default ({ config, controller }) => {
           success: msg
         })
       )
-      .catch(err =>
+      .catch(err => {
         res.status(404)
           .send({ error: err.message, err })
-      )
+      })
   })
 
   api.get('/:sheet/:tab/:resource/:frag', (req, res) => {

src/datasheet.config.js

@@ -1 +0,0 @@
-CONFIG=../configs/timemap/grenfell/datasheet.config.js

src/lib.js

@@ -7,6 +7,7 @@ function prefixedTabs (prefix, cfg) {
     [`${prf('events')}export_events`]: BP.deeprows,
     [`${prf('associations')}export_associations`]: BP.deeprows,
     [`${prf('sources')}export_sources`]: BP.deepids,
+    [`${prf('shapes')}export_shapes`]: BP.deeprows,
     [`${prf('sites')}export_sites`]: BP.rows
   }
 }

src/lib/Controller.js

@@ -1,7 +1,7 @@
 import copy from '../copy/en'
 
 /**
- * Controller
+ * Controller class
  *
  */
 class Controller {

src/lib/Fetcher.js

@@ -217,7 +217,10 @@ class GsheetFetcher extends Fetcher {
       })
       .then(this._buildBlueprintsAsync())
       .then(() => true)
-      .catch(() => false)
+      .catch((err) => {
+        console.log(`Error fetching gsheets: ${err.message} `)
+        return false
+      })
   }
 }
 

src/models/StoreJson.js

@@ -19,7 +19,6 @@ class StoreJson {
 
   save (url, data) {
     const parts = url.split('/')
-
     return fs.writeFile(
       `${STORAGE_DIRNAME}/${parts[0]}__${parts[1]}__${parts[2]}.json`,
       JSON.stringify(data)

test/internals.js

@@ -12,6 +12,8 @@ const egInput1 = [
   [4, 5, 6]
 ]
 
+// Test default blueprint exports
+// Smoke tests
 test('defaultBlueprint exports', t => {
   const expected = {
     sheet: {