Fix create-react-admin Vite alias and test

marmelab · Jan 24, 2025 · cca1e1e · cca1e1e
1 parent 5140a28
commit cca1e1e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 22 deletions.
diff --git a/packages/create-react-admin/src/generateAppTestFile.ts b/packages/create-react-admin/src/generateAppTestFile.ts
@@ -21,9 +21,12 @@ test("should pass", async () => {
 
 	// Sign in
 
-	fireEvent.change(await screen.findByLabelText("Username *"), {
-		target: { value: "janedoe" },
-	});
+  fireEvent.change(
+    await screen.findByLabelText("Username *", undefined, { timeout: 4000 }),
+    {
+      target: { value: "janedoe" },
+    },
+  );
 	fireEvent.change(await screen.findByLabelText("Password *"), {
 		target: { value: "password" },
 	});
@@ -33,7 +36,9 @@ test("should pass", async () => {
 
 	// Open the first post
 	fireEvent.click(await screen.findByText("Post 1"));
-	fireEvent.click(await screen.findByText("Edit"));
+  fireEvent.click(
+    await screen.findByText("Edit", undefined, { timeout: 4000 }),
+  );
 	await screen.findByDisplayValue("Post 1");
 	// Update its title
 	fireEvent.change(await screen.findByDisplayValue("Post 1"), {
@@ -54,7 +59,7 @@ test("should pass", async () => {
 	fireEvent.click(await screen.findByText("Save"));
 	// Check the comment has been updated by finding the post link in the comments list page
 	await screen.findByText("Post 11", { selector: "a *" });
-}, 10000);
+}, 20000);
 
     `
     );

diff --git a/packages/create-react-admin/templates/common/vite.config.ts b/packages/create-react-admin/templates/common/vite.config.ts
@@ -1,32 +1,33 @@
 import { defineConfig } from "vite";
+import path from "path";
 import react from "@vitejs/plugin-react";
 
 const alias = [
-  { find: "react-admin", replacement: "./node_modules/react-admin/src" },
-  { find: "ra-core", replacement: "./node_modules/ra-core/src" },
+  { find: "react-admin", replacement: path.resolve(__dirname, "./node_modules/react-admin/src") },
+  { find: "ra-core", replacement: path.resolve(__dirname, "./node_modules/ra-core/src") },
   {
     find: "ra-ui-materialui",
-    replacement: "./node_modules/ra-ui-materialui/src",
+    replacement: path.resolve(__dirname, "./node_modules/ra-ui-materialui/src"),
   },
   {
     find: "ra-i18n-polyglot",
-    replacement: "./node_modules/ra-i18n-polyglot/src",
+    replacement: path.resolve(__dirname, "./node_modules/ra-i18n-polyglot/src"),
   },
   {
     find: "ra-language-english",
-    replacement: "./node_modules/ra-language-english/src",
+    replacement: path.resolve(__dirname, "./node_modules/ra-language-english/src"),
   },
   {
     find: "ra-data-json-server",
-    replacement: "./node_modules/ra-data-json-server/src",
+    replacement: path.resolve(__dirname, "./node_modules/ra-data-json-server/src"),
   },
   {
     find: "ra-data-simple-rest",
-    replacement: "./node_modules/ra-data-simple-rest/src",
+    replacement: path.resolve(__dirname, "./node_modules/ra-data-simple-rest/src"),
   },
   {
     find: "ra-data-fakerest",
-    replacement: "./node_modules/ra-data-fakerest/src",
+    replacement: path.resolve(__dirname, "./node_modules/ra-data-fakerest/src"),
   },
   // add any other react-admin packages you have
 ];

diff --git a/packages/create-react-admin/templates/ra-data-fakerest/vite.config.ts b/packages/create-react-admin/templates/ra-data-fakerest/vite.config.ts
@@ -1,33 +1,33 @@
-/// <reference types="vitest" />
 import { defineConfig } from 'vite';
+import path from "path";
 import react from '@vitejs/plugin-react';
 
 const alias = [
-  { find: "react-admin", replacement: "./node_modules/react-admin/src" },
-  { find: "ra-core", replacement: "./node_modules/ra-core/src" },
+  { find: "react-admin", replacement: path.resolve(__dirname, "./node_modules/react-admin/src") },
+  { find: "ra-core", replacement: path.resolve(__dirname, "./node_modules/ra-core/src") },
   {
     find: "ra-ui-materialui",
-    replacement: "./node_modules/ra-ui-materialui/src",
+    replacement: path.resolve(__dirname, "./node_modules/ra-ui-materialui/src"),
   },
   {
     find: "ra-i18n-polyglot",
-    replacement: "./node_modules/ra-i18n-polyglot/src",
+    replacement: path.resolve(__dirname, "./node_modules/ra-i18n-polyglot/src"),
   },
   {
     find: "ra-language-english",
-    replacement: "./node_modules/ra-language-english/src",
+    replacement: path.resolve(__dirname, "./node_modules/ra-language-english/src"),
   },
   {
     find: "ra-data-json-server",
-    replacement: "./node_modules/ra-data-json-server/src",
+    replacement: path.resolve(__dirname, "./node_modules/ra-data-json-server/src"),
   },
   {
     find: "ra-data-simple-rest",
-    replacement: "./node_modules/ra-data-simple-rest/src",
+    replacement: path.resolve(__dirname, "./node_modules/ra-data-simple-rest/src"),
   },
   {
     find: "ra-data-fakerest",
-    replacement: "./node_modules/ra-data-fakerest/src",
+    replacement: path.resolve(__dirname, "./node_modules/ra-data-fakerest/src"),
   },
   // add any other react-admin packages you have
 ];