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: SSR not supports node 14.x optional chaining #4980

Merged
merged 5 commits into from Jul 7, 2020
Merged

fix: SSR not supports node 14.x optional chaining #4980

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
865aacc
chore: ci with node 14.x
ycjcl868 Jul 6, 2020
1a6ca70
fix: ssr for node 14
ycjcl868 Jul 6, 2020
ec3eebf
chore: modify logic getTargets and browsersList
ycjcl868 Jul 6, 2020
fa22c00
fix: optional chain
ycjcl868 Jul 7, 2020
076a093
chore: yarn.lock
ycjcl868 Jul 7, 2020
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
node_version: [8.x, 10.x, 12.x]
node_version: [8.x, 10.x, 12.x, 14.x]
os: [ubuntu-latest, macos-latest]
steps:
- uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions packages/babel-preset-umi/package.json
View file
Open in desktop
Expand Up @@ -28,6 +28,7 @@
},
"dependencies": {
"@babel/plugin-proposal-class-properties": "7.10.4",
"@babel/plugin-proposal-optional-chaining": "7.10.4",
"@babel/plugin-proposal-decorators": "7.10.4",
"@babel/plugin-proposal-do-expressions": "7.10.4",
"@babel/plugin-proposal-export-default-from": "7.10.4",
Expand Down
4 changes: 4 additions & 0 deletions packages/babel-preset-umi/src/index.ts
View file
Open in desktop
Expand Up @@ -66,6 +66,10 @@ export default (context: any, opts: IOpts = {}) => {
],
].filter(Boolean),
plugins: [
[
require('@babel/plugin-proposal-optional-chaining').default,
ycjcl868 marked this conversation as resolved.
Show resolved Hide resolved
{ loose: false },
],
require('@babel/plugin-syntax-top-level-await').default,
// Necessary to include regardless of the environment because
// in practice some other transforms (such as object-rest-spread)
Expand Down
2 changes: 1 addition & 1 deletion packages/bundler-utils/src/getTargetsAndBrowsersList.test.ts
View file
Open in desktop
Expand Up @@ -57,5 +57,5 @@ test('ssr', () => {
expect(targets).toEqual({
node: 6,
});
expect(browserslist).toEqual(['node >= 6']);
expect(browserslist).toEqual(['ie >= 10', 'chrome >= 0', 'firefox >= 0']);
});
11 changes: 10 additions & 1 deletion packages/bundler-utils/src/getTargetsAndBrowsersList.ts
View file
Open in desktop
Expand Up @@ -17,7 +17,6 @@ export default function ({ config, type }: IOpts) {
.filter((key) => {
// filter false and 0 targets
if (targets[key] === false) return false;
if (type === BundlerConfigType.ssr) return key === 'node';
else return key !== 'node';
})
.reduce((memo, key) => {
Expand All @@ -31,6 +30,16 @@ export default function ({ config, type }: IOpts) {
return `${key} >= ${targets[key] === true ? '0' : targets[key]}`;
});

// targets ssr
if (type === BundlerConfigType.ssr) {
targets = Object.keys(targets)
.filter((key) => key === 'node')
.reduce((memo, key) => {
memo[key] = targets[key];
return memo;
}, {} as any);
}

return {
targets,
browserslist,
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
View file
Open in desktop
Expand Up @@ -787,6 +787,14 @@
"@babel/helper-plugin-utils" "^7.8.3"
"@babel/plugin-syntax-optional-catch-binding" "^7.8.0"

"@babel/plugin-proposal-optional-chaining@7.10.4", "@babel/plugin-proposal-optional-chaining@^7.10.4":
version "7.10.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz#750f1255e930a1f82d8cdde45031f81a0d0adff7"
integrity sha512-ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ==
dependencies:
"@babel/helper-plugin-utils" "^7.10.4"
"@babel/plugin-syntax-optional-chaining" "^7.8.0"

"@babel/plugin-proposal-optional-chaining@7.7.4":
version "7.7.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.7.4.tgz#3f04c2de1a942cbd3008324df8144b9cbc0ca0ba"
Expand All @@ -795,14 +803,6 @@
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-optional-chaining" "^7.7.4"

"@babel/plugin-proposal-optional-chaining@^7.10.4":
version "7.10.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz#750f1255e930a1f82d8cdde45031f81a0d0adff7"
integrity sha512-ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ==
dependencies:
"@babel/helper-plugin-utils" "^7.10.4"
"@babel/plugin-syntax-optional-chaining" "^7.8.0"

"@babel/plugin-proposal-optional-chaining@^7.9.0":
version "7.9.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
Expand Down