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

fix(remix-dev): convert config.appDirectory to relative unix path #4709

Merged
merged 6 commits into from
Nov 29, 2022
Merged

fix(remix-dev): convert config.appDirectory to relative unix path #4709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ac852c1
fix(remix-dev): convert appDirectory to unix style for fast-glob
mcansh Nov 29, 2022
e5b3df2
chore: relative path
mcansh Nov 29, 2022
741e4d3
chore: add test
mcansh Nov 29, 2022
e3f4c5c
fix test
mcansh Nov 29, 2022
d169abd
fix: typo
mcansh Nov 29, 2022
91ea8a8
chore: update test
mcansh Nov 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 26 additions & 8 deletions packages/remix-dev/__tests__/migrations/convert-to-javascript-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { tmpdir } from "os";
import { join } from "path";
import path from "path";
import glob from "fast-glob";
import {
copySync,
ensureDirSync,
readJSONSync,
realpathSync,
removeSync,
readFile,
} from "fs-extra";
import shell from "shelljs";
import stripAnsi from "strip-ansi";
Expand Down Expand Up @@ -37,8 +38,8 @@ const mockLog = (message: unknown = "", ...rest: unknown[]) => {
output += "\n" + stripAnsi(messageString);
};

const FIXTURE = join(__dirname, "fixtures", "indie-stack");
const TEMP_DIR = join(
const FIXTURE = path.join(__dirname, "fixtures", "indie-stack");
const TEMP_DIR = path.join(
realpathSync(tmpdir()),
`remix-tests-${Math.random().toString(32).slice(2)}`
);
Expand Down Expand Up @@ -66,29 +67,39 @@ const checkMigrationRanSuccessfully = async (projectDir: string) => {
let config = await readConfig(projectDir);

let jsConfigJson: TsConfigJson = readJSONSync(
join(projectDir, "jsconfig.json")
path.join(projectDir, "jsconfig.json")
);
expect(jsConfigJson.include).not.toContain("remix.env.d.ts");
expect(jsConfigJson.include).not.toContain("**/*.ts");
expect(jsConfigJson.include).toContain("**/*.js");
expect(jsConfigJson.include).not.toContain("**/*.tsx");
expect(jsConfigJson.include).toContain("**/*.jsx");

let packageJson: PackageJson = readJSONSync(join(projectDir, "package.json"));
let packageJson: PackageJson = readJSONSync(
path.join(projectDir, "package.json")
);
expect(packageJson.devDependencies).not.toContain("@types/react");
expect(packageJson.devDependencies).not.toContain("@types/react-dom");
expect(packageJson.devDependencies).not.toContain("typescript");
expect(packageJson.scripts).not.toContain("typecheck");

let relativeAppDirectory = path.relative(
config.rootDirectory,
config.appDirectory
);
let unixAppDirectory = path.posix.join(
...relativeAppDirectory.split(path.delimiter)
);

let TSFiles = glob.sync("**/*.@(ts|tsx)", {
cwd: config.rootDirectory,
ignore: [`./${config.appDirectory}/**/*`],
ignore: [`./${unixAppDirectory}/**/*`],
});
expect(TSFiles).toHaveLength(0);
let JSFiles = glob.sync("**/*.@(js|jsx)", {
absolute: true,
cwd: config.rootDirectory,
ignore: [`./${config.appDirectory}/**/*`],
ignore: [`./${unixAppDirectory}/**/*`],
});
let importResult = shell.grep("-l", 'from "', JSFiles);
expect(importResult.stdout.trim()).toBe("");
Expand All @@ -98,10 +109,17 @@ const checkMigrationRanSuccessfully = async (projectDir: string) => {
expect(exportDefaultResult.stdout.trim()).toBe("");
expect(exportDefaultResult.stderr).toBeNull();
expect(exportDefaultResult.code).toBe(0);

let rootRouteContent = await readFile(
path.join(projectDir, "app", "root.jsx"),
"utf-8"
);

expect(rootRouteContent).not.toContain('require("@remix-run/react")');
};

const makeApp = () => {
let projectDir = join(TEMP_DIR, "convert-to-javascript");
let projectDir = path.join(TEMP_DIR, "convert-to-javascript");
copySync(FIXTURE, projectDir);
return projectDir;
};
Expand Down
17 changes: 13 additions & 4 deletions packages/remix-dev/cli/migrate/migrations/convert-to-javascript/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { join } from "path";
import path from "path";
import glob from "fast-glob";

import { readConfig } from "../../../../config";
Expand All @@ -9,7 +9,7 @@ import { convertTSConfigs } from "./convertTSConfigs";
import { convertTSFilesToJS } from "./convertTSFilesToJS";
import { CliError } from "../../../error";

const TRANSFORM_PATH = join(__dirname, "transform");
const TRANSFORM_PATH = path.join(__dirname, "transform");

export const convertToJavaScript: MigrationFunction = async (
projectDir,
Expand All @@ -23,11 +23,20 @@ export const convertToJavaScript: MigrationFunction = async (
// 2. Remove @types/* & TypeScript dependencies + `typecheck` script from `package.json`
await cleanupPackageJson(config.rootDirectory);

// 3. Run codemod
// 3. convert appDirectory to relative and force unix style path
let relativeAppDirectory = path.relative(
config.rootDirectory,
config.appDirectory
);
let unixAppDirectory = path.posix.join(
...relativeAppDirectory.split(path.delimiter)
);

// 4. Run codemod
let files = glob.sync("**/*.+(ts|tsx)", {
absolute: true,
cwd: config.rootDirectory,
ignore: [`./${config.appDirectory}/**/*`, "**/node_modules/**"],
ignore: [`${unixAppDirectory}/**/*`, "**/node_modules/**"],
});
let codemodOk = await jscodeshift.run({
files,
Expand Down