Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(serve): manual mode integration #7231

Merged
merged 11 commits into from
Aug 25, 2023
Merged

feat(serve): manual mode integration #7231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ffd04c6
feat(serve): import cache busting out-of-the-box
pcattori Aug 22, 2023
79ef221
feat(templates/{remix,remix-javascript}): manual mode by default
pcattori Aug 22, 2023
4a13936
chore: changeset
pcattori Aug 22, 2023
aeeebc4
test(serve): esm compat + new console message
pcattori Aug 23, 2023
2e8e229
test(hmr): refactor to prep for additional app servers
pcattori Aug 24, 2023
0fef833
test(hmr): refactor hmr-log-test as a test case in hmr-test
pcattori Aug 24, 2023
712c497
chore: link clis into node_modules/.bin for integration tests
pcattori Aug 24, 2023
9cbe63f
test(hmr): add test case for remix-serve
pcattori Aug 24, 2023
07d8635
test(hmr): ensure app server and esbuild are killed when test is done
pcattori Aug 24, 2023
c3ed2de
fix(serve): dynamic import on windows requires file url
pcattori Aug 24, 2023
2990c95
test(hmr): fix windows cli access
pcattori Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/dirty-bags-wink.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@remix-run/serve": major
---

integrate manual mode in remix-serve
22 changes: 21 additions & 1 deletion integration/helpers/create-fixture.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export async function createAppFixture(fixture: Fixture, mode?: ServerMode) {
let newChunk = chunk.toString();
stdout += newChunk;
let match: RegExpMatchArray | null = stdout.match(
/started at http:\/\/localhost:(\d+)\s/
/\[remix-serve\] http:\/\/localhost:(\d+)\s/
);
if (match) {
clearTimeout(rejectTimeout);
Expand Down Expand Up @@ -223,6 +223,26 @@ export async function createFixtureProject(
path.join(projectDir, "node_modules"),
{ overwrite: true }
);
// let remixDev = path.join(
// projectDir,
// "node_modules/@remix-run/dev/dist/cli.js"
// );
// await fse.chmod(remixDev, 0o755);
// await fse.ensureSymlink(
// remixDev,
// path.join(projectDir, "node_modules/.bin/remix")
// );
//
// let remixServe = path.join(
// projectDir,
// "node_modules/@remix-run/serve/dist/cli.js"
// );
// await fse.chmod(remixServe, 0o755);
// await fse.ensureSymlink(
// remixServe,
// path.join(projectDir, "node_modules/.bin/remix-serve")
// );

await writeTestFiles(init, projectDir);

// We update the config file *after* writing test files so that tests can provide a custom
Expand Down
2 changes: 1 addition & 1 deletion integration/helpers/node-template/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"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"
"start": "node ../../../build/node_modules/@remix-run/serve/dist/cli.js ./build/index.js"
},
"dependencies": {
"@remix-run/node": "0.0.0-local-version",
Expand Down
Loading