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(gatsby-plugin-gatsby-cloud): only load indicator code when enabled #31506

Merged
merged 7 commits into from
May 21, 2021
Merged

fix(gatsby-plugin-gatsby-cloud): only load indicator code when enabled #31506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
00491b4
chore: fix lint CI
wardpeet May 21, 2021
1b7752c
fix(gatsby-plugin-gatsby-cloud): only load indicator code whenenabled
wardpeet May 20, 2021
0aedcf6
remove debug
wardpeet May 20, 2021
6de18db
fix targets
wardpeet May 21, 2021
0956f80
update jest
wardpeet May 21, 2021
e6204a9
Merge branch 'master' into bundle-preview-loader
wardpeet May 21, 2021
584547b
Update packages/gatsby-plugin-gatsby-cloud/.babelrc
wardpeet May 21, 2021
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
4 changes: 4 additions & 0 deletions packages/babel-preset-gatsby-package/__tests__/__snapshots__/index.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Array [
Array [
"@babel/preset-env",
Object {
"bugfixes": false,
"debug": false,
"loose": true,
"modules": "commonjs",
Expand All @@ -31,6 +32,7 @@ Array [
Array [
"@babel/preset-env",
Object {
"bugfixes": false,
"debug": true,
"loose": true,
"modules": "commonjs",
Expand Down Expand Up @@ -67,6 +69,7 @@ Array [
Array [
"@babel/preset-env",
Object {
"bugfixes": false,
"corejs": 3,
"debug": false,
"loose": true,
Expand All @@ -90,6 +93,7 @@ Array [
Array [
"@babel/preset-env",
Object {
"bugfixes": false,
"corejs": 3,
"debug": true,
"loose": true,
Expand Down
20 changes: 15 additions & 5 deletions packages/babel-preset-gatsby-package/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
const r = require(`./resolver`)

function preset(context, options = {}) {
const { browser = false, debug = false, nodeVersion = `12.13.0` } = options
const { browser = false, debug = false, nodeVersion = `12.13.0`, esm = false } = options
const { NODE_ENV, BABEL_ENV } = process.env

const IS_TEST = (BABEL_ENV || NODE_ENV) === `test`

const browserConfig = {
useBuiltIns: false,
targets: {
browsers: [`last 2 versions`, `not ie <= 11`, `not android 4.4.3`],
},
}

if (browser) {
if (esm) {
browserConfig.targets = {
esmodules: true
}
} else {
browserConfig.targets = {
browsers: [`last 2 versions`, `not ie <= 11`, `not android 4.4.3`]
}
}
}

const nodeConfig = {
Expand All @@ -30,7 +39,8 @@ function preset(context, options = {}) {
loose: true,
debug: !!debug,
shippedProposals: true,
modules: `commonjs`,
modules: esm ? false : `commonjs`,
bugfixes: esm,
wardpeet marked this conversation as resolved.
Show resolved Hide resolved
},
browser ? browserConfig : nodeConfig
),
Expand Down
8 changes: 7 additions & 1 deletion packages/gatsby-plugin-gatsby-cloud/.babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
{
"presets": [["babel-preset-gatsby-package"]]
"presets": [["babel-preset-gatsby-package"]],
"overrides": [
{
"test": ["**/gatsby-browser.js"],
"presets": [["babel-preset-gatsby-package", { "browser": true, "esm": true }]]
}
]
}
3 changes: 3 additions & 0 deletions packages/gatsby-plugin-gatsby-cloud/src/gatsby-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import { DEFAULT_OPTIONS, BUILD_HTML_STAGE, BUILD_CSS_STAGE } from "./constants"

const assetsManifest = {}

process.env.GATSBY_PREVIEW_INDICATOR_ENABLED =
process.env.GATSBY_PREVIEW_INDICATOR_ENABLED || `false`

// Inject a webpack plugin to get the file manifests so we can translate all link headers
exports.onCreateWebpackConfig = ({ actions, stage }) => {
if (stage !== BUILD_HTML_STAGE && stage !== BUILD_CSS_STAGE) {
Expand Down