Convert to TypeScript (#655)

* Convert some files to TS * Convert files to TS * Fix build * Convert some tests * Convert files * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * Fix test * Fix parsing * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * WIP * Rebuild yarn.lock * Pin firebase-admin, fix tests * WIP * WIP * Make cookies types more generalized * WIP * WIP * Import type from correct file * WIP
gladly-team · Jul 2, 2023 · 06ff195 · 06ff195
1 parent 522185a
commit 06ff195
Show file tree

Hide file tree

Showing 77 changed files with 4,569 additions and 3,923 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -2,6 +2,7 @@ module.exports = {
   extends: [
     'airbnb',
     'prettier',
+    'plugin:@typescript-eslint/eslint-recommended',
     'plugin:@typescript-eslint/recommended',
     'plugin:import/typescript',
   ],
@@ -59,9 +60,13 @@ module.exports = {
     {
       files: [
         '**/*.test.ts',
+        '**/*.test.tsx',
         '**/__mocks__/**/*.ts',
+        '**/__mocks__/**/*.tsx',
         '**/*.test.js',
+        '**/*.test.jsx',
         '**/__mocks__/**/*.js',
+        '**/__mocks__/**/*.jsx',
       ],
       extends: ['plugin:jest/recommended'],
       env: {

diff --git a/__mocks__/firebase-admin/app.js b/__mocks__/firebase-admin/app.js
@@ -1,3 +1,5 @@
+export {}
+
 const firebaseAdminApp = jest.createMockFromModule('firebase-admin/app')
 
 firebaseAdminApp.getApps = jest.fn(() => [])

diff --git a/__mocks__/firebase-admin/auth.js b/__mocks__/firebase-admin/auth.js
diff --git a/__mocks__/firebase-admin/auth.ts b/__mocks__/firebase-admin/auth.ts
@@ -0,0 +1,15 @@
+export {}
+
+const { Auth } = jest.requireActual('firebase-admin/auth')
+
+const firebaseAdminAuthMock: jest.Mocked<typeof Auth> =
+  jest.createMockFromModule('firebase-admin/auth')
+
+const auth = {
+  createCustomToken: jest.fn(async () => null) as jest.Mock,
+  verifyIdToken: jest.fn(async () => null) as jest.Mock,
+}
+
+firebaseAdminAuthMock.getAuth = jest.fn(() => auth)
+
+module.exports = firebaseAdminAuthMock
diff --git a/__mocks__/firebase/app.js b/__mocks__/firebase/app.js
@@ -1,5 +1,12 @@
+export {}
+
+const { FirebaseError } = jest.requireActual('firebase/app')
+
 const firebaseAppMock = jest.createMockFromModule('firebase/app')
 
 firebaseAppMock.getApps = jest.fn(() => [])
 
-module.exports = firebaseAppMock
+module.exports = {
+  ...firebaseAppMock,
+  FirebaseError,
+}
diff --git a/__mocks__/firebase/auth.js b/__mocks__/firebase/auth.js
@@ -1,3 +1,5 @@
+export {}
+
 const firebaseAuthMock = jest.createMockFromModule('firebase/auth')
 
 const mockOnIdTokenChangedUnsubscribe = jest.fn()

diff --git a/index.tests.ts b/index.tests.ts
diff --git a/jest.config.js b/jest.config.js
@@ -13,13 +13,19 @@ module.exports = {
   // Support absolute imports; e.g. from 'src/*'
   // https://stackoverflow.com/a/72437265/1332513
   moduleDirectories: ['node_modules', '<rootDir>'],
-  testPathIgnorePatterns: ['/node_modules/', '/.next/', '/.yalc/', '/.git/'],
+  testPathIgnorePatterns: [
+    '/node_modules/',
+    '/.next/',
+    '/.yalc/',
+    '/.git/',
+    'build/',
+  ],
   transform: {
     '^.+\\.(js|jsx)$': '<rootDir>/node_modules/babel-jest',
     '^.+\\.(ts|tsx)$': 'ts-jest',
   },
   transformIgnorePatterns: [
-    '/node_modules/(?!(firebase|@firebase)/)',
+    '/node_modules/(?!(firebase|@firebase|jose)/)',
     '/.yalc/',
     '^.+\\.module\\.(css|sass|scss)$',
   ],

diff --git a/jestSetup.js b/jestSetup.js
@@ -1,6 +1,9 @@
+/* globals jest */
 /* eslint-disable import/no-extraneous-dependencies */
 import 'core-js/stable'
 import 'regenerator-runtime/runtime'
+import crypto from 'crypto'
+import { TextEncoder, TextDecoder } from 'util'
 
 // Force warnings to fail Jest tests.
 // https://github.com/facebook/jest/issues/6121#issuecomment-444269677
@@ -11,3 +14,17 @@ console.error = function (message, ...args) {
   error.apply(console, args) // keep default behaviour
   throw message instanceof Error ? message : new Error(message)
 }
+
+// Next.js polyfills fetch
+global.fetch = jest.fn()
+
+// https://github.com/jsdom/jsdom/issues/1612
+Object.defineProperty(global.self, 'crypto', {
+  value: {
+    subtle: crypto.webcrypto.subtle,
+  },
+})
+
+// https://github.com/inrupt/solid-client-authn-js/issues/1676#issuecomment-917016646
+global.TextEncoder = TextEncoder
+global.TextDecoder = TextDecoder
diff --git a/package.json b/package.json
@@ -45,7 +45,10 @@
     "@testing-library/react": "^13.3.0",
     "@testing-library/react-hooks": "^8.0.1",
     "@types/cookies": "^0.7.7",
+    "@types/hoist-non-react-statics": "^3.3.1",
     "@types/jest": "^28",
+    "@types/keygrip": "^1.0.2",
+    "@types/set-cookie-parser": "^2.4.2",
     "@typescript-eslint/eslint-plugin": "^5.30.7",
     "@typescript-eslint/parser": "^5.30.7",
     "babel-jest": "^28.1.3",
@@ -67,7 +70,7 @@
     "eslint-plugin-react": "^7.30.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "firebase": "^9.9.1",
-    "firebase-admin": "^11.0.0",
+    "firebase-admin": "11.0.0",
     "jest": "^28.1.3",
     "jest-environment-jsdom": "^28.1.3",
     "jscodeshift": "^0.14.0",
@@ -86,6 +89,7 @@
     "source-map-loader": "^4.0.1",
     "ts-jest": "^28",
     "ts-loader": "^9.4.3",
+    "tsconfig-paths-webpack-plugin": "^4.0.1",
     "typescript": "^4.7.4",
     "webpack": "^5.73.0",
     "webpack-bundle-analyzer": "^4.5.0",

diff --git a/src/AuthAction.js b/src/AuthAction.js
diff --git a/src/AuthAction.ts b/src/AuthAction.ts
@@ -0,0 +1,12 @@
+// Different behaviors when the user's auth status is pending
+// or mismatches the page requirements.
+
+enum AuthAction {
+  RENDER = 'render',
+  SHOW_LOADER = 'showLoader',
+  RETURN_NULL = 'returnNull',
+  REDIRECT_TO_LOGIN = 'redirectToLogin',
+  REDIRECT_TO_APP = 'redirectToApp',
+}
+
+export default AuthAction
diff --git a/src/__mocks__/config.js b/src/__mocks__/config.js
diff --git a/src/__mocks__/config.ts b/src/__mocks__/config.ts
@@ -0,0 +1,14 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+export {}
+
+let config: any
+
+const mock: any = jest.createMockFromModule('../config')
+
+mock.setConfig = jest.fn((newConfig) => {
+  config = newConfig
+})
+
+mock.getConfig = jest.fn(() => config)
+
+module.exports = mock
diff --git a/src/__mocks__/useFirebaseUser.js → src/__mocks__/useFirebaseUser.ts b/src/__mocks__/useFirebaseUser.js → src/__mocks__/useFirebaseUser.ts
@@ -1,3 +1,5 @@
+export {}
+
 const mockUseFirebaseUser = jest.fn(() => ({
   user: undefined,
   claims: {},

diff --git a/src/__tests__/AuthAction.test.js → src/__tests__/AuthAction.test.ts b/src/__tests__/AuthAction.test.js → src/__tests__/AuthAction.test.ts
@@ -1,4 +1,7 @@
-describe('index.js: AuthAction', () => {
+// eslint-disable-next-line jest/no-export
+export {}
+
+describe('index.ts: AuthAction', () => {
   it('defines the expected constants', () => {
     expect.assertions(1)
     const AuthAction = require('src/AuthAction').default

diff --git a/src/__tests__/authCookies.test.js → src/__tests__/authCookies.test.ts b/src/__tests__/authCookies.test.js → src/__tests__/authCookies.test.ts
@@ -1,10 +1,11 @@
 import { setConfig } from 'src/config'
+import { ConfigInput } from 'src/configTypes'
 import createMockConfig from 'src/testHelpers/createMockConfig'
 
 jest.mock('src/config')
 
 beforeEach(() => {
-  const mockConfig = createMockConfig()
+  const mockConfig = createMockConfig() as ConfigInput
   setConfig({
     ...mockConfig,
     cookies: {

diff --git a/src/__tests__/claims.test.js → src/__tests__/claims.test.ts b/src/__tests__/claims.test.js → src/__tests__/claims.test.ts