Merge pull request #5833 from ForumMagnum/node-v18

Upgrade to node 18
ForumMagnum · Oct 19, 2022 · 112e5c4 · 112e5c4
2 parents df7e745 + 9b46662
commit 112e5c4
Show file tree

Hide file tree

Showing 26 changed files with 43 additions and 57 deletions.
diff --git a/.github/workflows/deployBaserates.yaml b/.github/workflows/deployBaserates.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix: 
-        node-version: [15.x]
+        node-version: [18.x]
         environment: [baserates]
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/deployEADev.yaml b/.github/workflows/deployEADev.yaml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [15.x]
+        node-version: [18.x]
         environment: [EAForum-Staging-2]
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/deployEAProd.yaml b/.github/workflows/deployEAProd.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix: 
-        node-version: [15.x]
+        node-version: [18.x]
         environment: [EAForum-Production-2]
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/deployLWAFProd.yaml b/.github/workflows/deployLWAFProd.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix: 
-        node-version: [15.x]
+        node-version: [18.x]
         environment: [Lesswrongexpress-env, AlignmentForumProd]
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/deployLWDevel.yaml b/.github/workflows/deployLWDevel.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix: 
-        node-version: [15.x]
+        node-version: [18.x]
         environment: [LessestWrong]
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/unitTests.yaml b/.github/workflows/unitTests.yaml
@@ -1,4 +1,3 @@
-
 name: Run Unit Tests
 on:
   push:
@@ -11,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [18.x]
     steps:
     - name: Checkout code
       uses: actions/checkout@v2

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v15.5.0
+v18
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:15.5.0
+FROM node:18.11.0
 ENV IS_DOCKER=true
 # Transcrypt dependency
 RUN apt-get update && apt-get install -y bsdmainutils

diff --git a/build.js b/build.js
@@ -2,7 +2,6 @@
 const { build, cliopts } = require("estrella");
 const fs = require('fs');
 const WebSocket = require('ws');
-const fetch = require("node-fetch");
 const crypto = require('crypto');
 const { zlib } = require("mz");
 

diff --git a/package.json b/package.json
@@ -70,7 +70,7 @@
     "@types/draft-convert": "^2.1.1",
     "@types/draft-js": "^0.10.40",
     "@types/enzyme": "^3.10.5",
-    "@types/express": "^4.17.8",
+    "@types/express": "4.17.14",
     "@types/express-session": "^1.17.3",
     "@types/gapi": "0.0.39",
     "@types/google__maps": "^0.5.14",
@@ -92,8 +92,7 @@
     "@types/moment": "^2.13.0",
     "@types/mongodb": "^3.6.3",
     "@types/mz": "^2.7.3",
-    "@types/node": "12",
-    "@types/node-fetch": "^2.5.6",
+    "@types/node": "18.11.0",
     "@types/nodemailer": "^6.4.1",
     "@types/papaparse": "^5.0.3",
     "@types/passport": "^1.0.6",
@@ -132,7 +131,6 @@
     "apollo-server-express": "2.15.0",
     "auth0": "^2.42.0",
     "bcrypt": "^5.0.1",
-    "body-parser": "^1.18.3",
     "bowser": "^1.9.4",
     "cheerio": "1.0.0-rc.9",
     "chokidar": "^3.5.0",
@@ -206,7 +204,6 @@
     "moment": "^2.29.4",
     "mongodb": "^3.6.3",
     "mz": "^2.7.0",
-    "node-fetch": "^2.6",
     "nodemailer": "^6.6.1",
     "papaparse": "^4.6.2",
     "passport": "^0.5.2",
@@ -307,5 +304,8 @@
     "graphql": "^14.5.8",
     "graphql-tools": "^4.0.7",
     "ts-node": "^10.9.1"
+  },
+  "engines": {
+    "node": "18.x"
   }
 }
diff --git a/packages/lesswrong/lib/apollo/links.ts b/packages/lesswrong/lib/apollo/links.ts
@@ -26,22 +26,16 @@ export const createSchemaLink = (schema: GraphQLSchema, context: ResolverContext
  * Http link is used for client side rendering
  */
 export const createHttpLink = (baseUrl = '/') => {
-  // Type of window.fetch may differ slightly from type of the fetch used on server
-  let fetch: typeof window.fetch;
-  if (isServer) {
-    // We won't need to import fetch in node 18
-    const nodeFetch = require('node-fetch');
-    fetch = (url, options) => nodeFetch(url, {
+  const fetch: typeof globalThis.fetch = isServer
+    ? (url, options) => globalThis.fetch(url, {
       ...options,
       headers: {
         ...options?.headers,
         // user agent because LW bans bot agents
         'User-Agent': crosspostUserAgent,
       }
-    });
-  } else {
-    fetch = window.fetch;
-  }
+    })
+    : globalThis.fetch;
   return new BatchHttpLink({
     uri: baseUrl + 'graphql',
     credentials: baseUrl === '/' ? 'same-origin' : 'omit',

diff --git a/packages/lesswrong/server/apolloServer.ts b/packages/lesswrong/server/apolloServer.ts
@@ -4,7 +4,6 @@ import { GraphQLError, GraphQLFormattedError } from 'graphql';
 import { isDevelopment, getInstanceSettings, getServerPort } from '../lib/executionEnvironment';
 import { renderWithCache, getThemeOptionsFromReq } from './vulcan-lib/apollo-ssr/renderPage';
 
-import bodyParser from 'body-parser';
 import { pickerMiddleware } from './vendor/picker';
 import voyagerMiddleware from 'graphql-voyager/middleware/express';
 import { graphiqlMiddleware } from './vulcan-lib/apollo-server/graphiql';
@@ -121,9 +120,10 @@ export function startWebserver() {
       }
     }))
   }
-  app.use(bodyParser.urlencoded({ extended: true })) // We send passwords + username via urlencoded form parameters
-  app.use('/analyticsEvent', bodyParser.json({ limit: '50mb' }));
-  app.use('/ckeditor-webhook', bodyParser.json({ limit: '50mb' }));
+
+  app.use(express.urlencoded({ extended: true })); // We send passwords + username via urlencoded form parameters
+  app.use('/analyticsEvent', express.json({ limit: '50mb' }));
+  app.use('/ckeditor-webhook', express.json({ limit: '50mb' }));
 
   addStripeMiddleware(addMiddleware);
   addAuthMiddlewares(addMiddleware);
@@ -154,7 +154,7 @@ export function startWebserver() {
     //tracing: isDevelopment,
     tracing: false,
     cacheControl: true,
-    context: async ({ req, res }) => {
+    context: async ({ req, res }: { req: express.Request, res: express.Response }) => {
       const user = await getUserFromReq(req);
       const context = await computeContextFromUser(user, req, res);
       configureSentryScope(context);
@@ -163,8 +163,8 @@ export function startWebserver() {
     plugins: [new ApolloServerLogging()]
   });
 
-  app.use('/graphql', bodyParser.json({ limit: '50mb' }));
-  app.use('/graphql', bodyParser.text({ type: 'application/graphql' }));
+  app.use('/graphql', express.json({ limit: '50mb' }));
+  app.use('/graphql', express.text({ type: 'application/graphql' }));
   apolloServer.applyMiddleware({ app })
 
   addStaticRoute("/js/bundle.js", ({query}, req, res, context) => {

diff --git a/packages/lesswrong/server/callbacks/userCallbacks.tsx b/packages/lesswrong/server/callbacks/userCallbacks.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import fetch from "node-fetch";
 import md5 from "md5";
 import Users from "../../lib/collections/users/collection";
 import { userGetGroups } from '../../lib/vulcan-users/permissions';

diff --git a/packages/lesswrong/server/ckEditor/ckEditorWebhook.ts b/packages/lesswrong/server/ckEditor/ckEditorWebhook.ts
@@ -8,7 +8,6 @@ import { Users } from '../../lib/collections/users/collection';
 import { Posts } from '../../lib/collections/posts/collection';
 import { createMutator } from '../vulcan-lib/mutators';
 import { createNotifications } from '../notificationCallbacksHelpers';
-import fetch from 'node-fetch';
 import crypto from 'crypto';
 import fs from 'fs';
 import * as _ from 'underscore';

diff --git a/packages/lesswrong/server/fmCrosspost/crosspost.ts b/packages/lesswrong/server/fmCrosspost/crosspost.ts
@@ -1,4 +1,3 @@
-import fetch from "node-fetch";
 import Users from "../../lib/collections/users/collection";
 import { randomId } from "../../lib/random";
 import { Crosspost, UpdateCrosspostPayload, CrosspostPayload } from "./types";

diff --git a/packages/lesswrong/server/fmCrosspost/resolvers.ts b/packages/lesswrong/server/fmCrosspost/resolvers.ts
@@ -5,7 +5,6 @@ import type { ConnectCrossposterArgs, UnlinkCrossposterPayload } from "./types";
 import { ApiRoute, apiRoutes, makeApiUrl } from "./routes";
 import { signToken } from "./tokens";
 import type { Request } from "express";
-import fetch from "node-fetch";
 import { crosspostUserAgent } from "../../lib/apollo/links";
 
 const getUserId = (req?: Request) => {

diff --git a/packages/lesswrong/server/fmCrosspost/routes.ts b/packages/lesswrong/server/fmCrosspost/routes.ts
@@ -1,7 +1,6 @@
 import { fmCrosspostBaseUrlSetting } from "../../lib/instanceSettings";
 import { combineUrls } from "../../lib/vulcan-lib";
-import { json } from "body-parser";
-import type { Application, Request, Response } from "express";
+import { Application, Request, Response, json } from "express";
 import {
   onCrosspostTokenRequest,
   onConnectCrossposterRequest,

diff --git a/packages/lesswrong/server/gatherTownCron.ts b/packages/lesswrong/server/gatherTownCron.ts
@@ -1,7 +1,6 @@
 import { addCronJob, removeCronJob } from './cronUtil';
 import { createMutator, Globals } from './vulcan-lib';
 import { LWEvents } from '../lib/collections/lwevents/collection';
-import fetch from 'node-fetch';
 import WebSocket from 'ws';
 import { DatabaseServerSetting } from './databaseSettings';
 import { gatherTownRoomId, gatherTownRoomName } from '../lib/publicSettings';

diff --git a/packages/lesswrong/server/migrations/2021-08-22-importACXMeetups.ts b/packages/lesswrong/server/migrations/2021-08-22-importACXMeetups.ts
@@ -3,7 +3,6 @@ import Users from '../../lib/collections/users/collection';
 import { createMutator, Utils } from '../vulcan-lib';
 import { Posts } from '../../lib/collections/posts';
 import { mapsAPIKeySetting } from '../../components/form-components/LocationFormComponent';
-import fetch from 'node-fetch';
 import { getLocalTime } from '../mapsUtils';
 import {userFindOneByEmail} from "../../lib/collections/users/commonQueries";
 

diff --git a/packages/lesswrong/server/resolvers/arbitalPageData.ts b/packages/lesswrong/server/resolvers/arbitalPageData.ts
@@ -1,5 +1,4 @@
 import { addGraphQLSchema, addGraphQLResolvers, addGraphQLQuery } from '../../lib/vulcan-lib/graphql';
-import fetch from 'node-fetch'
 import markdownIt from 'markdown-it'
 import markdownItMathjax from '../editor/markdown-mathjax'
 import { mjPagePromise } from '../editor/make_editable_callbacks';

diff --git a/packages/lesswrong/server/resolvers/elicitPredictions.ts b/packages/lesswrong/server/resolvers/elicitPredictions.ts
@@ -1,5 +1,4 @@
 import { addGraphQLSchema, addGraphQLResolvers, addGraphQLQuery, addGraphQLMutation } from '../../lib/vulcan-lib/graphql';
-import fetch from 'node-fetch'
 import { DatabaseServerSetting } from '../databaseSettings';
 import { generateIdResolverSingle } from '../../lib/utils/schemaUtils';
 import { elicitSourceURL } from '../../lib/publicSettings';

diff --git a/packages/lesswrong/server/resolvers/mozillaHubsData.ts b/packages/lesswrong/server/resolvers/mozillaHubsData.ts
@@ -1,5 +1,4 @@
 import { addGraphQLSchema, addGraphQLResolvers, addGraphQLQuery } from '../../lib/vulcan-lib/graphql';
-import fetch from 'node-fetch'
 import { DatabaseServerSetting } from '../databaseSettings';
 
 const MozillaHubsData = `type MozillaHubsData {

diff --git a/packages/lesswrong/server/scripts/utils.ts b/packages/lesswrong/server/scripts/utils.ts
@@ -1,4 +1,3 @@
-import fetch from 'node-fetch';
 import * as _ from 'underscore';
 
 // Bulk apply a js function to a mongo collection; this is possibly less

diff --git a/packages/lesswrong/server/vendor/react-html-email/scripts/scrapeStyleSupport.js b/packages/lesswrong/server/vendor/react-html-email/scripts/scrapeStyleSupport.js
@@ -1,5 +1,4 @@
 import cheerio from 'cheerio'
-import fetch from 'node-fetch'
 
 function scrapeProperties(html) {
   const $ = cheerio.load(html)

diff --git a/packages/lesswrong/server/zohoUtils.ts b/packages/lesswrong/server/zohoUtils.ts
@@ -1,4 +1,3 @@
-import fetch from 'node-fetch';
 import { DatabaseServerSetting } from './databaseSettings';
 
 const zohoClientId = new DatabaseServerSetting('zoho.clientId', '')

diff --git a/yarn.lock b/yarn.lock
@@ -3032,7 +3032,7 @@
   dependencies:
     "@types/express" "*"
 
-"@types/express@*", "@types/express@^4.0.35", "@types/express@^4.17.8":
+"@types/express@*", "@types/express@^4.0.35":
   version "4.17.9"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.9.tgz"
   integrity sha512-SDzEIZInC4sivGIFY4Sz1GG6J9UObPwCInYJjko2jzOf/Imx/dlpume6Xxwj1ORL82tBbmN4cPDIDkLbWHk9hw==
@@ -3042,6 +3042,16 @@
     "@types/qs" "*"
     "@types/serve-static" "*"
 
+"@types/express@4.17.14":
+  version "4.17.14"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.14.tgz#143ea0557249bc1b3b54f15db4c81c3d4eb3569c"
+  integrity sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "^4.17.18"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
 "@types/express@4.17.4":
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.4.tgz"
@@ -3392,19 +3402,16 @@
     "@types/node" "*"
     "@types/sax" "*"
 
-"@types/node-fetch@^2.5.6":
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz"
-  integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==
-  dependencies:
-    "@types/node" "*"
-    form-data "^3.0.0"
-
-"@types/node@*", "@types/node@12":
+"@types/node@*":
   version "12.19.8"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.8.tgz"
   integrity sha512-D4k2kNi0URNBxIRCb1khTnkWNHv8KSL1owPmS/K5e5t8B2GzMReY7AsJIY1BnP5KdlgC4rj9jk2IkDMasIE7xg==
 
+"@types/node@18.11.0":
+  version "18.11.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.0.tgz#f38c7139247a1d619f6cc6f27b072606af7c289d"
+  integrity sha512-IOXCvVRToe7e0ny7HpT/X9Rb2RYtElG1a+VshjwT00HxrM2dWBApHQoqsI6WiY7Q03vdf2bCrIGzVrkF/5t10w==
+
 "@types/node@>=13.7.0":
   version "18.8.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.8.4.tgz#54be907698f40de8a45770b48486aa3cbd3adff7"
@@ -11823,7 +11830,7 @@ node-fetch@^1.0.1:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
-node-fetch@^2.6, node-fetch@^2.6.7:
+node-fetch@^2.6.7:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
   integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==