Fix linter warning on dts module

railsware · Oct 3, 2024 · 0d581cc · 0d581cc
1 parent 2d7d81b
commit 0d581cc
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 16 deletions.
diff --git a/lib/routes.d.ts b/lib/routes.d.ts
@@ -76,5 +76,5 @@ declare const define: undefined | (((arg: unknown[], callback: () => unknown) =>
     amd?: unknown;
 });
 declare const module: {
-    exports: any;
+    exports: unknown;
 } | undefined;
diff --git a/lib/routes.js b/lib/routes.js
@@ -30,19 +30,21 @@ RubyVariables.WRAPPER(
     const ModuleReferences = {
         CJS: {
             define(routes) {
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                module.exports = routes;
+                if (module) {
+                    module.exports = routes;
+                }
             },
             isSupported() {
                 return typeof module === "object";
             },
         },
         AMD: {
             define(routes) {
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                define([], function () {
-                    return routes;
-                });
+                if (define) {
+                    define([], function () {
+                        return routes;
+                    });
+                }
             },
             isSupported() {
                 return typeof define === "function" && !!define.amd;

diff --git a/lib/routes.ts b/lib/routes.ts
@@ -94,7 +94,7 @@ declare const define:
   | undefined
   | (((arg: unknown[], callback: () => unknown) => void) & { amd?: unknown });
 
-declare const module: { exports: any } | undefined;
+declare const module: { exports: unknown } | undefined;
 
 // eslint-disable-next-line
 RubyVariables.WRAPPER(
@@ -148,19 +148,21 @@ RubyVariables.WRAPPER(
     const ModuleReferences: Record<ModuleType, ModuleDefinition> = {
       CJS: {
         define(routes) {
-          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          module!.exports = routes;
+          if (module) {
+            module.exports = routes;
+          }
         },
         isSupported() {
           return typeof module === "object";
         },
       },
       AMD: {
         define(routes) {
-          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          define!([], function () {
-            return routes;
-          });
+          if (define) {
+            define([], function () {
+              return routes;
+            });
+          }
         },
         isSupported() {
           return typeof define === "function" && !!define.amd;

diff --git a/lib/tasks/js_routes.rake b/lib/tasks/js_routes.rake
@@ -3,12 +3,15 @@ namespace :js do
   task routes: :environment do
     require "js-routes"
     JsRoutes.generate!
+    JsRoutes.definitions! if JsRoutes.configuration.modern?
   end
 
   namespace :routes do
     desc "Make a js file with all rails route URL helpers and typescript definitions for them"
     task typescript: "js:routes" do
-      JsRoutes.definitions!
+      ActiveSupport::Deprecation.warn(
+        "`js:routes:typescript` task is deprecated. Please use `js:routes` instead."
+      )
     end
   end
 end
diff --git a/spec/js_routes/module_types/dts/routes.spec.d.ts b/spec/js_routes/module_types/dts/routes.spec.d.ts
@@ -76,7 +76,7 @@ declare const define: undefined | (((arg: unknown[], callback: () => unknown) =>
     amd?: unknown;
 });
 declare const module: {
-    exports: any;
+    exports: unknown;
 } | undefined;
 export const configure: RouterExposedMethods['configure'];