Fix(Cross Import): The cache is not deleted

techor-dev · Jun 12, 2023 · c5a5e56 · c5a5e56
1 parent 8e7fe2c
commit c5a5e56
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 50 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,7 +10,7 @@
 **/*node_modules
 **/*.turbo
 **/*out
-**/*config-tmp.*
+**/*tmp.*
 
 # Only exists if Bazel was run
 /bazel-out

diff --git a/packages/cross-import/package.json b/packages/cross-import/package.json
@@ -2,9 +2,8 @@
     "name": "cross-import",
     "scripts": {
         "build:cjs": "esbuild src/index.ts --bundle --outfile=dist/index.js --format=cjs --minify --sourcemap --platform=node --external:esbuild --external:fast-glob --external:jiti --external:@techor/extend --external:sucrase --external:upath",
-        "build:esm": "esbuild src/index.esm.ts --bundle --outfile=dist/index.esm.mjs --format=esm --minify --sourcemap --platform=node --external:esbuild --external:fast-glob --external:jiti --external:@techor/extend --external:sucrase --external:upath",
         "build:type": "tsc --emitDeclarationOnly --preserveWatchOutput",
-        "build": "npm run build:cjs && npm run build:esm && npm run build:type",
+        "build": "npm run build:cjs && npm run build:type",
         "dev": "conc 'npm:build:* -- --watch'",
         "test": "node -r sucrase/register ./tests/real && jest",
         "type-check": "tsc --noEmit",
@@ -35,7 +34,6 @@
         "read",
         "cross",
         "environments",
-        "esm",
         "commonjs",
         "ts",
         "typescript"
@@ -45,14 +43,11 @@
         "access": "public"
     },
     "main": "./dist/index.js",
-    "jsnext:main": "./dist/index.esm.mjs",
-    "esnext": "./dist/index.esm.mjs",
-    "module": "./dist/index.esm.mjs",
     "types": "./dist/index.d.ts",
     "exports": {
         ".": {
             "require": "./dist/index.js",
-            "import": "./dist/index.esm.mjs",
+            "import": "./dist/index.js",
             "types": "./dist/index.d.ts"
         }
     },

diff --git a/packages/cross-import/src/index.esm.ts b/packages/cross-import/src/index.esm.ts
diff --git a/packages/cross-import/src/index.ts b/packages/cross-import/src/index.ts
@@ -14,14 +14,31 @@ export default function crossImport(
     if (!filePath) return
     const resolvedFilePath = path.resolve(options.cwd, filePath)
     if (process.env.DEBUG) {
-        console.log('[crossImport] resolvedFilePath:', resolvedFilePath)
+        console.log('[DEBUG: Cross Import] resolvedFilePath:', resolvedFilePath)
     }
+
+    /** try to delete cache first */
+    try {
+        if (require.cache[resolvedFilePath]) {
+            delete require.cache[resolvedFilePath]
+            if (process.env.DEBUG) {
+                console.log('[DEBUG: Cross Import] delete cache')
+            }
+        }
+    } catch { /* empty */ }
+
     try {
-        delete require.cache[resolvedFilePath]
+        if (process.env.DEBUG) {
+            console.log('[DEBUG: Cross Import] require')
+        }
         return require(resolvedFilePath)
     } catch {
+        if (process.env.DEBUG) {
+            console.log('[Cross Import] JITI')
+        }
         return jiti(__filename, {
             interopDefault: true,
+            cache: false,
             transform: (options) => {
                 return transform(options.source, {
                     transforms: ['imports', 'typescript'],

diff --git a/packages/cross-import/tests/real.ts b/packages/cross-import/tests/real.ts
@@ -5,7 +5,7 @@ import path from 'path'
 /**
  * 測試 require cache 在真實 Node 環境運作時是否有被正確的清除
  */
-const configPath = path.join(__dirname, 'config-tmp.js')
+const configPath = path.join(__dirname, 'config.tmp.js')
 
 fs.writeFileSync(configPath, 'module.exports = { a: 0 }')
 const module1 = crossImport(configPath)
@@ -17,4 +17,20 @@ fs.writeFileSync(configPath, 'module.exports = { b: 0 }')
 const module2 = crossImport(configPath)
 if (module2.b !== 0) {
     throw new Error(`crossImport(${module1}) module2.b !== 0`)
-}
+}
+
+// ts
+const tsConfigPath = path.join(__dirname, 'config.tmp.ts')
+
+fs.writeFileSync(tsConfigPath, 'module.exports = { a: 0 }')
+const tsModule1 = crossImport(tsConfigPath)
+if (tsModule1.a !== 0) {
+    throw new Error(`crossImport(${tsModule1}) module1.a !== 0`)
+}
+
+fs.writeFileSync(tsConfigPath, 'module.exports = { b: 0 }')
+const tsModule2 = crossImport(tsConfigPath)
+if (tsModule2.b !== 0) {
+    throw new Error(`crossImport(${module1}) tsModule2.b !== 0`)
+}
+
diff --git a/packages/cross-import/tests/test.ts b/packages/cross-import/tests/test.ts
@@ -1,4 +1,6 @@
 import crossImport from '../src'
+import fs from 'fs'
+import path from 'path'
 
 it('import .ts in .js', () => {
     expect(
@@ -31,4 +33,6 @@ it('read non-existent file', () => {
         crossImport('idontexist.ts', { cwd: __dirname })
     )
         .toBeUndefined()
-})
+})
+
+// Do not test secondary imports in a test environment, inaccurate.