Skip to content

Commit

Permalink
Migrate to pnpm (#8848)
Browse files Browse the repository at this point in the history
  • Loading branch information
markdalgleish authored Mar 6, 2024
1 parent fd5fb6d commit 0be6718
Show file tree
Hide file tree
Showing 39 changed files with 366 additions and 274 deletions.
6 changes: 3 additions & 3 deletions integration/bug-report-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@ let appFixture: AppFixture;
// the project, run this:
//
// ```
// yarn && yarn build
// pnpm install && pnpm build
// ```
//
// Now try running this test:
//
// ```
// yarn bug-report-test
// pnpm bug-report-test
// ```
//
// You can add `--watch` to the end to have it re-run on file changes:
//
// ```
// yarn bug-report-test --watch
// pnpm bug-report-test --watch
// ```
////////////////////////////////////////////////////////////////////////////////

Expand Down
35 changes: 1 addition & 34 deletions integration/deterministic-build-output-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@ import fs from "node:fs";
import path from "node:path";

import type { FixtureInit } from "./helpers/create-fixture.js";
import {
createFixtureProject,
js,
css,
json,
} from "./helpers/create-fixture.js";
import { createFixtureProject, js, css } from "./helpers/create-fixture.js";

test("builds deterministically under different paths", async () => {
// This test validates various flavors of remix virtual modules to ensure
Expand All @@ -32,34 +27,6 @@ test("builds deterministically under different paths", async () => {
// * vanillaExtractPlugin (via app/routes/foo.tsx' .css.ts file import)
let init: FixtureInit = {
files: {
"package.json": json({
name: "remix-template-remix",
private: true,
sideEffects: false,
type: "module",
dependencies: {
"@remix-run/css-bundle": "0.0.0-local-version",
"@remix-run/node": "0.0.0-local-version",
"@remix-run/react": "0.0.0-local-version",
"@remix-run/serve": "0.0.0-local-version",
isbot: "0.0.0-local-version",
react: "0.0.0-local-version",
"react-dom": "0.0.0-local-version",
},
devDependencies: {
"@remix-run/dev": "0.0.0-local-version",
"@types/react": "0.0.0-local-version",
"@types/react-dom": "0.0.0-local-version",
typescript: "0.0.0-local-version",

"@vanilla-extract/css": "0.0.0-local-version",
"postcss-import": "0.0.0-local-version",
},
engines: {
node: ">=18.0.0",
},
}),

"postcss.config.js": js`
export default {
plugins: {
Expand Down
2 changes: 1 addition & 1 deletion integration/error-data-request-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ test.describe("ErrorBoundary", () => {
let fixture: Fixture;
let appFixture: AppFixture;
let _consoleError: any;
let errorLogs: any[];
let errorLogs: any[] = [];

test.beforeAll(async () => {
_consoleError = console.error;
Expand Down
35 changes: 18 additions & 17 deletions integration/helpers/cf-template/package.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
{
"name": "remix-template-cloudflare-workers",
"name": "integration-cf-template",
"version": "0.0.0",
"private": true,
"sideEffects": false,
"type": "module",
"scripts": {
"build": "node ../../../build/node_modules/@remix-run/dev/dist/cli.js build",
"dev": "node ../../../build/node_modules/@remix-run/dev/dist/cli.js dev --manual -c \"npm start\"",
"start": "node ../../../node_modules/wrangler/bin/wrangler.js dev ./build/index.js"
"build": "node ./node_modules/@remix-run/dev/dist/cli.js build",
"dev": "node ./node_modules/@remix-run/dev/dist/cli.js dev --manual -c \"npm start\"",
"start": "wrangler dev ./build/index.js"
},
"dependencies": {
"@cloudflare/kv-asset-handler": "0.0.0-local-version",
"@remix-run/cloudflare": "0.0.0-local-version",
"@remix-run/css-bundle": "0.0.0-local-version",
"@remix-run/react": "0.0.0-local-version",
"isbot": "0.0.0-local-version",
"react": "0.0.0-local-version",
"react-dom": "0.0.0-local-version"
"@cloudflare/kv-asset-handler": "^0.3.0",
"@remix-run/cloudflare": "workspace:*",
"@remix-run/css-bundle": "workspace:*",
"@remix-run/react": "workspace:*",
"isbot": "^4.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@cloudflare/workers-types": "0.0.0-local-version",
"@remix-run/dev": "0.0.0-local-version",
"@types/react": "0.0.0-local-version",
"@types/react-dom": "0.0.0-local-version",
"typescript": "0.0.0-local-version",
"wrangler": "0.0.0-local-version"
"@cloudflare/workers-types": "^4.20230518.0",
"@remix-run/dev": "workspace:*",
"@types/react": "^18.2.0",
"@types/react-dom": "^18.2.0",
"typescript": "^5.1.0",
"wrangler": "^3.24.0"
},
"engines": {
"node": ">=18.0.0"
Expand Down
9 changes: 2 additions & 7 deletions integration/helpers/create-fixture.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import { ServerMode } from "../../build/node_modules/@remix-run/server-runtime/d
import type { ServerBuild } from "../../build/node_modules/@remix-run/server-runtime/dist/index.js";
import { createRequestHandler } from "../../build/node_modules/@remix-run/server-runtime/dist/index.js";
import { createRequestHandler as createExpressHandler } from "../../build/node_modules/@remix-run/express/dist/index.js";
// @ts-ignore
import { installGlobals } from "../../build/node_modules/@remix-run/node/dist/index.js";

const TMP_DIR = path.join(process.cwd(), ".tmp", "integration");
const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
const root = path.join(__dirname, "../..");
const TMP_DIR = path.join(root, ".tmp", "integration");

export interface FixtureInit {
buildStdio?: Writable;
Expand Down Expand Up @@ -287,11 +287,6 @@ export async function createFixtureProject(

await fse.ensureDir(projectDir);
await fse.copy(integrationTemplateDir, projectDir);
await fse.copy(
path.join(__dirname, "../../build/node_modules"),
path.join(projectDir, "node_modules"),
{ overwrite: true }
);
// let remixDev = path.join(
// projectDir,
// "node_modules/@remix-run/dev/dist/cli.js"
Expand Down
29 changes: 14 additions & 15 deletions integration/helpers/deno-template/package.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
{
"name": "remix-template-deno",
"name": "integration-deno-template",
"version": "0.0.0",
"private": true,
"sideEffects": false,
"type": "module",
"scripts": {
"build": "node ../../../build/node_modules/@remix-run/dev/dist/cli.js build",
"dev": "node ../../../node_modules/npm-run-all/bin/npm-run-all/index.js build --parallel \"dev:*\"",
"dev:deno": "node ../../../node_modules/cross-env/src/bin/cross-env.js NODE_ENV=development deno run --unstable --watch --allow-net --allow-read --allow-env ./build/index.js",
"dev:remix": "node ../../../build/node_modules/@remix-run/dev/dist/cli.js watch",
"start": "node ../../../node_modules/cross-env/src/bin/cross-env.js NODE_ENV=production deno run --unstable --allow-net --allow-read --allow-env ./build/index.js"
"build": "node ./node_modules/@remix-run/dev/dist/cli.js build",
"dev": "pnpm run \"/^dev:.*/\"",
"dev:deno": "NODE_ENV=development deno run --unstable --watch --allow-net --allow-read --allow-env ./build/index.js",
"dev:remix": "node ./node_modules/@remix-run/dev/dist/cli.js watch",
"start": "NODE_ENV=production deno run --unstable --allow-net --allow-read --allow-env ./build/index.js"
},
"dependencies": {
"@remix-run/css-bundle": "0.0.0-local-version",
"@remix-run/deno": "0.0.0-local-version",
"@remix-run/react": "0.0.0-local-version",
"isbot": "0.0.0-local-version",
"react": "0.0.0-local-version",
"react-dom": "0.0.0-local-version"
"@remix-run/css-bundle": "workspace:*",
"@remix-run/deno": "workspace:*",
"@remix-run/react": "workspace:*",
"isbot": "^4.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@remix-run/dev": "0.0.0-local-version",
"cross-env": "0.0.0-local-version",
"npm-run-all": "0.0.0-local-version"
"@remix-run/dev": "workspace:*"
},
"engines": {
"node": ">=18.0.0"
Expand Down
39 changes: 24 additions & 15 deletions integration/helpers/node-template/package.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,36 @@
{
"name": "remix-template-remix",
"name": "integration-node-template",
"version": "0.0.0",
"private": true,
"sideEffects": false,
"type": "module",
"scripts": {
"build": "node ../../../build/node_modules/@remix-run/dev/dist/cli.js build",
"dev": "node ../../../build/node_modules/@remix-run/dev/dist/cli.js dev",
"start": "node ../../../build/node_modules/@remix-run/serve/dist/cli.js ./build/index.js"
"build": "node ./node_modules/@remix-run/dev/dist/cli.js build",
"dev": "node ./node_modules/@remix-run/dev/dist/cli.js dev",
"start": "node ./node_modules/@remix-run/serve/dist/cli.js ./build/index.js"
},
"dependencies": {
"@remix-run/css-bundle": "0.0.0-local-version",
"@remix-run/node": "0.0.0-local-version",
"@remix-run/react": "0.0.0-local-version",
"@remix-run/serve": "0.0.0-local-version",
"isbot": "0.0.0-local-version",
"react": "0.0.0-local-version",
"react-dom": "0.0.0-local-version"
"@remix-run/css-bundle": "workspace:*",
"@remix-run/express": "workspace:*",
"@remix-run/node": "workspace:*",
"@remix-run/react": "workspace:*",
"@remix-run/serve": "workspace:*",
"@remix-run/server-runtime": "workspace:*",
"express": "^4.17.1",
"isbot": "^4.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@remix-run/dev": "0.0.0-local-version",
"@types/react": "0.0.0-local-version",
"@types/react-dom": "0.0.0-local-version",
"typescript": "0.0.0-local-version"
"@remix-run/dev": "workspace:*",
"@vanilla-extract/css": "^1.10.0",
"@vanilla-extract/vite-plugin": "^3.9.2",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"getos": "^3.2.1",
"postcss-import": "^15.1.0",
"tailwindcss": "^3.3.0",
"typescript": "^5.1.0"
},
"engines": {
"node": ">=18.0.0"
Expand Down
5 changes: 5 additions & 0 deletions integration/helpers/vite-cloudflare-template/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
node_modules

/.cache
/build
.env
25 changes: 25 additions & 0 deletions integration/helpers/vite-cloudflare-template/app/root.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import {
Links,
Meta,
Outlet,
Scripts,
ScrollRestoration,
} from "@remix-run/react";

export default function App() {
return (
<html lang="en">
<head>
<meta charSet="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<Meta />
<Links />
</head>
<body>
<Outlet />
<ScrollRestoration />
<Scripts />
</body>
</html>
);
}
41 changes: 41 additions & 0 deletions integration/helpers/vite-cloudflare-template/app/routes/_index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import type { MetaFunction } from "@remix-run/cloudflare";

export const meta: MetaFunction = () => {
return [
{ title: "New Remix App" },
{ name: "description", content: "Welcome to Remix!" },
];
};

export default function Index() {
return (
<div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.8" }}>
<h1>Welcome to Remix</h1>
<ul>
<li>
<a
target="_blank"
href="https://remix.run/tutorials/blog"
rel="noreferrer"
>
15m Quickstart Blog Tutorial
</a>
</li>
<li>
<a
target="_blank"
href="https://remix.run/tutorials/jokes"
rel="noreferrer"
>
Deep Dive Jokes App Tutorial
</a>
</li>
<li>
<a target="_blank" href="https://remix.run/docs" rel="noreferrer">
Remix Docs
</a>
</li>
</ul>
</div>
);
}
2 changes: 2 additions & 0 deletions integration/helpers/vite-cloudflare-template/env.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/// <reference types="@remix-run/cloudflare" />
/// <reference types="vite/client" />
36 changes: 36 additions & 0 deletions integration/helpers/vite-cloudflare-template/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"name": "integration-vite-cloudflare-template",
"version": "0.0.0",
"private": true,
"sideEffects": false,
"type": "module",
"scripts": {
"dev": "node ./node_modules/@remix-run/dev/dist/cli.js vite:dev",
"build": "node ./node_modules/@remix-run/dev/dist/cli.js vite:build",
"start": "wrangler pages dev ./build/client",
"typecheck": "tsc"
},
"dependencies": {
"@remix-run/cloudflare": "*",
"@remix-run/cloudflare-pages": "*",
"@remix-run/react": "*",
"isbot": "^4.1.0",
"miniflare": "^3.20231030.4",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@cloudflare/workers-types": "^4.20230518.0",
"@remix-run/dev": "workspace:*",
"@remix-run/eslint-config": "workspace:*",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"typescript": "^5.1.6",
"vite": "5.1.3",
"vite-tsconfig-paths": "^4.2.1",
"wrangler": "^3.24.0"
},
"engines": {
"node": ">=18.0.0"
}
}
Binary file not shown.
21 changes: 21 additions & 0 deletions integration/helpers/vite-cloudflare-template/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"include": ["env.d.ts", "**/*.ts", "**/*.tsx"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2022"],
"isolatedModules": true,
"esModuleInterop": true,
"jsx": "react-jsx",
"module": "ESNext",
"moduleResolution": "Bundler",
"resolveJsonModule": true,
"target": "ES2022",
"strict": true,
"allowJs": true,
"forceConsistentCasingInFileNames": true,
"baseUrl": ".",
"paths": {
"~/*": ["./app/*"]
},
"noEmit": true
}
}
7 changes: 7 additions & 0 deletions integration/helpers/vite-cloudflare-template/vite.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { vitePlugin as remix } from "@remix-run/dev";
import { defineConfig } from "vite";
import tsconfigPaths from "vite-tsconfig-paths";

export default defineConfig({
plugins: [remix(), tsconfigPaths()],
});
Loading

0 comments on commit 0be6718

Please sign in to comment.