@tamagui/babel-plugin-fully-specified 2.0.0-rc.3 → 2.0.0-rc.30

package/commonjs.cjs

@@ -0,0 +1 @@
+Object.assign(module.exports, require('./permanent/cjs/commonjs.js'))

package/package.json

@@ -1,19 +1,21 @@
 {
   "name": "@tamagui/babel-plugin-fully-specified",
-  "version": "2.0.0-rc.3",
+  "version": "2.0.0-rc.30",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "license": "MIT",
   "source": "src/index.ts",
   "files": [
     "src",
     "types",
-    "permanent"
+    "permanent",
+    "commonjs.cjs"
   ],
   "main": "permanent/cjs/index.js",
   "module": "permanent/esm/index.mjs",
   "exports": {
     ".": {
       "types": "./types/index.d.ts",
+      "browser": "./permanent/esm/index.mjs",
       "module": "./permanent/esm/index.mjs",
       "import": "./permanent/esm/index.mjs",
       "require": "./permanent/cjs/index.js",
@@ -21,6 +23,7 @@
     },
     "./commonjs": {
       "types": "./types/commonjs.d.ts",
+      "browser": "./permanent/esm/commonjs.mjs",
       "module": "./permanent/esm/commonjs.mjs",
       "import": "./permanent/esm/commonjs.mjs",
       "require": "./permanent/cjs/commonjs.js"

package/permanent/cjs/index.js

@@ -168,20 +168,23 @@ function evaluateTargetModule({
   esExtensionDefault,
   ensureFileExists,
 }) {
-  if (currentModuleExtension && !esExtensions.includes(currentModuleExtension)) return !1
   const targetFile = (0, import_node_path.resolve)(filenameDirectory, moduleSpecifier)
   if (ensureFileExists) {
     for (const extension of tryExtensions)
       if ((0, import_node_fs.existsSync)(targetFile + extension))
         return moduleSpecifier + esExtensionDefault
-    isDirectory &&
-      !(0, import_node_fs.existsSync)(
-        (0, import_node_path.resolve)(
+    if (currentModuleExtension && !esExtensions.includes(currentModuleExtension))
+      return !1
+    if (isDirectory) {
+      const indexModuleSpecifier = `${moduleSpecifier.replace(/\/$/, '')}/index`,
+        indexTargetFile = (0, import_node_path.resolve)(
           filenameDirectory,
-          currentModuleExtension ? moduleSpecifier : moduleSpecifier + esExtensionDefault
+          indexModuleSpecifier
         )
-      ) &&
-      (moduleSpecifier = `${moduleSpecifier}/index`)
+      for (const extension of tryExtensions)
+        if ((0, import_node_fs.existsSync)(indexTargetFile + extension))
+          return indexModuleSpecifier + esExtensionDefault
+    }
   } else
     return (
       esExtensions.includes(filenameExtension), moduleSpecifier + esExtensionDefault

package/permanent/cjs/index.mjs

@@ -184,12 +184,13 @@ function evaluateTargetModule({
   esExtensionDefault,
   ensureFileExists,
 }) {
-  if (currentModuleExtension && !esExtensions.includes(currentModuleExtension)) return !1
   const targetFile = (0, import_node_path.resolve)(filenameDirectory, moduleSpecifier)
   if (ensureFileExists) {
     for (const extension of tryExtensions)
       if ((0, import_node_fs.existsSync)(targetFile + extension))
         return moduleSpecifier + esExtensionDefault
+    if (currentModuleExtension && !esExtensions.includes(currentModuleExtension))
+      return !1
     isDirectory &&
       !(0, import_node_fs.existsSync)(
         (0, import_node_path.resolve)(

package/permanent/esm/index.js

@@ -124,11 +124,12 @@ function evaluateTargetModule({
   esExtensionDefault,
   ensureFileExists,
 }) {
-  if (currentModuleExtension && !esExtensions.includes(currentModuleExtension)) return !1
   const targetFile = resolve(filenameDirectory, moduleSpecifier)
   if (ensureFileExists) {
     for (const extension of tryExtensions)
       if (existsSync(targetFile + extension)) return moduleSpecifier + esExtensionDefault
+    if (currentModuleExtension && !esExtensions.includes(currentModuleExtension))
+      return !1
     isDirectory &&
       !existsSync(
         resolve(

package/permanent/esm/index.mjs

@@ -127,19 +127,19 @@ function evaluateTargetModule({
   esExtensionDefault,
   ensureFileExists,
 }) {
-  if (currentModuleExtension && !esExtensions.includes(currentModuleExtension)) return !1
   const targetFile = resolve(filenameDirectory, moduleSpecifier)
   if (ensureFileExists) {
     for (const extension of tryExtensions)
       if (existsSync(targetFile + extension)) return moduleSpecifier + esExtensionDefault
-    isDirectory &&
-      !existsSync(
-        resolve(
-          filenameDirectory,
-          currentModuleExtension ? moduleSpecifier : moduleSpecifier + esExtensionDefault
-        )
-      ) &&
-      (moduleSpecifier = `${moduleSpecifier}/index`)
+    if (currentModuleExtension && !esExtensions.includes(currentModuleExtension))
+      return !1
+    if (isDirectory) {
+      const indexModuleSpecifier = `${moduleSpecifier.replace(/\/$/, '')}/index`,
+        indexTargetFile = resolve(filenameDirectory, indexModuleSpecifier)
+      for (const extension of tryExtensions)
+        if (existsSync(indexTargetFile + extension))
+          return indexModuleSpecifier + esExtensionDefault
+    }
   } else
     return (
       esExtensions.includes(filenameExtension), moduleSpecifier + esExtensionDefault

package/src/index.ts

@@ -226,10 +226,6 @@ function evaluateTargetModule({
   esExtensionDefault,
   ensureFileExists,
 }: any): string | false {
-  if (currentModuleExtension && !esExtensions.includes(currentModuleExtension)) {
-    return false
-  }
-
   const targetFile = resolve(filenameDirectory, moduleSpecifier)
 
   if (ensureFileExists) {
@@ -239,17 +235,19 @@ function evaluateTargetModule({
       }
     }
 
-    // fallback to directory, so we find the non-dir first
-    if (
-      isDirectory &&
-      !existsSync(
-        resolve(
-          filenameDirectory,
-          currentModuleExtension ? moduleSpecifier : moduleSpecifier + esExtensionDefault
-        )
-      )
-    ) {
-      moduleSpecifier = `${moduleSpecifier}/index`
+    if (currentModuleExtension && !esExtensions.includes(currentModuleExtension)) {
+      return false
+    }
+
+    if (isDirectory) {
+      const indexModuleSpecifier = `${moduleSpecifier.replace(/\/$/, '')}/index`
+      const indexTargetFile = resolve(filenameDirectory, indexModuleSpecifier)
+
+      for (const extension of tryExtensions) {
+        if (existsSync(indexTargetFile + extension)) {
+          return indexModuleSpecifier + esExtensionDefault
+        }
+      }
     }
   } else if (esExtensions.includes(filenameExtension)) {
     return moduleSpecifier + esExtensionDefault