Change src imports to relative (redwoodjs#3082)

* change src imports to relative * replace ttsc with tsc * remove ttypescript * Remove babel module resolver plugin for framework * Remove all references to src/lib/test * Add tests to ignore path for codeql * Also ignore paths for push * Remove module mapping from tsconfigs * Try specified codeql paths with config file * Remove path from jsconfig too Co-authored-by: Daniel Choudhury <[email protected]>
sahilsaini1107 · Jul 22, 2021 · f359de4 · f359de4
1 parent 1fce07b
commit f359de4
Show file tree

Hide file tree

Showing 121 changed files with 210 additions and 307 deletions.
diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
@@ -0,0 +1,7 @@
+paths:
+  - packages
+paths-ignore:
+  - '**/*.test.js'
+  - '**/*.test.ts'
+  - '**/*/__tests__/*'
+  - '**/*.md'
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -42,6 +42,7 @@ jobs:
       uses: github/codeql-action/init@v1
       with:
         languages: ${{ matrix.language }}
+        config-file: ./.github/codeql/codeql-config.yml
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.

diff --git a/babel.config.js b/babel.config.js
@@ -45,14 +45,6 @@ module.exports = {
     '@babel/typescript',
   ],
   plugins: [
-    [
-      'babel-plugin-module-resolver',
-      {
-        alias: {
-          src: './src',
-        },
-      },
-    ],
     /**
      * NOTE
      * Experimental decorators are used in `@redwoodjs/structure`.

diff --git a/packages/api-server/tsconfig.json b/packages/api-server/tsconfig.json
@@ -5,9 +5,6 @@
     "rootDir": "src",
     "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo",
     "outDir": "dist",
-    "paths": {
-      "src/*": ["./src/*"]
-    }
   },
   "include": ["src", "ambient.d.ts"],
   "references": [{ "path": "../internal" }]

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -47,7 +47,7 @@
     "build": "yarn build:js && yarn build:types",
     "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build",
     "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\"",
-    "build:types": "ttsc --build --verbose",
+    "build:types": "tsc --build --verbose",
     "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"",
     "test": "jest",
     "test:watch": "yarn test --watch"

diff --git a/packages/api/src/auth/decoders/index.ts b/packages/api/src/auth/decoders/index.ts
@@ -2,7 +2,7 @@ import type { APIGatewayProxyEvent, Context as LambdaContext } from 'aws-lambda'
 
 import type { SupportedAuthTypes } from '@redwoodjs/auth'
 
-import type { GlobalContext } from 'src/globalContext'
+import type { GlobalContext } from '../../globalContext'
 
 import { auth0 } from './auth0'
 import { azureActiveDirectory } from './azureActiveDirectory'

diff --git a/packages/api/src/auth/index.ts b/packages/api/src/auth/index.ts
@@ -4,7 +4,7 @@ import type { APIGatewayProxyEvent, Context as LambdaContext } from 'aws-lambda'
 
 import type { SupportedAuthTypes } from '@redwoodjs/auth'
 
-import type { GlobalContext } from 'src/globalContext'
+import type { GlobalContext } from '../globalContext'
 
 import { decodeToken } from './decoders'
 

diff --git a/packages/api/src/functions/graphql.ts b/packages/api/src/functions/graphql.ts
@@ -11,14 +11,14 @@ import depthLimit from 'graphql-depth-limit'
 import { BaseLogger } from 'pino'
 import { v4 as uuidv4 } from 'uuid'
 
-import type { AuthContextPayload } from 'src/auth'
-import { getAuthenticationContext } from 'src/auth'
+import type { AuthContextPayload } from '../auth'
+import { getAuthenticationContext } from '../auth'
 import {
   GlobalContext,
   setContext,
   getPerRequestContext,
   usePerRequestContext,
-} from 'src/globalContext'
+} from '../globalContext'
 
 export type GetCurrentUser = (
   decoded: AuthContextPayload[0],

diff --git a/packages/api/src/makeMergedSchema/makeMergedSchema.ts b/packages/api/src/makeMergedSchema/makeMergedSchema.ts
@@ -9,7 +9,7 @@ import type { GraphQLSchema, GraphQLFieldMap } from 'graphql'
 import merge from 'lodash.merge'
 import omitBy from 'lodash.omitby'
 
-import { Services, GraphQLTypeWithFields } from 'src/types'
+import { Services, GraphQLTypeWithFields } from '../types'
 
 import * as rootSchema from './rootSchema'
 

diff --git a/packages/api/src/makeMergedSchema/rootSchema.ts b/packages/api/src/makeMergedSchema/rootSchema.ts
@@ -9,9 +9,9 @@ import {
 import gql from 'graphql-tag'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore - not inside the <rootDir>
-import apiPackageJson from 'src/../package.json'
 
-import type { GlobalContext } from 'src/globalContext'
+import apiPackageJson from '../../package.json'
+import type { GlobalContext } from '../globalContext'
 
 const { prismaVersion } = require('@prisma/client')
 

diff --git a/packages/api/src/webhooks/index.ts b/packages/api/src/webhooks/index.ts
@@ -6,13 +6,13 @@ import {
   WebhookVerificationError,
   DEFAULT_WEBHOOK_SECRET,
   SupportedVerifierTypes,
-} from 'src/auth/verifiers'
+} from '../auth/verifiers'
 
 export {
   VerifyOptions,
   WebhookVerificationError,
   DEFAULT_WEBHOOK_SECRET,
-} from 'src/auth/verifiers'
+} from '../auth/verifiers'
 
 export const DEFAULT_WEBHOOK_SIGNATURE_HEADER = 'RW-WEBHOOK-SIGNATURE'
 

diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json
@@ -5,9 +5,6 @@
     "rootDir": "src",
     "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo",
     "outDir": "dist",
-    "paths": {
-      "src/*": ["./src/*"]
-    }
   },
   "include": ["src/**/*", "src/../package.json"],
   "references": [

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -28,7 +28,7 @@
     "build": "yarn build:js && yarn build:types",
     "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build",
     "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\"",
-    "build:types": "ttsc --build --verbose",
+    "build:types": "tsc --build --verbose",
     "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"",
     "test": "jest",
     "test:watch": "yarn test --watch"

diff --git a/packages/cli/README.md b/packages/cli/README.md
@@ -674,12 +674,12 @@ But it's distinct from the others in that it's the only one that has a shebang a
 
 We also use methods that we want to affect all commands here, like `demandCommand` and `strict`.
 
-#### src/lib/colors.js
+#### lib/colors.js
 
 [colors.js](https://github.com/redwoodjs/redwood/blob/main/packages/cli/src/lib/colors.js) provides a declarative way of coloring output to the console using [chalk](https://github.com/chalk/chalk#styles). You'll see it imported like:
 
 ```javascript
-import c from 'src/lib/colors'
+import c from '../lib/colors'
 ```
 
 And used mainly in catch statements, like:

diff --git a/packages/cli/jsconfig.json b/packages/cli/jsconfig.json
@@ -4,9 +4,6 @@
     "baseUrl": ".",
     "rootDir": "src",
     "outDir": "dist",
-    "paths": {
-      "src/*": ["./src/*"]
-    }
   },
   "include": ["src"],
   "references": [

diff --git a/packages/cli/src/commands/__tests__/build.test.js b/packages/cli/src/commands/__tests__/build.test.js
@@ -12,9 +12,9 @@ let mockedRedwoodConfig = {
   browser: {},
 }
 
-jest.mock('src/lib', () => {
+jest.mock('../../lib/', () => {
   return {
-    ...jest.requireActual('src/lib'),
+    ...jest.requireActual('../../lib/'),
     runCommandTask: jest.fn((commands) => {
       return commands.map(({ cmd, args }) => `${cmd} ${args?.join(' ')}`)
     }),
@@ -39,8 +39,7 @@ jest.mock('@redwoodjs/prerender/detection', () => {
 
 import execa from 'execa'
 
-import { runCommandTask } from 'src/lib'
-
+import { runCommandTask } from '../../lib'
 import { handler } from '../build'
 import { getTasks as getPrerenderTasks } from '../prerender'
 

diff --git a/packages/cli/src/commands/__tests__/test.test.js b/packages/cli/src/commands/__tests__/test.test.js
@@ -1,5 +1,5 @@
 global.__dirname = __dirname
-import 'src/lib/test'
+import '../../lib/test'
 
 jest.mock('execa', () =>
   jest.fn((cmd, params) => ({

diff --git a/packages/cli/src/commands/__tests__/type-check.test.js b/packages/cli/src/commands/__tests__/type-check.test.js
@@ -14,9 +14,9 @@ let mockedRedwoodConfig = {
   browser: {},
 }
 
-jest.mock('src/lib', () => {
+jest.mock('../../lib', () => {
   return {
-    ...jest.requireActual('src/lib'),
+    ...jest.requireActual('../../lib'),
     runCommandTask: jest.fn((commands) => {
       return commands.map(({ cmd, args }) => `${cmd} ${args?.join(' ')}`)
     }),
@@ -37,8 +37,7 @@ import path from 'path'
 
 import execa from 'execa'
 
-import { runCommandTask } from 'src/lib'
-
+import { runCommandTask } from '../../lib'
 import { handler } from '../type-check'
 
 afterEach(() => {

diff --git a/packages/cli/src/commands/build.js b/packages/cli/src/commands/build.js
@@ -9,9 +9,9 @@ import terminalLink from 'terminal-link'
 import { getConfig } from '@redwoodjs/internal'
 import { detectPrerenderRoutes } from '@redwoodjs/prerender/detection'
 
-import { getPaths } from 'src/lib'
-import c from 'src/lib/colors'
-import { generatePrismaClient } from 'src/lib/generatePrismaClient'
+import { getPaths } from '../lib'
+import c from '../lib/colors'
+import { generatePrismaClient } from '../lib/generatePrismaClient'
 
 import { getTasks as getPrerenderTasks } from './prerender'
 

diff --git a/packages/cli/src/commands/check.js b/packages/cli/src/commands/check.js
@@ -1,5 +1,5 @@
-import { getPaths } from 'src/lib'
-import c from 'src/lib/colors'
+import { getPaths } from '../lib'
+import c from '../lib/colors'
 
 export const command = 'check'
 export const aliases = ['diagnostics']

diff --git a/packages/cli/src/commands/console.js b/packages/cli/src/commands/console.js
@@ -3,7 +3,7 @@ import repl from 'repl'
 
 import babelRequireHook from '@babel/register'
 
-import { getPaths } from 'src/lib'
+import { getPaths } from '../lib'
 
 export const command = 'console'
 export const aliases = ['c']

diff --git a/packages/cli/src/commands/dataMigrate/install.js b/packages/cli/src/commands/dataMigrate/install.js
@@ -5,8 +5,8 @@ import fs from 'fs-extra'
 import Listr from 'listr'
 import terminalLink from 'terminal-link'
 
-import { getPaths } from 'src/lib'
-import c from 'src/lib/colors'
+import { getPaths } from '../../lib'
+import c from '../../lib/colors'
 
 const MODEL = `model RW_DataMigration {
   version    String   @id

diff --git a/packages/cli/src/commands/dataMigrate/up.js b/packages/cli/src/commands/dataMigrate/up.js
@@ -6,8 +6,8 @@ import Listr from 'listr'
 import VerboseRenderer from 'listr-verbose-renderer'
 import terminalLink from 'terminal-link'
 
-import { getPaths } from 'src/lib'
-import c from 'src/lib/colors'
+import { getPaths } from '../../lib'
+import c from '../../lib/colors'
 
 babelRequireHook({
   extends: path.join(getPaths().api.base, '.babelrc.js'),

diff --git a/packages/cli/src/commands/deploy/aws.js b/packages/cli/src/commands/deploy/aws.js
@@ -5,8 +5,8 @@ import execa from 'execa'
 import Listr from 'listr'
 import terminalLink from 'terminal-link'
 
-import { getPaths } from 'src/lib'
-import c from 'src/lib/colors'
+import { getPaths } from '../../lib'
+import c from '../../lib/colors'
 
 export const command = 'aws [provider]'
 export const description = 'Deploy to AWS using the selected provider'

diff --git a/packages/cli/src/commands/deploy/helpers/helpers.js b/packages/cli/src/commands/deploy/helpers/helpers.js
@@ -3,7 +3,7 @@ import terminalLink from 'terminal-link'
 
 import { getPaths } from '@redwoodjs/internal'
 
-import c from 'src/lib/colors'
+import c from '../../../lib/colors'
 
 export const deployBuilder = (yargs) => {
   yargs

diff --git a/packages/cli/src/commands/deploy/render.js b/packages/cli/src/commands/deploy/render.js
@@ -1,7 +1,7 @@
 import execa from 'execa'
 import terminalLink from 'terminal-link'
 
-import { getPaths } from 'src/lib'
+import { getPaths } from '../../lib'
 
 export const command = 'render <side> [...commands]'
 export const description = 'Build command for Render deploy'

diff --git a/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js b/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js
@@ -1,9 +1,9 @@
 global.__dirname = __dirname
 
 jest.mock('fs')
-jest.mock('src/lib', () => {
+jest.mock('../../../../lib', () => {
   return {
-    ...jest.requireActual('src/lib'),
+    ...jest.requireActual('../../../../lib'),
     generateTemplate: () => '',
   }
 })
@@ -18,7 +18,7 @@ jest.mock('@redwoodjs/structure', () => {
 
 import fs from 'fs'
 
-import 'src/lib/test'
+import '../../../../lib/test'
 
 import { files } from '../../../generate/cell/cell'
 import { tasks } from '../cell'

diff --git a/packages/cli/src/commands/destroy/component/__tests__/component.test.js b/packages/cli/src/commands/destroy/component/__tests__/component.test.js
@@ -1,15 +1,15 @@
 global.__dirname = __dirname
 jest.mock('fs')
-jest.mock('src/lib', () => {
+jest.mock('../../../../lib', () => {
   return {
-    ...jest.requireActual('src/lib'),
+    ...jest.requireActual('../../../../lib'),
     generateTemplate: () => '',
   }
 })
 
 import fs from 'fs'
 
-import 'src/lib/test'
+import '../../../../lib/test'
 
 import { files } from '../../../generate/component/component'
 import { tasks } from '../component'

diff --git a/packages/cli/src/commands/destroy/function/__tests__/function.test.js b/packages/cli/src/commands/destroy/function/__tests__/function.test.js
@@ -1,15 +1,15 @@
 global.__dirname = __dirname
 jest.mock('fs')
-jest.mock('src/lib', () => {
+jest.mock('../../../../lib', () => {
   return {
-    ...jest.requireActual('src/lib'),
+    ...jest.requireActual('../../../../lib'),
     generateTemplate: () => '',
   }
 })
 
 import fs from 'fs'
 
-import 'src/lib/test'
+import '../../../../lib/test'
 
 import { files } from '../../../generate/function/function'
 import { tasks } from '../function'

diff --git a/packages/cli/src/commands/destroy/helpers.js b/packages/cli/src/commands/destroy/helpers.js
@@ -1,8 +1,7 @@
 import Listr from 'listr'
 
-import { deleteFilesTask } from 'src/lib'
-import c from 'src/lib/colors'
-
+import { deleteFilesTask } from '../../lib'
+import c from '../../lib/colors'
 import { ensureUniquePlural } from '../generate/helpers'
 
 const tasks = ({ componentName, filesFn, name }) =>

diff --git a/packages/cli/src/commands/destroy/layout/__tests__/layout.test.js b/packages/cli/src/commands/destroy/layout/__tests__/layout.test.js
@@ -1,15 +1,15 @@
 global.__dirname = __dirname
 jest.mock('fs')
-jest.mock('src/lib', () => {
+jest.mock('../../../../lib', () => {
   return {
-    ...jest.requireActual('src/lib'),
+    ...jest.requireActual('../../../../lib'),
     generateTemplate: () => '',
   }
 })
 
 import fs from 'fs'
 
-import 'src/lib/test'
+import '../../../../lib/test'
 
 import { files } from '../../../generate/layout/layout'
 import { tasks } from '../layout'