Skip to content

Commit

Permalink
Merge pull request #10472 from marmelab/fix-cra-vite-alias
Browse files Browse the repository at this point in the history 
Fix create-react-admin Vite alias and test
  • Loading branch information
@slax57
slax57 authored Jan 24, 2025
2 parents 39116eb + 17c6fab commit 4b19a85
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 50 deletions.
71 changes: 38 additions & 33 deletions packages/create-react-admin/src/generateAppTestFile.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,48 +13,53 @@ import { fireEvent, render, screen } from "@testing-library/react";
import { App } from "./App";
test("should pass", async () => {
vi.spyOn(window, "scrollTo").mockImplementation(() => { /* do nothing */ });
render(<App />);
vi.spyOn(window, "scrollTo").mockImplementation(() => { /* do nothing */ });
render(<App />);
${
state.authProvider !== 'none'
? `
// Sign in
// Sign in
fireEvent.change(await screen.findByLabelText("Username *"), {
target: { value: "janedoe" },
});
fireEvent.change(await screen.findByLabelText("Password *"), {
target: { value: "password" },
});
fireEvent.click(await screen.findByText("Sign in"));`
fireEvent.change(
await screen.findByLabelText("Username *", undefined, { timeout: 4000 }),
{
target: { value: "janedoe" },
},
);
fireEvent.change(await screen.findByLabelText("Password *"), {
target: { value: "password" },
});
fireEvent.click(await screen.findByText("Sign in"));`
: ''
}
// Open the first post
fireEvent.click(await screen.findByText("Post 1"));
fireEvent.click(await screen.findByText("Edit"));
await screen.findByDisplayValue("Post 1");
// Update its title
fireEvent.change(await screen.findByDisplayValue("Post 1"), {
target: { value: "Post 1 edited" },
});
fireEvent.click(await screen.findByText("Save"));
await screen.findByText("Post 1 edited");
// Open the first post
fireEvent.click(await screen.findByText("Post 1"));
fireEvent.click(
await screen.findByText("Edit", undefined, { timeout: 4000 }),
);
await screen.findByDisplayValue("Post 1");
// Update its title
fireEvent.change(await screen.findByDisplayValue("Post 1"), {
target: { value: "Post 1 edited" },
});
fireEvent.click(await screen.findByText("Save"));
await screen.findByText("Post 1 edited");
// Navigate to the comments
fireEvent.click(await screen.findByText("Comments"));
// Open the first comment
fireEvent.click(await screen.findByText("Comment 1"));
fireEvent.click(await screen.findByText("Edit"));
await screen.findByDisplayValue("Post 1 edited");
// Edit the comment selected post
fireEvent.click(await screen.findByDisplayValue("Post 1 edited"));
fireEvent.click(await screen.findByText("Post 11"));
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);
// Navigate to the comments
fireEvent.click(await screen.findByText("Comments"));
// Open the first comment
fireEvent.click(await screen.findByText("Comment 1"));
fireEvent.click(await screen.findByText("Edit"));
await screen.findByDisplayValue("Post 1 edited");
// Edit the comment selected post
fireEvent.click(await screen.findByDisplayValue("Post 1 edited"));
fireEvent.click(await screen.findByText("Post 11"));
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 *" });
}, 20000);
`
);
Expand Down
17 changes: 9 additions & 8 deletions packages/create-react-admin/templates/common/vite.config.ts
View file
Original file line number Diff line number Diff line change
@@ -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
];
Expand Down
18 changes: 9 additions & 9 deletions packages/create-react-admin/templates/ra-data-fakerest/vite.config.ts
View file
Original file line number Diff line number Diff line change
@@ -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
];
Expand Down

0 comments on commit 4b19a85

Please sign in to comment.