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.

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

feat: Add Gastsby v5 support #111

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 4 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ version: 2.1
aliases:
node-executor: &node-executor
docker:
- image: circleci/node:14
- image: cimg/node:lts

e2e-executor: &e2e-executor
docker:
- image: cypress/browsers:node14.15.0-chrome86-ff82
- image: cypress/browsers:node18.12.0-chrome106-ff106

restore_cache: &restore_cache
restore_cache:
Expand Down Expand Up @@ -87,7 +87,5 @@ workflows:
jobs:
- bootstrap
- lint
- e2e_tests_development_runtime:
<<: *e2e-test-workflow
- e2e_tests_production_runtime:
<<: *e2e-test-workflow
- e2e_tests_development_runtime
- e2e_tests_production_runtime
10 changes: 10 additions & 0 deletions e2e-tests/development-runtime/cypress.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const { defineConfig } = require(`cypress`)

module.exports = defineConfig({
e2e: {
baseUrl: `http://localhost:8000`,
failOnStatusCode: false,
video: false,
specPattern: `cypress/integration/**/*.js`
}
})
5 changes: 0 additions & 5 deletions e2e-tests/development-runtime/cypress.json

This file was deleted.

10 changes: 5 additions & 5 deletions e2e-tests/development-runtime/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "development-runtime",
"private": true,
"version": "4.1.0",
"version": "5.0.0",
"dependencies": {
"@emotion/react": "latest",
"@emotion/styled": "latest",
Expand All @@ -25,10 +25,10 @@
"test": "cross-env CYPRESS_SUPPORT=y yarn start-server-and-test "
},
"devDependencies": {
"@testing-library/cypress": "^8.0.0",
"@testing-library/cypress": "^8.0.7",
"cross-env": "^7.0.3",
"cypress": "^9.0.0",
"gatsby-cypress": "^2.2.0",
"start-server-and-test": "^1.9.1"
"cypress": "^11.1.0",
"gatsby-cypress": "^3.1.0",
"start-server-and-test": "^1.14.0"
}
}
10 changes: 10 additions & 0 deletions e2e-tests/production-runtime/cypress.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const { defineConfig } = require(`cypress`)

module.exports = defineConfig({
e2e: {
baseUrl: `http://localhost:9000`,
failOnStatusCode: false,
video: false,
specPattern: `cypress/integration/**/*.js`
}
})
5 changes: 0 additions & 5 deletions e2e-tests/production-runtime/cypress.json

This file was deleted.

10 changes: 5 additions & 5 deletions e2e-tests/production-runtime/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "production-runtime",
"private": true,
"version": "4.1.0",
"version": "5.0.0",
"dependencies": {
"@emotion/react": "latest",
"@emotion/styled": "latest",
Expand All @@ -26,9 +26,9 @@
"test": "cross-env CYPRESS_SUPPORT=y yarn build && yarn start-server-and-test "
},
"devDependencies": {
"@testing-library/cypress": "^8.0.0",
"cypress": "^9.0.0",
"gatsby-cypress": "^2.2.0",
"start-server-and-test": "^1.9.1"
"@testing-library/cypress": "^8.0.7",
"cypress": "^11.1.0",
"gatsby-cypress": "^3.1.0",
"start-server-and-test": "^1.14.0"
}
}
18 changes: 9 additions & 9 deletions gatsby-plugin-material-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-plugin-material-ui",
"version": "4.1.0",
"version": "5.0.0",
"description": "Gatsby plugin for Material-UI with built-in server-side rendering support",
"license": "MIT",
"repository": {
Expand Down Expand Up @@ -28,18 +28,18 @@
"prepare": "cross-env NODE_ENV=production npm run build"
},
"dependencies": {
"@emotion/cache": "^11.4.0",
"@emotion/server": "^11.4.0"
"@emotion/cache": "^11.10.5",
"@emotion/server": "^11.10.0"
},
"peerDependencies": {
"@emotion/react": "^11.4.0",
"gatsby": "^3.0.0 || ^4.0.0"
"@emotion/react": "^11.10.5",
"gatsby": "^3.0.0 || ^4.0.0 || ^5.0.0"
},
"devDependencies": {
"@babel/cli": "^7.12.1",
"@babel/core": "^7.12.3",
"@emotion/react": "^11.4.0",
"babel-preset-gatsby-package": "^2.2.0",
"@babel/cli": "^7.19.3",
"@babel/core": "^7.20.2",
"@emotion/react": "^11.10.5",
"babel-preset-gatsby-package": "^3.0.0",
"cross-env": "^7.0.3"
}
}
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
"lint": "eslint . --report-unused-disable-directives"
},
"devDependencies": {
"@babel/eslint-parser": "^7.15.0",
"eslint": "^7.32.0",
"eslint-plugin-react": "^7.14.3",
"lerna": "^4.0.0"
"@babel/eslint-parser": "^7.19.1",
"eslint": "^8.28.0",
"eslint-plugin-react": "^7.31.11",
"lerna": "^6.0.3"
}
}