Merge pull request #54 from proshunsuke/v12

V12

.eslintrc.js

@@ -10,7 +10,7 @@ module.exports = {
         ecmaVersion: 2018,
         project: ['./tsconfig.eslint.json'],
     },
-    plugins: ['@typescript-eslint', 'jest'],
+    plugins: ['import', '@typescript-eslint', 'jest'],
     extends: [
         'airbnb-typescript/base',
         'plugin:@typescript-eslint/recommended',

README.md

@@ -47,8 +47,10 @@ Auto Updating Google Calendar using google apps script
 その他|https://calendar.google.com/calendar/ical/06ol8jcjk0r5bviarevjicta70@group.calendar.google.com/public/basic.ics
 テレビ|https://calendar.google.com/calendar/ical/14elrf80nstbrahsfe2iuem8fg@group.calendar.google.com/public/basic.ics
 メディア|https://calendar.google.com/calendar/ical/ivej29993ugnjb20l077n233i4@group.calendar.google.com/public/basic.ics
+ライブ|https://calendar.google.com/calendar/ical/dbot8s6eu5o91u6evdi4hucdr0%40group.calendar.google.com/public/basic.ics
 ラジオ|https://calendar.google.com/calendar/ical/f01lrnkgl42eqfbs1k97u7mrdc@group.calendar.google.com/public/basic.ics
 リリース|https://calendar.google.com/calendar/ical/oo8hkuk4udrflu06337hq42jqo@group.calendar.google.com/public/basic.ics
+握手会|https://calendar.google.com/calendar/ical/d7q626djcs2ooq8rkpoc045d5c%40group.calendar.google.com/public/basic.ics
 映画|https://calendar.google.com/calendar/ical/hbflgqvcrjvd9c1a07q5t93ork@group.calendar.google.com/public/basic.ics
 雑誌|https://calendar.google.com/calendar/ical/2veim8rg9o7k2js0jtng8i2dug@group.calendar.google.com/public/basic.ics
 新聞|https://calendar.google.com/calendar/ical/g3puqreu4a67quqqu7ueo58l5k@group.calendar.google.com/public/basic.ics

package.json

@@ -10,26 +10,27 @@
     "@babel/preset-env": "*",
     "@babel/preset-typescript": "*",
     "@google-cloud/functions-framework": "*",
-    "forked-clasp": "2.8.2",
     "@types/google-apps-script": "*",
     "@types/jest": "*",
     "@types/node": "*",
-    "@types/node-fetch": "*",
+    "@types/node-fetch": ">=2.0.0 <3.0.0",
     "@typescript-eslint/eslint-plugin": "*",
     "@typescript-eslint/parser": "*",
     "babel-loader": "*",
     "coveralls": "*",
     "dayjs": "*",
     "eslint": "*",
+    "eslint-config-airbnb-base": "*",
     "eslint-config-airbnb-typescript": "*",
     "eslint-config-prettier": "*",
     "eslint-plugin-import": "*",
     "eslint-plugin-jest": "*",
+    "forked-clasp": "2.8.2",
     "gas-webpack-plugin": "*",
     "jest": "*",
     "jest-fetch-mock": "*",
     "mockdate": "*",
-    "node-fetch": "*",
+    "node-fetch": ">=2.0.0 <3.0.0",
     "prettier": "*",
     "puppeteer": "*",
     "regenerator-runtime": "*",

src/oneMonthSchedule.ts

@@ -45,7 +45,7 @@ export default class OneMonthSchedule {
 
     // eslint-disable-next-line @typescript-eslint/no-var-requires,global-require,@typescript-eslint/no-unsafe-assignment
     const { fetchUrl } = require('./fetchUrl');
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-return
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-return,@typescript-eslint/return-await
     return await fetchUrl(customUrl);
   }
 

src/sites/sakurazaka/sakuraObjects.ts

@@ -30,6 +30,10 @@ export const sakuraCalendarIds: SiteCalendarInterface[] = [
     type: 'メディア',
     calendarId: 'ivej29993ugnjb20l077n233i4@group.calendar.google.com',
   },
+  {
+    type: 'ライブ',
+    calendarId: 'dbot8s6eu5o91u6evdi4hucdr0@group.calendar.google.com',
+  },
   {
     type: 'ラジオ',
     calendarId: 'f01lrnkgl42eqfbs1k97u7mrdc@group.calendar.google.com',
@@ -38,6 +42,10 @@ export const sakuraCalendarIds: SiteCalendarInterface[] = [
     type: 'リリース',
     calendarId: 'oo8hkuk4udrflu06337hq42jqo@group.calendar.google.com',
   },
+  {
+    type: '握手会',
+    calendarId: 'd7q626djcs2ooq8rkpoc045d5c@group.calendar.google.com',
+  },
   {
     type: '映画',
     calendarId: 'hbflgqvcrjvd9c1a07q5t93ork@group.calendar.google.com',