Skip to content

Commit

Permalink
chore(gatsby): remove lazy dev js experiment (#28295)
Browse files Browse the repository at this point in the history
* chore(gatsby): remove lazy dev js experiment

* This bit of the test fails now w/ the page-data changes

* use import, not require (to restore to what it was before lazy js compilation)

Co-authored-by: Michal Piechowiak <misiek.piechowiak@gmail.com>
  • Loading branch information
KyleAMathews and pieh committed Nov 26, 2020
1 parent e1e9e0c commit 2e3ec89
Show file tree
Hide file tree
Showing 19 changed files with 28 additions and 968 deletions.
26 changes: 0 additions & 26 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,23 +117,6 @@ aliases:
- notify-status:
condition: << parameters.nightly >>

e2e_tests_development_runtime_lazy_alias:
&e2e_tests_development_runtime_lazy_alias
<<: *e2e-executor
parameters:
nightly:
type: boolean
default: false
environment:
CYPRESS_PROJECT_ID: ihj5mz
CYPRESS_RECORD_KEY: 01acdce8-75bd-4280-9839-6cb215b2c84b
steps:
- e2e-test:
test_path: e2e-tests/lazy-development-runtime
skip_file_change_test: << parameters.nightly >>
- notify-status:
condition: << parameters.nightly >>

e2e_tests_gatsby-image_alias: &e2e_tests_gatsby-image_alias
<<: *e2e-executor
parameters:
Expand Down Expand Up @@ -346,13 +329,6 @@ jobs:
e2e_tests_development_runtime:
<<: *e2e_tests_development_runtime_alias

e2e_tests_development_runtime_lazy_devjs:
<<: *e2e_tests_development_runtime_alias
environment:
GATSBY_EXPERIMENT_LAZY_DEVJS: true
CYPRESS_PROJECT_ID: ihj5mz
CYPRESS_RECORD_KEY: 01acdce8-75bd-4280-9839-6cb215b2c84b

e2e_tests_development_runtime_with_experimental_react:
<<: *e2e_tests_development_runtime_alias

Expand Down Expand Up @@ -635,8 +611,6 @@ workflows:
<<: *e2e-test-workflow
- e2e_tests_development_runtime:
<<: *e2e-test-workflow
- e2e_tests_development_runtime_lazy_devjs:
<<: *e2e-test-workflow
- e2e_tests_production_runtime:
<<: *e2e-test-workflow
- themes_e2e_tests_production_runtime:
Expand Down
28 changes: 14 additions & 14 deletions integration-tests/ssr/__tests__/ssr.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,20 @@ describe(`SSR`, () => {
`http://localhost:8000/bad-page/`
).then(res => res.text())
expect(rawDevHtml).toMatchSnapshot()
fs.remove(dest)
// fs.remove(dest)

// After the page is gone, it'll 404.
await new Promise(resolve => {
setTimeout(() => {
const testInterval = setInterval(() => {
fetch(pageUrl).then(res => {
if (res.status === 404) {
clearInterval(testInterval)
resolve()
}
})
}, 400)
}, 400)
})
// // After the page is gone, it'll 404.
// await new Promise(resolve => {
// setTimeout(() => {
// const testInterval = setInterval(() => {
// fetch(pageUrl).then(res => {
// if (res.status === 404) {
// clearInterval(testInterval)
// resolve()
// }
// })
// }, 400)
// }, 400)
// })
})
})
2 changes: 1 addition & 1 deletion integration-tests/ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "https://github.com/gatsbyjs/gatsby/issues"
},
"dependencies": {
"gatsby": "2.24.82-dev-1603131999086",
"gatsby": "^2.27.0",
"react": "^16.12.0",
"react-dom": "^16.12.0"
},
Expand Down

This file was deleted.

0 comments on commit 2e3ec89

Please sign in to comment.