[chore] NodeJS 12 (#2722)

* chore: upgraded node 12, more log lines

- upgraded from 10 LTS to 12 LTS
- added log line with userID to GraphQL
  log entry

* fix: adjusted some intl formats
This commit is contained in:
Wyatt Johnson
2019-11-22 22:46:16 +00:00
committed by GitHub
parent 7c2e56b751
commit bf89fc2b3e
11 changed files with 12 additions and 18 deletions
+1 -1
View File
@@ -9,7 +9,7 @@ job_defaults: &job_defaults
working_directory: ~/coralproject/talk working_directory: ~/coralproject/talk
resource_class: large resource_class: large
docker: docker:
- image: circleci/node:10 - image: circleci/node:12
environment: environment:
<<: *job_environment <<: *job_environment
+1 -2
View File
@@ -1,2 +1 @@
10 12
+1 -1
View File
@@ -1,4 +1,4 @@
FROM node:10-alpine FROM node:12-alpine
# Install build dependancies. # Install build dependancies.
RUN apk --no-cache add git python RUN apk --no-cache add git python
+2 -4
View File
@@ -1,13 +1,11 @@
// Apply all the configuration provided in the .env file. // Apply all the configuration provided in the .env file.
require("dotenv").config(); require("dotenv").config();
const path = require("path");
const fs = require("fs"); const fs = require("fs");
const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin"); const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
const extensions = [".ts", ".tsx", ".js"]; const extensions = [".ts", ".tsx", ".js"];
// TODO: There is some weird issue with including paths.ts here // TODO: There is some weird issue with including paths.ts here
const postCSSConfigPath = "./src/core/build/postcss.config"; const postCSSConfigPath = "./src/core/build/postcss.config";
const isProduction = process.NODE_ENV === "production";
const appDirectory = fs.realpathSync(process.cwd()); const appDirectory = fs.realpathSync(process.cwd());
const styleLoader = { const styleLoader = {
@@ -18,7 +16,7 @@ const styleLoader = {
}, },
}; };
export default { module.exports = {
title: "Coral 5.0", title: "Coral 5.0",
source: "./src", source: "./src",
typescript: true, typescript: true,
@@ -60,7 +58,7 @@ export default {
"@babel/typescript", "@babel/typescript",
[ [
"@babel/env", "@babel/env",
{ targets: { node: "10.0.0" }, modules: "commonjs" }, { targets: { node: "12.0.0" }, modules: "commonjs" },
], ],
], ],
// This is a feature of `babel-loader` for webpack (not Babel itself). // This is a feature of `babel-loader` for webpack (not Babel itself).
+1 -1
View File
@@ -11,7 +11,7 @@
"url": "git://github.com/coralproject/talk.git" "url": "git://github.com/coralproject/talk.git"
}, },
"engines": { "engines": {
"node": ">=10.0.0", "node": ">=12.0.0",
"npm": ">=6.9.0" "npm": ">=6.9.0"
}, },
"bugs": "https://github.com/coralproject/talk/issues", "bugs": "https://github.com/coralproject/talk/issues",
+1 -1
View File
@@ -392,7 +392,7 @@ export default function createWebpackConfig(
"@babel/typescript", "@babel/typescript",
[ [
"@babel/env", "@babel/env",
{ targets: { node: "10.0.0" }, modules: "commonjs" }, { targets: { node: "12.0.0" }, modules: "commonjs" },
], ],
], ],
// This is a feature of `babel-loader` for webpack (not Babel itself). // This is a feature of `babel-loader` for webpack (not Babel itself).
@@ -37,7 +37,7 @@ const UserStatusDetailsContainer: FunctionComponent<Props> = ({ user }) => {
day: "2-digit", day: "2-digit",
month: "2-digit", month: "2-digit",
year: "numeric", year: "numeric",
hour: "2-digit", hour: "numeric",
minute: "2-digit", minute: "2-digit",
}); });
@@ -33,7 +33,7 @@ const StoryRowContainer: FunctionComponent<Props> = props => {
month: "2-digit", month: "2-digit",
year: "numeric", year: "numeric",
hour12: true, hour12: true,
hour: "2-digit", hour: "numeric",
minute: "2-digit", minute: "2-digit",
}).format(new Date(publishedAt)) }).format(new Date(publishedAt))
: null : null
@@ -41,7 +41,7 @@ const DownloadCommentsContainer: FunctionComponent<Props> = ({ viewer }) => {
month: "2-digit", month: "2-digit",
year: "numeric", year: "numeric",
hour12: true, hour12: true,
hour: "2-digit", hour: "numeric",
minute: "2-digit", minute: "2-digit",
timeZoneName: "short", timeZoneName: "short",
}); });
@@ -84,11 +84,6 @@ export async function findOrCreateSSOUser(
token: SSOToken, token: SSOToken,
now = new Date() now = new Date()
) { ) {
if (!token.user) {
// TODO: (wyattjoh) replace with better error.
throw new Error("token is malformed, missing user claim");
}
// Validate the token content. // Validate the token content.
const decodedToken: SSOToken = validate(SSOTokenSchema, token); const decodedToken: SSOToken = validate(SSOTokenSchema, token);
@@ -23,7 +23,9 @@ export function logQuery(
ctx.logger.info( ctx.logger.info(
{ {
responseTime, responseTime,
// deprecated: use of the `authenticated` log field is deprecated in favour of the `userID` field
authenticated: ctx.user ? true : false, authenticated: ctx.user ? true : false,
userID: ctx.user ? ctx.user.id : null,
...(persisted ...(persisted
? // A persisted query was provided, we can pull the operation metadata ? // A persisted query was provided, we can pull the operation metadata
// out from the persisted object. // out from the persisted object.