Fix types for new withUtils build files

jackocnr · May 11, 2024 · cf0010e · cf0010e
1 parent d7ddd9b
commit cf0010e
Show file tree

Hide file tree

Showing 21 changed files with 61 additions and 35 deletions.
diff --git a/build.js b/build.js
@@ -87,7 +87,7 @@ build({
   banner: {
     js: getBanner("intlTelInput"),
   },
-  entryPoints: ["src/js/intlTelInputWithUtils.js"],
+  entryPoints: ["src/js/intl-tel-input/intlTelInputWithUtils.ts"],
   minify: false,
   outfile: "build/js/intlTelInputWithUtils.js",
 });
@@ -98,7 +98,7 @@ build({
   banner: {
     js: getBanner("intlTelInput"),
   },
-  entryPoints: ["src/js/intlTelInputWithUtils.js"],
+  entryPoints: ["src/js/intl-tel-input/intlTelInputWithUtils.ts"],
   minify: true,
   outfile: "build/js/intlTelInputWithUtils.min.js",
 });
diff --git a/build/js/intlTelInput.d.ts b/build/js/intlTelInput.d.ts
@@ -580,12 +580,6 @@ declare module "intl-tel-input" {
         };
         numberType: object;
     };
-    global {
-        interface Window {
-            intlTelInputUtils: ItiUtils;
-            intlTelInputUtilsBackup: ItiUtils;
-        }
-    }
     type NumberType = "FIXED_LINE_OR_MOBILE" | "FIXED_LINE" | "MOBILE" | "PAGER" | "PERSONAL_NUMBER" | "PREMIUM_RATE" | "SHARED_COST" | "TOLL_FREE" | "UAN" | "UNKNOWN" | "VOICEMAIL" | "VOIP";
     type SelectedCountryData = Country | {
         name?: string;
@@ -977,3 +971,11 @@ declare module "intl-tel-input" {
     const intlTelInput: IntlTelInputInterface;
     export default intlTelInput;
 }
+declare module "intl-tel-input/utils-compiled" {
+    export default utils;
+    const utils: any;
+}
+declare module "intl-tel-input/intlTelInputWithUtils" {
+    import intlTelInput from "intl-tel-input";
+    export default intlTelInput;
+}
diff --git a/build/js/intlTelInputWithUtils.js b/build/js/intlTelInputWithUtils.js
@@ -32,7 +32,7 @@ var factoryOutput = (() => {
   };
   var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-  // src/js/intlTelInputWithUtils.js
+  // src/js/intl-tel-input/intlTelInputWithUtils.ts
   var intlTelInputWithUtils_exports = {};
   __export(intlTelInputWithUtils_exports, {
     default: () => intlTelInputWithUtils_default
@@ -9151,7 +9151,7 @@ var factoryOutput = (() => {
   delete window.intlTelInputUtilsTemp;
   var utils_default = utils;
 
-  // src/js/intlTelInputWithUtils.js
+  // src/js/intl-tel-input/intlTelInputWithUtils.ts
   intl_tel_input_default.utils = utils_default;
   var intlTelInputWithUtils_default = intl_tel_input_default;
   return __toCommonJS(intlTelInputWithUtils_exports);

diff --git a/build/js/intlTelInputWithUtils.min.js b/build/js/intlTelInputWithUtils.min.js
diff --git a/grunt/react_with_utils.js b/grunt/react_with_utils.js
@@ -3,7 +3,7 @@ const fs = require('fs');
 module.exports = function(grunt) {
   grunt.registerTask('react_with_utils', 'Generate react/src/intl-tel-input/reactWithUtils.tsx', function() {
     const reactContents = fs.readFileSync('react/src/intl-tel-input/react.tsx', 'utf8');
-    const reactWithUtilsContents = reactContents.replace('import intlTelInput from "../intl-tel-input";', '//* THIS FILE IS AUTO-GENERATED. DO NOT EDIT.\nimport intlTelInput from "../intlTelInputWithUtils";');
+    const reactWithUtilsContents = reactContents.replace('import intlTelInput from "../intl-tel-input";', '//* THIS FILE IS AUTO-GENERATED. DO NOT EDIT.\nimport intlTelInput from "./intlTelInputWithUtils";');
     fs.writeFileSync('react/src/intl-tel-input/reactWithUtils.tsx', reactWithUtilsContents);
   });
 };
diff --git a/package.json b/package.json
@@ -100,14 +100,22 @@
       "types": "./build/js/intlTelInput.d.ts",
       "default": "./build/js/intlTelInput.js"
     },
+    "./intlTelInputWithUtils": {
+      "types": "./build/js/intlTelInput.d.ts",
+      "default": "./build/js/intlTelInputWithUtils.js"
+    },
     "./data": "./build/js/data.js",
     "./react": {
       "types": "./react/build/IntlTelInput.d.ts",
       "require": "./react/build/IntlTelInput.cjs",
       "default": "./react/build/IntlTelInput.js"
     },
+    "./reactWithUtils": {
+      "types": "./react/build/IntlTelInput.d.ts",
+      "require": "./react/build/IntlTelInputWithUtils.cjs",
+      "default": "./react/build/IntlTelInputWithUtils.js"
+    },
     "./i18n/*": "./build/js/i18n/*/index.js",
-    "./intlTelInputWithUtils": "./build/js/intlTelInputWithUtils.js",
     "./*": "./*"
   },
   "typesVersions": {

diff --git a/react/build/IntlTelInput.cjs b/react/build/IntlTelInput.cjs
diff --git a/react/build/IntlTelInput.d.ts b/react/build/IntlTelInput.d.ts
@@ -581,12 +581,6 @@ declare module "intl-tel-input" {
         };
         numberType: object;
     };
-    global {
-        interface Window {
-            intlTelInputUtils: ItiUtils;
-            intlTelInputUtilsBackup: ItiUtils;
-        }
-    }
     type NumberType = "FIXED_LINE_OR_MOBILE" | "FIXED_LINE" | "MOBILE" | "PAGER" | "PERSONAL_NUMBER" | "PREMIUM_RATE" | "SHARED_COST" | "TOLL_FREE" | "UAN" | "UNKNOWN" | "VOICEMAIL" | "VOIP";
     type SelectedCountryData = Country | {
         name?: string;
@@ -993,3 +987,26 @@ declare module "intl-tel-input/react" {
     }) => React.JSX.Element;
     export default IntlTelInput;
 }
+declare module "intl-tel-input/utils-compiled" {
+    export default utils;
+    const utils: any;
+}
+declare module "intl-tel-input/intlTelInputWithUtils" {
+    import intlTelInput from "intl-tel-input";
+    export default intlTelInput;
+}
+declare module "intl-tel-input/reactWithUtils" {
+    import { SomeOptions } from "intl-tel-input";
+    import React from "react";
+    const IntlTelInput: ({ initialValue, onChangeNumber, onChangeCountry, onChangeValidity, onChangeErrorCode, usePreciseValidation, initOptions, inputProps, }: {
+        initialValue?: string;
+        onChangeNumber?: (number: string) => void;
+        onChangeCountry?: (country: string) => void;
+        onChangeValidity?: (valid: boolean) => void;
+        onChangeErrorCode?: (errorCode: number | null) => void;
+        usePreciseValidation?: boolean;
+        initOptions?: SomeOptions;
+        inputProps?: object;
+    }) => React.JSX.Element;
+    export default IntlTelInput;
+}
diff --git a/react/build/IntlTelInput.js b/react/build/IntlTelInput.js
diff --git a/react/demo/simple-bundle.js b/react/demo/simple-bundle.js
@@ -32669,7 +32669,7 @@
   delete window.intlTelInputUtilsTemp;
   var utils_default = utils;
 
-  // src/js/intlTelInputWithUtils.js
+  // src/js/intl-tel-input/intlTelInputWithUtils.ts
   intl_tel_input_default.utils = utils_default;
   var intlTelInputWithUtils_default = intl_tel_input_default;
 

diff --git a/react/demo/validation-bundle.js b/react/demo/validation-bundle.js
@@ -32669,7 +32669,7 @@
   delete window.intlTelInputUtilsTemp;
   var utils_default = utils;
 
-  // src/js/intlTelInputWithUtils.js
+  // src/js/intl-tel-input/intlTelInputWithUtils.ts
   intl_tel_input_default.utils = utils_default;
   var intlTelInputWithUtils_default = intl_tel_input_default;
 

diff --git a/react/src/intl-tel-input/intlTelInputWithUtils.ts b/react/src/intl-tel-input/intlTelInputWithUtils.ts
@@ -0,0 +1 @@
+../../../src/js/intl-tel-input/intlTelInputWithUtils.ts
diff --git a/react/src/intl-tel-input/reactWithUtils.tsx b/react/src/intl-tel-input/reactWithUtils.tsx
@@ -1,5 +1,6 @@
 //* THIS FILE IS AUTO-GENERATED. DO NOT EDIT.
-import intlTelInput from "../intlTelInputWithUtils";
+import intlTelInput from "./intlTelInputWithUtils";
+//* Keep the TS imports separate, as the above line gets substituted in the reactWithUtils build process.
 import { Iti, SomeOptions } from "../intl-tel-input";
 import React, { useRef, useEffect } from "react";
 

diff --git a/react/src/intl-tel-input/utils-compiled.js b/react/src/intl-tel-input/utils-compiled.js
@@ -0,0 +1 @@
+../../../build/js/utils.js
diff --git a/react/src/intlTelInputWithUtils.js b/react/src/intlTelInputWithUtils.js
diff --git a/react/tsconfig.json b/react/tsconfig.json
@@ -10,5 +10,6 @@
   },
   "include": [
     "src/intl-tel-input/react.tsx",
+    "src/intl-tel-input/reactWithUtils.tsx",
   ],
 }
diff --git a/src/js/intl-tel-input.ts b/src/js/intl-tel-input.ts
@@ -28,12 +28,6 @@ type ItiUtils = {
   numberFormat: { NATIONAL: number, INTERNATIONAL: number, E164: number, RFC3966: number };
   numberType: object;
 };
-declare global {
-  interface Window {
-    intlTelInputUtils: ItiUtils;
-    intlTelInputUtilsBackup: ItiUtils;
-  }
-}
 type NumberType =
   "FIXED_LINE_OR_MOBILE"
   | "FIXED_LINE"

diff --git a/src/js/intl-tel-input/intlTelInputWithUtils.ts b/src/js/intl-tel-input/intlTelInputWithUtils.ts
@@ -0,0 +1,4 @@
+import intlTelInput from "../intl-tel-input";
+import utils from "./utils-compiled";
+intlTelInput.utils = utils;
+export default intlTelInput;
diff --git a/src/js/intl-tel-input/utils-compiled.js b/src/js/intl-tel-input/utils-compiled.js
@@ -0,0 +1 @@
+../../../build/js/utils.js
diff --git a/src/js/intlTelInputWithUtils.js b/src/js/intlTelInputWithUtils.js
diff --git a/tsconfig.json b/tsconfig.json
@@ -9,5 +9,6 @@
     },
     "include": [
         "src/js/intl-tel-input.ts",
+        "src/js/intl-tel-input/intlTelInputWithUtils.ts",
     ],
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../src/js/intl-tel-input/intlTelInputWithUtils.ts