Skip to content

Commit 3c08b34

Browse files
LekoArtsLekoArts
committed
then don't use TS for configs... :tableflip:
1 parent 3fb82e4 commit 3c08b34

File tree

12 files changed

+33
-33
lines changed

12 files changed

+33
-33
lines changed

Diff for: ‎.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ aliases:
2323

2424
e2e-executor: &e2e-executor
2525
docker:
26-
- image: cypress/browsers:node18.6.0-chrome105-ff104
26+
- image: cypress/browsers:node18.12.0-chrome106-ff106
2727
environment:
2828
<<: *e2e-executor-env
2929

Diff for: ‎e2e-tests/mdx/cypress/configs/build.js

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
const { defineConfig } = require(`cypress`)
2+
3+
module.exports = defineConfig({
4+
e2e: {
5+
baseUrl: `http://localhost:9000`,
6+
specPattern: `cypress/integration/*.{js,ts}`,
7+
},
8+
env: {
9+
"GATSBY_COMMAND": `build`
10+
}
11+
})

Diff for: ‎e2e-tests/mdx/cypress/configs/build.ts

-11
This file was deleted.

Diff for: ‎e2e-tests/mdx/cypress/configs/develop.ts renamed to ‎e2e-tests/mdx/cypress/configs/develop.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { defineConfig } from "cypress"
1+
const { defineConfig } = require(`cypress`)
22

3-
export default defineConfig({
3+
module.exports = defineConfig({
44
e2e: {
55
baseUrl: `http://localhost:8000`,
66
specPattern: `cypress/integration/*.{js,ts}`

Diff for: ‎e2e-tests/mdx/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
"start-server-and-test:develop": "start-server-and-test develop http://localhost:8000 cy:run:develop",
3636
"start-server-and-test:build": "start-server-and-test serve http://localhost:9000 cy:run:build",
3737
"serve": "gatsby serve",
38-
"cy:open:develop": "cypress open --browser chrome --e2e --config-file cypress/configs/develop.ts",
39-
"cy:open:build": "cypress open --browser chrome --e2e --config-file cypress/configs/build.ts",
40-
"cy:run:build": "CYPRESS_GROUP_NAME=production node ../../scripts/cypress-run-with-conditional-record-flag.js --browser chrome --e2e --config-file cypress/configs/build.ts",
41-
"cy:run:develop": "CYPRESS_GROUP_NAME=development node ../../scripts/cypress-run-with-conditional-record-flag.js --browser chrome --e2e --config-file cypress/configs/develop.ts",
38+
"cy:open:develop": "cypress open --browser chrome --e2e --config-file cypress/configs/develop.js",
39+
"cy:open:build": "cypress open --browser chrome --e2e --config-file cypress/configs/build.js",
40+
"cy:run:build": "CYPRESS_GROUP_NAME=production node ../../scripts/cypress-run-with-conditional-record-flag.js --browser chrome --e2e --config-file cypress/configs/build.js",
41+
"cy:run:develop": "CYPRESS_GROUP_NAME=development node ../../scripts/cypress-run-with-conditional-record-flag.js --browser chrome --e2e --config-file cypress/configs/develop.js",
4242
"reset": "node scripts/reset.js",
4343
"update": "node scripts/update.js"
4444
},

Diff for: ‎e2e-tests/path-prefix/cypress.config.ts renamed to ‎e2e-tests/path-prefix/cypress.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { defineConfig } from "cypress"
1+
const { defineConfig } = require('cypress')
22

3-
export default defineConfig({
3+
module.exports = defineConfig({
44
e2e: {
55
baseUrl: `http://localhost:9000/blog`,
66
specPattern: `cypress/integration/*.{js,ts}`

Diff for: ‎e2e-tests/trailing-slash/cypress.config.ts renamed to ‎e2e-tests/trailing-slash/cypress.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { defineConfig } from "cypress"
1+
const { defineConfig } = require('cypress')
22

3-
export default defineConfig({
3+
module.exports = defineConfig({
44
e2e: {
55
specPattern: `cypress/integration/*.{js,ts}`
66
},

Diff for: ‎e2e-tests/trailing-slash/cypress/configs/always.ts renamed to ‎e2e-tests/trailing-slash/cypress/configs/always.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { defineConfig } from "cypress"
1+
const { defineConfig } = require('cypress')
22

3-
export default defineConfig({
3+
module.exports = defineConfig({
44
e2e: {
55
specPattern: [`cypress/integration/always.js`, `cypress/integration/functions.js`, `cypress/integration/static.js`]
66
},

Diff for: ‎e2e-tests/trailing-slash/cypress/configs/ignore.ts renamed to ‎e2e-tests/trailing-slash/cypress/configs/ignore.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { defineConfig } from "cypress"
1+
const { defineConfig } = require('cypress')
22

3-
export default defineConfig({
3+
module.exports = defineConfig({
44
e2e: {
55
specPattern: [`cypress/integration/ignore.js`, `cypress/integration/functions.js`, `cypress/integration/static.js`]
66
},

Diff for: ‎e2e-tests/trailing-slash/cypress/configs/never.ts renamed to ‎e2e-tests/trailing-slash/cypress/configs/never.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { defineConfig } from "cypress"
1+
const { defineConfig } = require('cypress')
22

3-
export default defineConfig({
3+
module.exports = defineConfig({
44
e2e: {
55
specPattern: [`cypress/integration/never.js`, `cypress/integration/functions.js`, `cypress/integration/static.js`]
66
},

Diff for: ‎e2e-tests/trailing-slash/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"cy:open:build": "cypress open --browser chrome --e2e --config baseUrl=http://localhost:9000 --env IS_BUILD=y",
2121
"debug:develop": "start-server-and-test develop http://localhost:8000 cy:open:develop",
2222
"debug:build": "start-server-and-test serve http://localhost:9000 cy:open:build",
23-
"cy:develop:option": "cross-env-shell node ../../scripts/cypress-run-with-conditional-record-flag.js --browser chrome --e2e --config-file \"cypress/configs/$OPTION.ts\" --config baseUrl=http://localhost:8000",
24-
"cy:build:option": "cross-env-shell node ../../scripts/cypress-run-with-conditional-record-flag.js --browser chrome --e2e --config-file \"cypress/configs/$OPTION.ts\" --config baseUrl=http://localhost:9000 --env IS_BUILD=y",
23+
"cy:develop:option": "cross-env-shell node ../../scripts/cypress-run-with-conditional-record-flag.js --browser chrome --e2e --config-file \"cypress/configs/$OPTION.js\" --config baseUrl=http://localhost:8000",
24+
"cy:build:option": "cross-env-shell node ../../scripts/cypress-run-with-conditional-record-flag.js --browser chrome --e2e --config-file \"cypress/configs/$OPTION.js\" --config baseUrl=http://localhost:9000 --env IS_BUILD=y",
2525
"develop:option": "cross-env-shell CYPRESS_SUPPORT=y TRAILING_SLASH=$OPTION gatsby develop",
2626
"build:option": "cross-env-shell CYPRESS_SUPPORT=y TRAILING_SLASH=$OPTION gatsby build",
2727
"t:opt:develop": "cross-env-shell OPTION=$OPTION start-server-and-test develop:option http://localhost:8000 cy:develop:option",

Diff for: ‎e2e-tests/visual-regression/cypress.config.ts renamed to ‎e2e-tests/visual-regression/cypress.config.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { defineConfig } from "cypress"
2-
import { addMatchImageSnapshotPlugin } from "@simonsmith/cypress-image-snapshot/plugin"
1+
const { defineConfig } = require(`cypress`)
2+
const { addMatchImageSnapshotPlugin } = require(`@simonsmith/cypress-image-snapshot/plugin`)
33

44
export default defineConfig({
55
e2e: {
66
baseUrl: `http://localhost:9000`,
77
specPattern: `cypress/integration/*.{js,ts}`,
88
setupNodeEvents(on, config) {
99
addMatchImageSnapshotPlugin(on, config)
10-
on("before:browser:launch", (browser = {} as Cypress.Browser, launchOptions) => {
10+
on("before:browser:launch", (browser = {}, launchOptions) => {
1111
if (browser.family === "chromium" || browser.name === "chrome") {
1212
// Make retina screens run at 1x density so they match the versions in CI
1313
launchOptions.args.push("--force-device-scale-factor=1")

0 commit comments

Comments
 (0)