refactor: use hooks

jest.config.js

@@ -13,12 +13,6 @@ module.exports = {
       statements: 100
     }
   },
-  moduleNameMapper: {
-    '^~/(.*)$': '<rootDir>/lib/$1',
-    '^~~$': '<rootDir>',
-    '^@@$': '<rootDir>',
-    '^@/(.*)$': '<rootDir>/lib/$1'
-  },
   transform: {
     '^.+\\.js$': 'babel-jest'
   }

packages/typescript-build/lib/module.js

@@ -14,9 +14,6 @@ function tsModule (_moduleOptions) {
     _moduleOptions
   )
 
-  // Allow TypeScript extension for severMiddlewares (`nuxt.resolver.resolvePath` uses `options.extensions`)
-  this.options.extensions.push('ts')
-
   // Extend Builder to handle .ts/.tsx files as routes and watch them
   this.options.build.additionalExtensions = ['ts', 'tsx']
 

packages/typescript-build/test/fixture/nuxt.config.js

@@ -1,5 +1,5 @@
 export default {
-  modules: [
-    '../../../packages/typescript-build'
+  buildModules: [
+    '@nuxt/typescript-build'
   ]
 }

packages/typescript-build/test/module.test.js

@@ -34,9 +34,6 @@ describe('module', () => {
   test('with default options', async () => {
     builder = await buildWithTsModule()
 
-    expect(builder.nuxt.options.extensions).toHaveLength(3)
-    expect(builder.nuxt.options.extensions).toEqual(['js', 'mjs', 'ts'])
-
     expect(builder.nuxt.options.build.additionalExtensions).toHaveLength(2)
     expect(builder.nuxt.options.build.additionalExtensions).toEqual(['ts', 'tsx'])
 

packages/typescript-runtime/bin/nuxt-ts.js

@@ -1,20 +1,11 @@
 #!/usr/bin/env node
 
-const path = require('path')
-const { resolveNuxtBin, getRootdirFromArgv, registerTSNode } = require('..')
+const cli = (() => { try { return require('@nuxt/cli') } catch { return require('@nuxt/cli-edge') } })()
 
-function main () {
-  const rootDir = getRootdirFromArgv()
-  const tsConfigPath = path.resolve(rootDir, 'tsconfig.json')
+const { hooks } = require('..')
 
-  registerTSNode(tsConfigPath)
-
-  require(resolveNuxtBin())
-}
-
-try {
-  main()
-} catch (error) {
-  require('consola').error(error)
-  process.exit(1)
-}
+cli.run(null, hooks)
+  .catch((error) => {
+    require('consola').fatal(error)
+    require('exit')(2)
+  })

packages/typescript-runtime/lib/index.js

@@ -1,5 +1,24 @@
+const path = require('path')
+const { register } = require('ts-node')
+
+const hooks = {
+  'run:before' ({ argv, rootDir }) {
+    const customPath = argv.find((_arg, index) => index > 0 && argv[index - 1] === '--tsconfig')
+    const tsConfigPath = path.resolve(customPath || rootDir, customPath && customPath.endsWith('.json') ? '' : 'tsconfig.json')
+
+    register({
+      project: tsConfigPath,
+      compilerOptions: {
+        module: 'commonjs'
+      }
+    })
+  },
+
+  config (config) {
+    config.extensions = [...(config.extensions || []), 'ts']
+  }
+}
+
 module.exports = {
-  ...require('./resolve'),
-  ...require('./args'),
-  registerTSNode: require('./register')
+  hooks
 }

packages/typescript-runtime/test/hooks.test.js

@@ -0,0 +1,62 @@
+import path from 'path'
+import { register } from 'ts-node'
+import { hooks } from '..'
+
+jest.mock('ts-node')
+
+describe('run:before hook', () => {
+  beforeEach(() => {
+    register.mockClear()
+  })
+
+  test('registers ts-node', () => {
+    hooks['run:before']({ argv: [], rootDir: 'path' })
+
+    expect(register).toHaveBeenCalledWith({
+      project: path.resolve('path', 'tsconfig.json'),
+      compilerOptions: {
+        module: 'commonjs'
+      }
+    })
+  })
+
+  test('registers ts-node (custom tsconfig.json path)', () => {
+    hooks['run:before']({ argv: ['--tsconfig', 'custom/tsconfig.json'], rootDir: 'path' })
+
+    expect(register).toHaveBeenCalledWith({
+      project: path.resolve('custom/tsconfig.json'),
+      compilerOptions: {
+        module: 'commonjs'
+      }
+    })
+  })
+
+  test('registers ts-node (custom tsconfig.json dir path)', () => {
+    hooks['run:before']({ argv: ['--tsconfig', 'custom'], rootDir: 'path' })
+
+    expect(register).toHaveBeenCalledWith({
+      project: path.resolve('custom/tsconfig.json'),
+      compilerOptions: {
+        module: 'commonjs'
+      }
+    })
+  })
+})
+
+describe('config hook', () => {
+  test('adds ts extension (config.extensions is: defined)', () => {
+    const config = { extensions: [] }
+
+    hooks.config(config)
+
+    expect(config.extensions).toContain('ts')
+  })
+
+  test('adds ts extension (config.extensions is: undefined)', () => {
+    const config = {}
+
+    hooks.config(config)
+
+    expect(config.extensions).toContain('ts')
+  })
+})