Fix #692 - Improve TS module resolution (#702)

faisalman · Jan 24, 2024 · d6d8ac7 · d6d8ac7
1 parent 54c633a
commit d6d8ac7
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -173,23 +173,42 @@
   "browser": "dist/ua-parser.pack.js",
   "exports": {
     ".": {
-      "require": "./src/main/ua-parser.js",
-      "import": "./src/main/ua-parser.mjs",
-      "types": "./src/main/ua-parser.d.ts"
+      "require": {
+        "default": "./src/main/ua-parser.js",
+        "types": "./src/main/ua-parser.d.ts"
+      },
+      "import": {
+        "default": "./src/main/ua-parser.mjs",
+        "types": "./src/main/ua-parser.d.ts"
+      }
     },
     "./enums": {
-      "require": "./src/enums/ua-parser-enums.js",
-      "import": "./src/enums/ua-parser-enums.mjs"
+      "require": {
+        "default": "./src/enums/ua-parser-enums.js"
+      },
+      "import": {
+        "default": "./src/enums/ua-parser-enums.mjs"
+      }
     },
     "./extensions": {
-      "require": "./src/extensions/ua-parser-extensions.js",
-      "import": "./src/extensions/ua-parser-extensions.mjs",
-      "types": "./src/extensions/ua-parser-extensions.d.ts"
+      "require": {
+        "default": "./src/extensions/ua-parser-extensions.js",
+        "types": "./src/extensions/ua-parser-extensions.d.ts"
+      },
+      "import": {
+        "default": "./src/extensions/ua-parser-extensions.mjs",
+        "types": "./src/extensions/ua-parser-extensions.d.ts"
+      }
     },
     "./helpers": {
-      "require": "./src/helpers/ua-parser-helpers.js",
-      "import": "./src/helpers/ua-parser-helpers.mjs",
-      "types": "./src/helpers/ua-parser-helpers.d.ts"
+      "require": {
+        "default": "./src/helpers/ua-parser-helpers.js",
+        "types": "./src/helpers/ua-parser-helpers.d.ts"
+      },
+      "import": {
+        "default": "./src/helpers/ua-parser-helpers.mjs",
+        "types": "./src/helpers/ua-parser-helpers.d.ts"
+      }
     }
   },
   "files": [

diff --git a/src/main/ua-parser.js b/src/main/ua-parser.js
@@ -1085,8 +1085,8 @@
                     }
                     // Xbox-Specific Detection
                     if (uaCH[MODEL] == 'Xbox') {
-                        this.set(TYPE, CONSOLE);
-                        this.set(VENDOR, MICROSOFT);
+                        this.set(TYPE, CONSOLE)
+                            .set(VENDOR, MICROSOFT);
                     }
                     if (uaCH[FORMFACTOR]) {
                         var ff;
@@ -1112,7 +1112,7 @@
                     // Xbox-Specific Detection
                     if (this.get(NAME) == WINDOWS && uaCH[MODEL] == 'Xbox') {
                         this.set(NAME, 'Xbox')
-                        this.set(VERSION, undefined)
+                            .set(VERSION, undefined);
                     }           
                     break;
                 case UA_RESULT: