From 0e2c0b6660cad845f3a59d76e98e145bb4256da5 Mon Sep 17 00:00:00 2001 From: Pedro Cattori Date: Sun, 13 Nov 2022 22:04:00 -0500 Subject: [PATCH] test(dev): restore fixture this fixture was incorrectly included as part of dependency upgrades: - https://github.com/remix-run/remix/pull/3917 - https://github.com/remix-run/remix/pull/3929 it should not have been updated since it is supposed to represent a Remix 1.3.x codebase --- .../app/db.server.ts | 0 .../app/entry.client.tsx | 0 .../app/entry.server.tsx | 0 .../app/models/note.server.ts | 0 .../app/models/post.server.ts | 0 .../app/models/user.server.ts | 0 .../app/root.tsx | 0 .../app/routes/healthcheck.tsx | 0 .../app/routes/index.tsx | 0 .../app/routes/join.tsx | 0 .../app/routes/login.tsx | 0 .../app/routes/logout.tsx | 0 .../app/routes/notes.tsx | 0 .../app/routes/notes/$noteId.tsx | 0 .../app/routes/notes/index.tsx | 0 .../app/routes/notes/new.tsx | 0 .../app/routes/posts/$slug.tsx | 0 .../app/routes/posts/admin.tsx | 0 .../app/routes/posts/admin/index.tsx | 0 .../app/routes/posts/admin/new.tsx | 0 .../app/routes/posts/index.tsx | 0 .../app/session.server.ts | 0 .../app/utils.test.ts | 0 .../app/utils.ts | 0 .../package.json | 10 +++++----- .../public/favicon.ico | Bin .../remix.config.js | 0 .../remix.env.d.ts | 0 .../tailwind.config.js | 0 .../tsconfig.json | 4 +++- 30 files changed, 8 insertions(+), 6 deletions(-) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/db.server.ts (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/entry.client.tsx (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/entry.server.tsx (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/models/note.server.ts (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/models/post.server.ts (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/models/user.server.ts (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/root.tsx (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/routes/healthcheck.tsx (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/routes/index.tsx (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/routes/join.tsx (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/routes/login.tsx (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/routes/logout.tsx (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/routes/notes.tsx (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/routes/notes/$noteId.tsx (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/routes/notes/index.tsx (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/routes/notes/new.tsx (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/routes/posts/$slug.tsx (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/routes/posts/admin.tsx (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/routes/posts/admin/index.tsx (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/routes/posts/admin/new.tsx (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/routes/posts/index.tsx (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/session.server.ts (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/utils.test.ts (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/app/utils.ts (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/package.json (91%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/public/favicon.ico (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/remix.config.js (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/remix.env.d.ts (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/tailwind.config.js (100%) rename packages/remix-dev/__tests__/fixtures/{replace-remix-imports => replace-remix-magic-imports}/tsconfig.json (86%) diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/db.server.ts b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/db.server.ts similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/db.server.ts rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/db.server.ts diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/entry.client.tsx b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/entry.client.tsx similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/entry.client.tsx rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/entry.client.tsx diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/entry.server.tsx b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/entry.server.tsx similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/entry.server.tsx rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/entry.server.tsx diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/models/note.server.ts b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/models/note.server.ts similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/models/note.server.ts rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/models/note.server.ts diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/models/post.server.ts b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/models/post.server.ts similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/models/post.server.ts rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/models/post.server.ts diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/models/user.server.ts b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/models/user.server.ts similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/models/user.server.ts rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/models/user.server.ts diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/root.tsx b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/root.tsx similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/root.tsx rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/root.tsx diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/healthcheck.tsx b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/healthcheck.tsx similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/healthcheck.tsx rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/healthcheck.tsx diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/index.tsx b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/index.tsx similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/index.tsx rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/index.tsx diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/join.tsx b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/join.tsx similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/join.tsx rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/join.tsx diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/login.tsx b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/login.tsx similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/login.tsx rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/login.tsx diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/logout.tsx b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/logout.tsx similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/logout.tsx rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/logout.tsx diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/notes.tsx b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/notes.tsx similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/notes.tsx rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/notes.tsx diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/notes/$noteId.tsx b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/notes/$noteId.tsx similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/notes/$noteId.tsx rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/notes/$noteId.tsx diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/notes/index.tsx b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/notes/index.tsx similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/notes/index.tsx rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/notes/index.tsx diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/notes/new.tsx b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/notes/new.tsx similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/notes/new.tsx rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/notes/new.tsx diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/posts/$slug.tsx b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/posts/$slug.tsx similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/posts/$slug.tsx rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/posts/$slug.tsx diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/posts/admin.tsx b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/posts/admin.tsx similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/posts/admin.tsx rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/posts/admin.tsx diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/posts/admin/index.tsx b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/posts/admin/index.tsx similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/posts/admin/index.tsx rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/posts/admin/index.tsx diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/posts/admin/new.tsx b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/posts/admin/new.tsx similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/posts/admin/new.tsx rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/posts/admin/new.tsx diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/posts/index.tsx b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/posts/index.tsx similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/routes/posts/index.tsx rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/routes/posts/index.tsx diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/session.server.ts b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/session.server.ts similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/session.server.ts rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/session.server.ts diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/utils.test.ts b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/utils.test.ts similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/utils.test.ts rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/utils.test.ts diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/utils.ts b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/utils.ts similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/app/utils.ts rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/app/utils.ts diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/package.json b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/package.json similarity index 91% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/package.json rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/package.json index d3d2fb6f589..26719f308b3 100644 --- a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/package.json +++ b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/package.json @@ -24,8 +24,8 @@ "@remix-run/react": "1.3.4", "@remix-run/serve": "1.3.4", "marked": "^4.0.12", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "^17.0.2", + "react-dom": "^17.0.2", "remix": "1.3.4", "tiny-invariant": "^1.2.0" }, @@ -35,12 +35,12 @@ "@remix-run/eslint-config": "1.3.4", "@testing-library/cypress": "^8.0.2", "@testing-library/jest-dom": "^5.16.2", - "@testing-library/react": "^13.3.0", + "@testing-library/react": "^12.1.4", "@testing-library/user-event": "^13.5.0", "@types/eslint": "^8.4.6", "@types/marked": "^4.0.2", - "@types/react": "^18.0.15", - "@types/react-dom": "^18.0.6", + "@types/react": "^17.0.40", + "@types/react-dom": "^17.0.13", "@vitejs/plugin-react": "^1.2.0", "c8": "^7.11.0", "cross-env": "^7.0.3", diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/public/favicon.ico b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/public/favicon.ico similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/public/favicon.ico rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/public/favicon.ico diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/remix.config.js b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/remix.config.js similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/remix.config.js rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/remix.config.js diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/remix.env.d.ts b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/remix.env.d.ts similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/remix.env.d.ts rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/remix.env.d.ts diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/tailwind.config.js b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/tailwind.config.js similarity index 100% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/tailwind.config.js rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/tailwind.config.js diff --git a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/tsconfig.json b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/tsconfig.json similarity index 86% rename from packages/remix-dev/__tests__/fixtures/replace-remix-imports/tsconfig.json rename to packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/tsconfig.json index 3e3ff6f488b..22118c18c9e 100644 --- a/packages/remix-dev/__tests__/fixtures/replace-remix-imports/tsconfig.json +++ b/packages/remix-dev/__tests__/fixtures/replace-remix-magic-imports/tsconfig.json @@ -19,6 +19,8 @@ "skipLibCheck": true, // Remix takes care of building everything in `remix build`. - "noEmit": true + "noEmit": true, + "allowJs": true, + "forceConsistentCasingInFileNames": true } }