Merge pull request #2017 from OpenNeuroOrg/ssr-enable

Enable SSR

.dockerignore

@@ -4,6 +4,7 @@
 **/dist
 **/.eslintcache
 **/__pycache__
+.build-cache
 .github
 .vscode
 coverage
@@ -16,4 +17,5 @@ services/datalad/node_modules
 .env.example
 config.env.example
 LICENSE
-README.md
+README.md
+yarn-error.log

.eslintignore

@@ -2,5 +2,10 @@
 /packages/*/node_modules
 /packages/*/coverage
 /packages/*/dist
+__mocks__
+*.spec.js
+*.spec.jsx
+*.spec.ts
+*.spec.tsx
 jestsetup.js
 papaya.js

.eslintrc.json

@@ -13,28 +13,42 @@
     "plugin:@typescript-eslint/recommended",
     "plugin:@typescript-eslint/recommended-requiring-type-checking",
     "plugin:react/recommended",
-    "prettier",
-    "prettier/@typescript-eslint",
-    "prettier/react"
+    "prettier"
   ],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
     "sourceType": "module",
     "allowImportExportEverywhere": false,
     "codeFrame": false,
-    "project": "./tsconfig.json"
+    "project": [
+      "./packages/openneuro-app/tsconfig.json",
+      "./packages/openneuro-cli/tsconfig.json",
+      "./packages/openneuro-client/tsconfig.json",
+      "./packages/openneuro-indexer/tsconfig.json",
+      "./packages/openneuro-server/tsconfig.json"
+    ]
   },
   "rules": {
     "linebreak-style": ["error", "unix"],
     "quotes": ["error", "single", { "avoidEscape": true }],
     "semi": ["error", "never"],
     "no-prototype-builtins": 0,
     "@typescript-eslint/explicit-function-return-type": "off",
-    "prettier/prettier": "error"
+    "@typescript-eslint/no-unsafe-member-access": "off",
+    "@typescript-eslint/no-unsafe-call": "off",
+    "@typescript-eslint/no-unsafe-assignment": "off",
+    "prettier/prettier": "error",
+    "react-hooks/rules-of-hooks": "error",
+    "react-hooks/exhaustive-deps": "warn"
   },
-  "plugins": ["import", "prettier", "react"],
+  "plugins": [
+    "import",
+    "prettier",
+    "react",
+    "react-hooks",
+    "@typescript-eslint"
+  ],
   "settings": {
-    "import/core-modules": ["openneuro-content"],
     "react": {
       "version": "detect"
     }
@@ -44,7 +58,19 @@
       // enable the rule specifically for TypeScript files
       "files": ["*.ts", "*.tsx"],
       "rules": {
-        "@typescript-eslint/explicit-function-return-type": ["error"]
+        "@typescript-eslint/explicit-function-return-type": ["error"],
+        "react/prop-types": "off"
+      }
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {
+        "@typescript-eslint/explicit-module-boundary-types": "off",
+        "@typescript-eslint/restrict-template-expressions": "off",
+        "@typescript-eslint/no-unsafe-return": "off",
+        "@typescript-eslint/no-floating-promises": "off",
+        "@typescript-eslint/restrict-plus-operands": "off",
+        "@typescript-eslint/ban-ts-comment": "off"
       }
     }
   ]

.gitignore

@@ -9,4 +9,7 @@ coverage
 datalad-key
 content
 packages/openneuro-server/yarn.lock
-.docz
+.docz
+dist
+.build-cache
+.ultra.cache.json

Dockerfile

@@ -1,19 +1,11 @@
-FROM node:12.18.1 as dependencies
+FROM node:14.16.0 as dependencies
 
 WORKDIR /srv
 
-COPY package.json yarn.lock ./
-# Sadly we have to manually copy each of these to get a full node_modules tree
-COPY packages/openneuro-app/package.json packages/openneuro-app/package.json
-COPY packages/openneuro-cli/package.json packages/openneuro-cli/package.json
-COPY packages/openneuro-client/package.json packages/openneuro-client/package.json
-COPY packages/openneuro-indexer/package.json packages/openneuro-indexer/package.json
-COPY packages/openneuro-server/package.json packages/openneuro-server/package.json
-
-RUN yarn install --frozen-lockfile
-
 COPY . /srv
 
+RUN yarn install --frozen-lockfile && yarn tsc -b
+
 FROM dependencies as tests
 
 RUN yarn test

config.env.example

@@ -88,6 +88,6 @@ ELASTIC_APM_ACTIVE=false
 
 # GraphQL path
 # For docker-compose, use a network relative URI
-GRAPHQL_URI=http://web/crn/graphql
+GRAPHQL_URI=http://server:8111/crn/graphql
 # For other deployments, use the public FQDN URI
 # GRAPHQL_URI=https://openneuro.org/crn/graphql

docker-compose.yml

@@ -3,7 +3,6 @@ version: "2.3"
 
 # shared volumes
 volumes:
-  project:
   yarn_cache:
   webpack_cache:
 
@@ -18,27 +17,28 @@ services:
     working_dir: /srv
     volumes:
       - yarn_cache:/usr/local/share/.cache
-      - project:/srv/packages/openneuro-app/dist
 
   # web app bundle build
   app:
     extends:
       service: node
     working_dir: /srv/packages/openneuro-app
-    command: yarn start
+    command: ./vite-env.sh
     volumes:
       - webpack_cache:/webpack-cache
       - ./packages/openneuro-app/src:/srv/packages/openneuro-app/src
     ports:
       - "8145:8145"
+      - "9992:9992"
 
   # crn node server
   server:
     extends:
       service: node
     working_dir: /srv/packages/openneuro-server
-    command: yarn ts-node-dev --respawn --transpile-only src/server.js
+    command: yarn start
     volumes:
+      - ./packages/openneuro-app/src:/srv/packages/openneuro-app/src
       - ./packages/openneuro-server/src:/srv/packages/openneuro-server/src
     depends_on:
       - redis
@@ -50,7 +50,8 @@ services:
   indexer:
     extends:
       service: node
-    command: yarn ts-node /srv/packages/openneuro-indexer/src/index.ts
+    working_dir: /srv/packages/openneuro-indexer
+    command: yarn start
     depends_on:
       - server
       - elasticsearch

package.json

@@ -2,31 +2,35 @@
   "private": true,
   "scripts": {
     "start": "docker-compose up --build -V",
+    "build": "yarn tsc -b",
     "bootstrap": "lerna bootstrap",
     "test": "jest",
     "coverage": "jest --coverage",
     "codecov": "codecov",
-    "lint": "eslint --cache --ext .jsx --ext .js --ext .ts --ext .tsx packages/",
+    "lint": "eslint --ext .jsx --ext .js --ext .ts --ext .tsx packages/*/src",
     "openneuro": "node packages/openneuro-cli/src"
   },
   "devDependencies": {
     "@sentry/cli": "1.37.4",
-    "@typescript-eslint/eslint-plugin": "^2.20.0",
-    "@typescript-eslint/parser": "^2.20.0",
+    "@typescript-eslint/eslint-plugin": "^4.19.0",
+    "@typescript-eslint/parser": "^4.19.0",
+    "@wojtekmaj/enzyme-adapter-react-17": "^0.4.1",
     "babel-eslint": "10.0.3",
     "codecov": "^3.0.0",
     "core-js": "^3.3.2",
-    "eslint": "6.8.0",
-    "eslint-config-prettier": "^6.10.0",
-    "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-prettier": "^3.1.2",
-    "eslint-plugin-react": "^7.7.0",
+    "eslint": "7.23.0",
+    "eslint-config-prettier": "^8.1.0",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-react": "^7.23.1",
+    "eslint-plugin-react-hooks": "^4.2.0",
     "husky": "^0.15.0-rc.13",
-    "jest": "^24.9.0",
+    "jest": "^26.6.3",
     "lerna": "3.20.2",
     "lint-staged": "^6.0.1",
-    "prettier": "^1.7.0",
-    "typescript": "^4.0.3"
+    "prettier": "^2.2.1",
+    "tsc-watch": "^4.2.9",
+    "typescript": "4.0.6"
   },
   "workspaces": [
     "packages/*"
@@ -60,7 +64,7 @@
   "dependencies": {
     "docz": "^2.3.1",
     "gatsby-plugin-s3": "^0.3.3",
-    "react": "^16.13.1",
-    "react-dom": "^16.13.1"
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1"
   }
 }

packages/openneuro-app/jestsetup.ts

@@ -1,7 +1,7 @@
 // Make Enzyme functions available in all test files without importing
 import React from 'react'
 import Enzyme, { shallow, render, mount } from 'enzyme'
-import Adapter from 'enzyme-adapter-react-16'
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17'
 import moment from 'moment-timezone'
 import fetch from 'jest-fetch-mock'
 import fromEntries from 'object.fromentries'
@@ -18,7 +18,7 @@ if (!Object.fromEntries) {
   fromEntries.shim()
 }
 
-jest.mock('./config.js')
+jest.mock('./src/scripts/config')
 
 Object.defineProperty(window, 'matchMedia', {
   writable: true,