Improve(Cross Import): Use jiti to improve reliability

Author: 1aron

packages/cross-import/package.json

@@ -59,6 +59,7 @@
         "dist"
     ],
     "dependencies": {
+        "jiti": "^1.21.0",
         "sucrase": "^3.35.0"
     },
     "devDependencies": {

packages/cross-import/src/index.ts

@@ -1,8 +1,5 @@
-import { Transform, transform } from 'sucrase'
-import { Module, createRequire } from 'module'
-import { readFileSync } from 'fs'
-import { runInThisContext } from 'vm'
-import { dirname, join, parse } from 'path'
+import { transform } from 'sucrase'
+import jiti from 'jiti/dist/jiti'
 
 export default function crossImport(modulePath: string): any {
     if (!modulePath) return
@@ -21,27 +18,18 @@ export default function crossImport(modulePath: string): any {
             console.error(error)
             console.log('[cross-import] fall back to sucrase runtime transform:', modulePath)
         }
-        const parsedModulePath = parse(modulePath)
-        const sourceCode = readFileSync(modulePath, 'utf8').toString()
-        const transforms: Transform[] = ['imports']
-        if (parsedModulePath.ext === '.ts') {
-            transforms.unshift('typescript')
-        }
-        const { code: moduleCode } = transform(sourceCode, {
-            transforms,
-            filePath: modulePath
-        })
-        const filename = join(parsedModulePath.dir, parsedModulePath.name + '.js')
-        const mod = new Module(filename, module)
-        mod.filename = filename
-        mod.path = dirname(filename)
-        mod.require = createRequire(filename)
-        // Compile wrapped script
-        const compiledModule = runInThisContext(Module.wrap(moduleCode), {
-            filename
-        })
-        compiledModule(mod.exports, mod.require, mod, mod.filename, dirname(mod.filename))
-        mod.loaded = true
-        return mod.exports
+        return jiti(__filename, {
+            interopDefault: true,
+            cache: false,
+            debug: !!process.env.DEBUG,
+            onError(error) {
+                throw error
+            },
+            transform: (options) => {
+                return transform(options.source, {
+                    transforms: ['imports', 'typescript'],
+                })
+            }
+        })(modulePath)
     }
 }

packages/explore-config/tests/test.ts

@@ -3,41 +3,41 @@ import exploreConfig from '../src'
 it('read .js config', () => {
     const config = exploreConfig('../fixtures/master.css', { cwd: __dirname, extensions: ['js'] })
     expect(config).toEqual({
-        // extends: [
-        //     {
-        //         styles: {
-        //             card: 'inline-flex'
-        //         }
-        //     }
-        // ],
+        extends: [
+            {
+                styles: {
+                    card: 'inline-flex'
+                }
+            }
+        ],
         colors: { primary: '#ff0' }
     })
 })
 
 it('read .ts config', () => {
     const config = exploreConfig('../fixtures/master.css', { cwd: __dirname, extensions: ['ts'] })
     expect(config).toEqual({
-        // extends: [
-        //     {
-        //         styles: {
-        //             card: 'inline-flex'
-        //         }
-        //     }
-        // ],
+        extends: [
+            {
+                styles: {
+                    card: 'inline-flex'
+                }
+            }
+        ],
         colors: { primary: '#ff0' }
     })
 })
 
 it('read .mjs config', () => {
     const config = exploreConfig('../fixtures/master.css', { cwd: __dirname, extensions: ['mjs'] })
     expect(config).toEqual({
-        // extends: [
-        //     {
-        //         styles: {
-        //             card: 'inline-flex'
-        //         }
-        //     }
-        // ],
+        extends: [
+            {
+                styles: {
+                    card: 'inline-flex'
+                }
+            }
+        ],
         colors: { primary: '#ff0' }
     })
 })