Skip to content

Commit 61bd74f

Browse files
MichaelDeBoeyMichaelDeBoey
committed
chore: update Jest
1 parent 49e8da1 commit 61bd74f

File tree

26 files changed

+1036
-978
lines changed

26 files changed

+1036
-978
lines changed

‎jest.config.js‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/** @type {import('@jest/types').Config.InitialOptions} */
1+
/** @type {import('jest').Config} */
22
module.exports = {
33
modulePathIgnorePatterns: [
44
"<rootDir>/.tmp",
@@ -23,10 +23,6 @@ module.exports = {
2323
"packages/remix-server-runtime",
2424
"packages/remix-testing",
2525
],
26-
watchPlugins: [
27-
require.resolve("jest-watch-select-projects"),
28-
require.resolve("jest-watch-typeahead/filename"),
29-
require.resolve("jest-watch-typeahead/testname"),
30-
],
31-
reporters: ["default"],
26+
watchPlugins: ["select-projects", "typeahead/filename", "typeahead/testname"],
27+
reporters: [["github-actions", { silent: false }], "summary"],
3228
};

‎jest/jest.config.shared.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ const ignorePatterns = [
55
"\\/\\.tmp\\/",
66
"\\/\\.cache\\/",
77
];
8-
/** @type {import('@jest/types').Config.InitialOptions} */
8+
9+
/** @type {import('jest').Config} */
910
module.exports = {
1011
testEnvironment: "node",
1112
modulePathIgnorePatterns: ignorePatterns,
@@ -15,9 +16,8 @@ module.exports = {
1516
transform: {
1617
"\\.[jt]sx?$": require.resolve("./transform"),
1718
},
18-
watchPlugins: [
19-
require.resolve("jest-watch-select-projects"),
20-
require.resolve("jest-watch-typeahead/filename"),
21-
require.resolve("jest-watch-typeahead/testname"),
19+
transformIgnorePatterns: [
20+
"node_modules/(?!(@remix-run/web-(blob|fetch|file|form-data|stream)|@web3-storage/multipart-parser)/)",
2221
],
22+
watchPlugins: ["select-projects", "typeahead/filename", "typeahead/testname"],
2323
};

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"@types/cross-spawn": "^6.0.2",
7575
"@types/dedent": "^0.7.0",
7676
"@types/glob": "7.2.0",
77-
"@types/jest": "^27.4.1",
77+
"@types/jest": "^29.5.4",
7878
"@types/jsonfile": "^6.1.0",
7979
"@types/lodash": "^4.14.182",
8080
"@types/react": "^18.2.20",
@@ -85,7 +85,7 @@
8585
"@types/serialize-javascript": "^5.0.2",
8686
"@types/ssri": "^7.1.0",
8787
"@vanilla-extract/css": "^1.10.0",
88-
"babel-jest": "^27.5.1",
88+
"babel-jest": "^29.6.3",
8989
"babel-plugin-transform-remove-console": "^6.9.4",
9090
"chalk": "^4.1.2",
9191
"cheerio": "^1.0.0-rc.12",
@@ -101,9 +101,9 @@
101101
"front-matter": "^4.0.2",
102102
"glob": "8.0.3",
103103
"isbot": "^3.5.1",
104-
"jest": "^27.5.1",
104+
"jest": "^29.6.3",
105105
"jest-watch-select-projects": "^2.0.0",
106-
"jest-watch-typeahead": "^0.6.5",
106+
"jest-watch-typeahead": "^2.2.2",
107107
"jsonfile": "^6.0.1",
108108
"lodash": "^4.17.21",
109109
"mime": "^3.0.0",

‎packages/create-remix/__tests__/create-remix-test.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ describe("create-remix CLI", () => {
242242
});
243243

244244
expect(stderr.trim()).toMatchInlineSnapshot(
245-
`"▲ Oh no! The path \\"this/path/does/not/exist\\" was not found in this GitHub repo."`
245+
`"▲ Oh no! The path "this/path/does/not/exist" was not found in this GitHub repo."`
246246
);
247247
expect(status).toBe(1);
248248
expect(fse.existsSync(path.join(projectDir, "package.json"))).toBeFalsy();
@@ -381,7 +381,7 @@ describe("create-remix CLI", () => {
381381
});
382382

383383
expect(stderr.trim()).toMatchInlineSnapshot(
384-
`"▲ Oh no! The path \\"this/path/does/not/exist\\" was not found in this GitHub repo."`
384+
`"▲ Oh no! The path "this/path/does/not/exist" was not found in this GitHub repo."`
385385
);
386386
expect(status).toBe(1);
387387
expect(fse.existsSync(path.join(projectDir, "package.json"))).toBeFalsy();
@@ -1086,12 +1086,12 @@ describe("create-remix CLI", () => {
10861086
});
10871087

10881088
expect(stderr.trim()).toMatchInlineSnapshot(`
1089-
"▲ Oh no! Destination directory contains files that would be overwritten
1090-
and no \`--overwrite\` flag was included in a non-interactive
1091-
environment. The following files would be overwritten:
1092-
package.json
1093-
tsconfig.json"
1094-
`);
1089+
"▲ Oh no! Destination directory contains files that would be overwritten
1090+
and no \`--overwrite\` flag was included in a non-interactive
1091+
environment. The following files would be overwritten:
1092+
package.json
1093+
tsconfig.json"
1094+
`);
10951095
expect(status).toBe(1);
10961096
expect(
10971097
fse.existsSync(path.join(projectDir, "app/root.tsx"))

‎packages/create-remix/jest.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/** @type {import('@jest/types').Config.InitialOptions} */
1+
/** @type {import('jest').Config} */
22
module.exports = {
33
...require("../../jest/jest.config.shared"),
44
displayName: "create-remix",

‎packages/remix-architect/__tests__/server-test.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,7 @@ describe("architect createRemixHeaders", () => {
201201
describe("creates fetch headers from architect headers", () => {
202202
it("handles empty headers", () => {
203203
let headers = createRemixHeaders({});
204-
expect(Object.fromEntries(headers.entries())).toMatchInlineSnapshot(
205-
`Object {}`
206-
);
204+
expect(Object.fromEntries(headers.entries())).toMatchInlineSnapshot(`{}`);
207205
});
208206

209207
it("handles simple headers", () => {

‎packages/remix-architect/jest.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/** @type {import('@jest/types').Config.InitialOptions} */
1+
/** @type {import('jest').Config} */
22
module.exports = {
33
...require("../../jest/jest.config.shared"),
44
displayName: "architect",

‎packages/remix-dev/__tests__/cli-test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ describe("remix CLI", () => {
128128
Run your project locally in development:
129129
130130
$ remix dev
131-
$ remix dev -c \\"node ./server.js\\"
131+
$ remix dev -c "node ./server.js"
132132
133133
Start your server separately and watch for changes:
134134

‎packages/remix-dev/__tests__/cssSideEffectImports-test.ts‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ describe("addSuffixToCssSideEffectImports", () => {
1010
`;
1111

1212
expect(addSuffixToCssSideEffectImports("js", code)).toMatchInlineSnapshot(
13-
`"require(\\"./foo.css?__remix_sideEffect__\\");"`
13+
`"require("./foo.css?__remix_sideEffect__");"`
1414
);
1515
});
1616

@@ -20,7 +20,7 @@ describe("addSuffixToCssSideEffectImports", () => {
2020
`;
2121

2222
expect(addSuffixToCssSideEffectImports("js", code)).toMatchInlineSnapshot(
23-
`"import \\"./foo.css?__remix_sideEffect__\\";"`
23+
`"import "./foo.css?__remix_sideEffect__";"`
2424
);
2525
});
2626

@@ -33,7 +33,7 @@ describe("addSuffixToCssSideEffectImports", () => {
3333

3434
expect(addSuffixToCssSideEffectImports("jsx", code))
3535
.toMatchInlineSnapshot(`
36-
"import \\"./foo.css?__remix_sideEffect__\\";
36+
"import "./foo.css?__remix_sideEffect__";
3737
3838
export const Foo = () => <div />;"
3939
`);
@@ -48,7 +48,7 @@ describe("addSuffixToCssSideEffectImports", () => {
4848

4949
expect(addSuffixToCssSideEffectImports("ts", code))
5050
.toMatchInlineSnapshot(`
51-
"require(\\"./foo.css?__remix_sideEffect__\\");
51+
"require("./foo.css?__remix_sideEffect__");
5252
5353
export const foo: string = ('foo' satisfies string);"
5454
`);
@@ -64,7 +64,7 @@ describe("addSuffixToCssSideEffectImports", () => {
6464

6565
expect(addSuffixToCssSideEffectImports("tsx", code))
6666
.toMatchInlineSnapshot(`
67-
"require(\\"./foo.css?__remix_sideEffect__\\");
67+
"require("./foo.css?__remix_sideEffect__");
6868
6969
export const foo: string = ('foo' satisfies string);
7070
export const Bar = () => <div>{foo}</div>;"
@@ -82,10 +82,10 @@ describe("addSuffixToCssSideEffectImports", () => {
8282

8383
expect(addSuffixToCssSideEffectImports("js", code))
8484
.toMatchInlineSnapshot(`
85-
"if (process.env.NODE_ENV === \\"production\\") {
86-
require(\\"./foo.min.css?__remix_sideEffect__\\");
85+
"if (process.env.NODE_ENV === "production") {
86+
require("./foo.min.css?__remix_sideEffect__");
8787
} else {
88-
require(\\"./foo.css?__remix_sideEffect__\\");
88+
require("./foo.css?__remix_sideEffect__");
8989
}"
9090
`);
9191
});
@@ -96,7 +96,7 @@ describe("addSuffixToCssSideEffectImports", () => {
9696
`;
9797

9898
expect(addSuffixToCssSideEffectImports("js", code)).toMatchInlineSnapshot(
99-
`"process.env.NODE_ENV === \\"production\\" ? require(\\"./foo.min.css?__remix_sideEffect__\\") : require(\\"./foo.css?__remix_sideEffect__\\");"`
99+
`"process.env.NODE_ENV === "production" ? require("./foo.min.css?__remix_sideEffect__") : require("./foo.css?__remix_sideEffect__");"`
100100
);
101101
});
102102

@@ -106,7 +106,7 @@ describe("addSuffixToCssSideEffectImports", () => {
106106
`;
107107

108108
expect(addSuffixToCssSideEffectImports("js", code)).toMatchInlineSnapshot(
109-
`"process.env.NODE_ENV === \\"development\\" && require(\\"./debug.css?__remix_sideEffect__\\");"`
109+
`"process.env.NODE_ENV === "development" && require("./debug.css?__remix_sideEffect__");"`
110110
);
111111
});
112112

@@ -116,7 +116,7 @@ describe("addSuffixToCssSideEffectImports", () => {
116116
`;
117117

118118
expect(addSuffixToCssSideEffectImports("js", code)).toMatchInlineSnapshot(
119-
`"process.env.NODE_ENV === \\"production\\" || require(\\"./debug.css?__remix_sideEffect__\\");"`
119+
`"process.env.NODE_ENV === "production" || require("./debug.css?__remix_sideEffect__");"`
120120
);
121121
});
122122
});
@@ -128,7 +128,7 @@ describe("addSuffixToCssSideEffectImports", () => {
128128
`;
129129

130130
expect(addSuffixToCssSideEffectImports("js", code)).toMatchInlineSnapshot(
131-
`"const href = require(\\"./foo.css\\");"`
131+
`"const href = require("./foo.css");"`
132132
);
133133
});
134134

@@ -138,7 +138,7 @@ describe("addSuffixToCssSideEffectImports", () => {
138138
`;
139139

140140
expect(addSuffixToCssSideEffectImports("js", code)).toMatchInlineSnapshot(
141-
`"import href from \\"./foo.css\\";"`
141+
`"import href from "./foo.css";"`
142142
);
143143
});
144144

@@ -148,7 +148,7 @@ describe("addSuffixToCssSideEffectImports", () => {
148148
`;
149149

150150
expect(addSuffixToCssSideEffectImports("js", code)).toMatchInlineSnapshot(
151-
`"import { foo } from \\"./foo.css\\";"`
151+
`"import { foo } from "./foo.css";"`
152152
);
153153
});
154154

@@ -158,7 +158,7 @@ describe("addSuffixToCssSideEffectImports", () => {
158158
`;
159159

160160
expect(addSuffixToCssSideEffectImports("js", code)).toMatchInlineSnapshot(
161-
`"import * as foo from \\"./foo.css\\";"`
161+
`"import * as foo from "./foo.css";"`
162162
);
163163
});
164164

@@ -171,9 +171,9 @@ describe("addSuffixToCssSideEffectImports", () => {
171171

172172
expect(addSuffixToCssSideEffectImports("js", code))
173173
.toMatchInlineSnapshot(`
174-
"const href = process.env.NODE_ENV === \\"production\\" ?
175-
require(\\"./foo.min.css\\") :
176-
require(\\"./foo.css\\");"
174+
"const href = process.env.NODE_ENV === "production" ?
175+
require("./foo.min.css") :
176+
require("./foo.css");"
177177
`);
178178
});
179179

@@ -183,7 +183,7 @@ describe("addSuffixToCssSideEffectImports", () => {
183183
`;
184184

185185
expect(addSuffixToCssSideEffectImports("js", code)).toMatchInlineSnapshot(
186-
`"const href = process.env.NODE_ENV === \\"production\\" && require(\\"./foo.min.css\\") || require(\\"./foo.css\\");"`
186+
`"const href = process.env.NODE_ENV === "production" && require("./foo.min.css") || require("./foo.css");"`
187187
);
188188
});
189189

@@ -193,7 +193,7 @@ describe("addSuffixToCssSideEffectImports", () => {
193193
`;
194194

195195
expect(addSuffixToCssSideEffectImports("js", code)).toMatchInlineSnapshot(
196-
`"require(\\"./foo\\");"`
196+
`"require("./foo");"`
197197
);
198198
});
199199

@@ -203,7 +203,7 @@ describe("addSuffixToCssSideEffectImports", () => {
203203
`;
204204

205205
expect(addSuffixToCssSideEffectImports("js", code)).toMatchInlineSnapshot(
206-
`"import \\"./foo\\";"`
206+
`"import "./foo";"`
207207
);
208208
});
209209

@@ -217,7 +217,7 @@ describe("addSuffixToCssSideEffectImports", () => {
217217
expect(addSuffixToCssSideEffectImports("js", code))
218218
.toMatchInlineSnapshot(`
219219
"export const foo = async () => {
220-
await import(\\"./foo.css\\");
220+
await import("./foo.css");
221221
};"
222222
`);
223223
});
@@ -288,7 +288,7 @@ describe("addSuffixToCssSideEffectImports", () => {
288288

289289
expect(addSuffixToCssSideEffectImports("js", code))
290290
.toMatchInlineSnapshot(`
291-
"require(\\"./foo.css?__remix_sideEffect__\\");
291+
"require("./foo.css?__remix_sideEffect__");
292292
293293
// JS
294294
const topLevelAwait = await Promise.resolve('top level await');
@@ -330,7 +330,7 @@ describe("addSuffixToCssSideEffectImports", () => {
330330

331331
expect(addSuffixToCssSideEffectImports("jsx", code))
332332
.toMatchInlineSnapshot(`
333-
"require(\\"./foo.css?__remix_sideEffect__\\");
333+
"require("./foo.css?__remix_sideEffect__");
334334
335335
// JSX
336336
const ExampleComponent = () => <div>JSX element</div>;
@@ -375,7 +375,7 @@ describe("addSuffixToCssSideEffectImports", () => {
375375

376376
expect(addSuffixToCssSideEffectImports("tsx", code))
377377
.toMatchInlineSnapshot(`
378-
"require(\\"./foo.css?__remix_sideEffect__\\");
378+
"require("./foo.css?__remix_sideEffect__");
379379
380380
// TS
381381
const exampleSatisfies = ('satisfies' satisfies string);
@@ -425,7 +425,7 @@ describe("addSuffixToCssSideEffectImports", () => {
425425

426426
expect(addSuffixToCssSideEffectImports("tsx", code))
427427
.toMatchInlineSnapshot(`
428-
"require(\\"./foo.css?__remix_sideEffect__\\");
428+
"require("./foo.css?__remix_sideEffect__");
429429
430430
// TS
431431
const exampleSatisfies = ('satisfies' satisfies string);

0 commit comments

Comments
 (0)