Revert "refactor: remove .js ext from ALL local imports across the codebase (#361)" (#363)

This reverts commit db3b348.

Author: enapupe

.github/workflows/nodejs.yml

@@ -4,29 +4,25 @@ on:
   push:
     branches:
     - develop
-    - test
   pull_request:
 
 jobs:
   build:
     runs-on: 'ubuntu-latest'
 
-
     steps:
-      - name: 'Checkout Project'
-        uses: 'actions/checkout@v4'
-
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
           node-version: '16.15'
-          cache: 'yarn'
 
-      - name: Install dependencies
-        run: yarn install --immutable
+      - name: 'Checkout Project'
+        uses: 'actions/checkout@v3'
+        with:
+          fetch-depth: 1
 
-      - name: Lint code
-        run: yarn lint
+      - name: Install Dependencies and lint code
+        run: yarn install && yarn lint
 
       - name: Start MongoDB
         uses: supercharge/mongodb-github-action@1.8.0
@@ -48,8 +44,8 @@ jobs:
         run: |
           docker container restart mongodb
 
-      - name: Run tests
-        run: yarn test --ci
+      - name: Build and run tests
+        run: yarn test
+        env:
+          NODE_OPTIONS: --experimental-vm-modules
 
-      - name: Build files/check types
-        run: yarn build-release  --noEmit

jest.config.cjs

@@ -1,11 +1,7 @@
 module.exports = {
-  transform: {
-    '^.+\\.tsx?$': 'ts-jest'
-  },
-  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  preset: 'ts-jest',
   testEnvironment: 'node',
-  testPathIgnorePatterns: ['/node_modules/', './build/'],
   testMatch: [
-    '<rootDir>/**/__tests__/*.ts'
+    '<rootDir>/build/**/__tests__/*.js'
   ]
 }

package.json

@@ -66,7 +66,7 @@
   "scripts": {
     "lint": "yarn ts-standard",
     "fix": "yarn ts-standard --fix",
-    "test": "jest --runInBand",
+    "test": "yarn build && cross-env NODE_OPTIONS=\"--experimental-vm-modules\" jest --runInBand",
     "build": "tsc -p tsconfig.json",
     "build-release": "tsc  -p tsconfig.release.json",
     "clean": "tsc -b --clean && rm -rf build/*",

src/GradeUtils.ts

@@ -1,6 +1,6 @@
 import { getScale, GradeScales, GradeScalesTypes } from '@openbeta/sandbag'
 import isoCountries from 'i18n-iso-countries'
-import { DisciplineType, ClimbGradeContextType } from './db/ClimbTypes'
+import { DisciplineType, ClimbGradeContextType } from './db/ClimbTypes.js'
 
 /**
  * Grade systems have minor variations between countries. gradeContext is a

src/__tests__/areas.ts

@@ -1,12 +1,12 @@
 import { ApolloServer } from 'apollo-server'
 import muuid from 'uuid-mongodb'
 import { jest } from '@jest/globals'
-import MutableAreaDataSource from '../model/MutableAreaDataSource'
-import MutableOrganizationDataSource from '../model/MutableOrganizationDataSource'
-import { AreaType } from '../db/AreaTypes'
-import { OrgType, OrganizationType, OrganizationEditableFieldsType } from '../db/OrganizationTypes'
-import { queryAPI, setUpServer } from '../utils/testUtils'
-import { muuidToString } from '../utils/helpers'
+import MutableAreaDataSource from '../model/MutableAreaDataSource.js'
+import MutableOrganizationDataSource from '../model/MutableOrganizationDataSource.js'
+import { AreaType } from '../db/AreaTypes.js'
+import { OrgType, OrganizationType, OrganizationEditableFieldsType } from '../db/OrganizationTypes.js'
+import { queryAPI, setUpServer } from '../utils/testUtils.js'
+import { muuidToString } from '../utils/helpers.js'
 
 jest.setTimeout(60000)
 

src/__tests__/gradeUtils.ts

@@ -1,13 +1,5 @@
-import { DisciplineType } from '../db/ClimbTypes'
-import { sanitizeDisciplines, createGradeObject, gradeContextToGradeScales } from '../GradeUtils'
-
-beforeAll(() => {
-  console.warn = jest.fn()
-})
-
-afterAll(() => {
-  jest.mocked(console.warn).mockReset()
-})
+import { DisciplineType } from '../db/ClimbTypes.js'
+import { sanitizeDisciplines, createGradeObject, gradeContextToGradeScales } from '../GradeUtils.js'
 
 describe('Test grade utilities', () => {
   it('sanitizes bad discipline object', () => {

src/__tests__/history.ts

@@ -1,13 +1,13 @@
 import { ApolloServer } from 'apollo-server'
 import muuid from 'uuid-mongodb'
 import { jest } from '@jest/globals'
-import MutableAreaDataSource from '../model/MutableAreaDataSource'
-import MutableOrganizationDataSource from '../model/MutableOrganizationDataSource'
-import MutableClimbDataSource from '../model/MutableClimbDataSource'
-import { AreaType } from '../db/AreaTypes'
-import { OrgType, OrganizationType } from '../db/OrganizationTypes'
-import { muuidToString } from '../utils/helpers'
-import { queryAPI, setUpServer } from '../utils/testUtils'
+import MutableAreaDataSource from '../model/MutableAreaDataSource.js'
+import MutableOrganizationDataSource from '../model/MutableOrganizationDataSource.js'
+import MutableClimbDataSource from '../model/MutableClimbDataSource.js'
+import { AreaType } from '../db/AreaTypes.js'
+import { OrgType, OrganizationType } from '../db/OrganizationTypes.js'
+import { muuidToString } from '../utils/helpers.js'
+import { queryAPI, setUpServer } from '../utils/testUtils.js'
 
 jest.setTimeout(60000)
 

src/__tests__/organizations.ts

@@ -1,13 +1,13 @@
 import { ApolloServer } from 'apollo-server'
 import muuid from 'uuid-mongodb'
 import { jest } from '@jest/globals'
-import MutableAreaDataSource from '../model/MutableAreaDataSource'
-import MutableOrganizationDataSource from '../model/MutableOrganizationDataSource'
-import { AreaType } from '../db/AreaTypes'
-import { OrgType, OrganizationType, OperationType, OrganizationEditableFieldsType } from '../db/OrganizationTypes'
-import { changelogDataSource } from '../model/ChangeLogDataSource'
-import { queryAPI, setUpServer } from '../utils/testUtils'
-import { muuidToString } from '../utils/helpers'
+import MutableAreaDataSource from '../model/MutableAreaDataSource.js'
+import MutableOrganizationDataSource from '../model/MutableOrganizationDataSource.js'
+import { AreaType } from '../db/AreaTypes.js'
+import { OrgType, OrganizationType, OperationType, OrganizationEditableFieldsType } from '../db/OrganizationTypes.js'
+import { changelogDataSource } from '../model/ChangeLogDataSource.js'
+import { queryAPI, setUpServer } from '../utils/testUtils.js'
+import { muuidToString } from '../utils/helpers.js'
 import { validate as validateMuuid } from 'uuid'
 
 jest.setTimeout(60000)

src/__tests__/ticks.ts

@@ -1,12 +1,12 @@
 import { ApolloServer } from 'apollo-server'
 import muuid from 'uuid-mongodb'
 import { jest } from '@jest/globals'
-import { queryAPI, setUpServer } from '../utils/testUtils'
-import { muuidToString } from '../utils/helpers'
-import { TickInput } from '../db/TickTypes'
-import TickDataSource from '../model/TickDataSource'
-import UserDataSource from '../model/UserDataSource'
-import { UpdateProfileGQLInput } from '../db/UserTypes'
+import { queryAPI, setUpServer } from '../utils/testUtils.js'
+import { muuidToString } from '../utils/helpers.js'
+import { TickInput } from '../db/TickTypes.js'
+import TickDataSource from '../model/TickDataSource.js'
+import UserDataSource from '../model/UserDataSource.js'
+import { UpdateProfileGQLInput } from '../db/UserTypes.js'
 
 jest.setTimeout(60000)
 

src/auth/index.ts

@@ -1,3 +1,3 @@
-import permissions from './permissions'
-import { createContext } from './middleware'
+import permissions from './permissions.js'
+import { createContext } from './middleware.js'
 export { permissions, createContext }