wip

remix-run · Mar 5, 2024 · a6ae740 · a6ae740
1 parent e29fef9
commit a6ae740
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 5 deletions.
diff --git a/...ion/helpers/vite-node-template/.gitignore → integration/helpers/vite-template/.gitignore b/...ion/helpers/vite-node-template/.gitignore → integration/helpers/vite-template/.gitignore
diff --git a/...n/helpers/vite-node-template/app/root.tsx → ...ration/helpers/vite-template/app/root.tsx b/...n/helpers/vite-node-template/app/root.tsx → ...ration/helpers/vite-template/app/root.tsx
diff --git a/.../vite-node-template/app/routes/_index.tsx → ...lpers/vite-template/app/routes/_index.tsx b/.../vite-node-template/app/routes/_index.tsx → ...lpers/vite-template/app/routes/_index.tsx
diff --git a/...ation/helpers/vite-node-template/env.d.ts → integration/helpers/vite-template/env.d.ts b/...ation/helpers/vite-node-template/env.d.ts → integration/helpers/vite-template/env.d.ts
diff --git a/...n/helpers/vite-node-template/package.json → ...ration/helpers/vite-template/package.json b/...n/helpers/vite-node-template/package.json → ...ration/helpers/vite-template/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "integration-vite-node-template",
+  "name": "integration-vite-template",
   "version": "0.0.0",
   "private": true,
   "sideEffects": false,

diff --git a/...ers/vite-node-template/public/favicon.ico → .../helpers/vite-template/public/favicon.ico b/...ers/vite-node-template/public/favicon.ico → .../helpers/vite-template/public/favicon.ico
diff --git a/.../helpers/vite-node-template/tsconfig.json → ...ation/helpers/vite-template/tsconfig.json b/.../helpers/vite-node-template/tsconfig.json → ...ation/helpers/vite-template/tsconfig.json
diff --git a/...helpers/vite-node-template/vite.config.ts → ...tion/helpers/vite-template/vite.config.ts b/...helpers/vite-node-template/vite.config.ts → ...tion/helpers/vite-template/vite.config.ts
diff --git a/integration/helpers/vite.ts b/integration/helpers/vite.ts
@@ -90,11 +90,11 @@ export const EXPRESS_SERVER = (args: {
     app.listen(port, () => console.log('http://localhost:' + port));
   `;
 
-type TemplateName = "vite-node-template" | "vite-cloudflare-template";
+type TemplateName = "vite-template" | "vite-cloudflare-template";
 
 export async function createProject(
   files: Record<string, string> = {},
-  templateName: TemplateName = "vite-node-template"
+  templateName: TemplateName = "vite-template"
 ) {
   let projectName = `remix-${Math.random().toString(32).slice(2)}`;
   let projectDir = path.join(TMP_DIR, projectName);

diff --git a/packages/remix-dev/compiler/js/plugins/hmr.ts b/packages/remix-dev/compiler/js/plugins/hmr.ts
@@ -108,6 +108,8 @@ declare global {
         return { loader: "ts", contents, resolveDir: config.appDirectory };
       });
 
+      // This is only needed within the Remix repo because the symlink to the
+      // `packages/remix-react` folder doesn't match the regex below
       let remixReactPath = require.resolve(
         "@remix-run/react/dist/esm/browser.js",
         { paths: [config.rootDirectory] }

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -4,7 +4,7 @@ packages:
   - "integration/helpers/cf-template"
   - "integration/helpers/deno-template"
   - "integration/helpers/vite-cloudflare-template"
-  - "integration/helpers/vite-node-template"
+  - "integration/helpers/vite-template"
   - "packages/create-remix"
   - "packages/remix"
   - "packages/remix-architect"