Skip to content

Commit

Permalink
[ncl][expo] update react-native-skia to 0.1.157 (#19789)
Browse files Browse the repository at this point in the history
# Why

fix Shopify/react-native-skia#1030 for sdk 47

# How

- there're no meaningful native changes from 0.1.155 to 0.1.157, so we just update the _bundledNativeModules.json_
- revert the NCL webpack workaround from #19717

# Test Plan

- tested on sdk 47 expo go + @shopify/react-native-skia@0.1.157
- NCL ci passed
- NCL - `yarn build:web`
  • Loading branch information
Kudo committed Oct 31, 2022
1 parent e978932 commit 43cf22e
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 29 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Expand Up @@ -27,7 +27,7 @@ Package-specific changes not released in any SDK will be added here just before
- Updated `@react-native-community/netinfo` from `9.3.0` to `9.3.5`. ([#19421](https://github.com/expo/expo/pull/19421) by [@douglowder](https://github.com/douglowder)) ([#19647](https://github.com/expo/expo/pull/19647) by [@brentvatne](https://github.com/brentvatne))
- Updated `@react-native-picker/picker` from `2.4.2` to `2.4.8`. ([#19390](https://github.com/expo/expo/pull/19390) by [@aleqsio](https://github.com/aleqsio)) ([#19647](https://github.com/expo/expo/pull/19647) by [@brentvatne](https://github.com/brentvatne))
- Updated `react-native-screens` from `3.15.0` to `3.18.0`. ([#19383](https://github.com/expo/expo/pull/19383) by [@tsapeta](https://github.com/tsapeta))
- Updated `@shopify/react-native-skia` from `0.1.136` to `0.1.155`. ([#19360](https://github.com/expo/expo/pull/19360) by [@kudo](https://github.com/kudo)) ([#19647](https://github.com/expo/expo/pull/19647) by [@brentvatne](https://github.com/brentvatne))
- Updated `@shopify/react-native-skia` from `0.1.136` to `0.1.157`. ([#19360](https://github.com/expo/expo/pull/19360) by [@kudo](https://github.com/kudo)) ([#19647](https://github.com/expo/expo/pull/19647) by [@brentvatne](https://github.com/brentvatne)) ([#19789](https://github.com/expo/expo/pull/19789) by [@kudo](https://github.com/kudo))
- Updated `@react-native-community/datetimepicker` from `6.2.0` to `6.5.0`. ([#19419](https://github.com/expo/expo/pull/19419) by [@byCedric](https://github.com/byCedric))
- Updated `react-native-maps` from `0.31.1` to `1.3.2`. ([#19414](https://github.com/expo/expo/pull/19414) by [@aleqsio](https://github.com/aleqsio))
- Updated `lottie-react-native` from `5.1.3` to `5.1.4`. ([#19433](https://github.com/expo/expo/pull/19433) by [@kudo](https://github.com/kudo))
Expand Down
2 changes: 1 addition & 1 deletion apps/native-component-list/package.json
Expand Up @@ -55,7 +55,7 @@
"@react-navigation/stack": "~6.3.2",
"@react-navigation/elements": "~1.3.6",
"@shopify/flash-list": "1.3.1",
"@shopify/react-native-skia": "0.1.155",
"@shopify/react-native-skia": "0.1.157",
"@use-expo/permissions": "^2.0.0",
"date-format": "^2.0.0",
"deep-object-diff": "^1.1.0",
Expand Down
@@ -1,4 +1,5 @@
import { WithSkiaWeb } from '@shopify/react-native-skia/src/web';
// @ts-ignore
import { WithSkiaWeb } from '@shopify/react-native-skia/lib/module/web';
import { version as CanvasKitVersion } from 'canvaskit-wasm/package.json';
import { Text } from 'react-native';

Expand Down
10 changes: 1 addition & 9 deletions apps/native-component-list/webpack.config.js
@@ -1,15 +1,7 @@
const createConfigAsync = require('@expo/webpack-config');

module.exports = async (env, argv) => {
const config = await createConfigAsync(
{
...env,
babel: {
dangerouslyAddModulePathsToTranspile: ['@shopify/react-native-skia'],
},
},
argv
);
const config = await createConfigAsync(env, argv);
// allow reloading when the packages are updated.
if (config.devServer) {
delete config.devServer.watchOptions;
Expand Down
2 changes: 1 addition & 1 deletion packages/expo/bundledNativeModules.json
Expand Up @@ -103,7 +103,7 @@
"sentry-expo": "~5.0.0",
"unimodules-app-loader": "~4.0.0",
"unimodules-image-loader-interface": "~6.1.0",
"@shopify/react-native-skia": "0.1.155",
"@shopify/react-native-skia": "0.1.157",
"@shopify/flash-list": "1.3.1",
"@sentry/react-native": "4.2.2"
}
32 changes: 16 additions & 16 deletions yarn.lock
Expand Up @@ -436,12 +436,12 @@
"@babel/helper-plugin-utils" "^7.17.12"
"@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"

"@babel/plugin-proposal-nullish-coalescing-operator@^7.0.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8", "@babel/plugin-proposal-nullish-coalescing-operator@^7.17.12", "@babel/plugin-proposal-nullish-coalescing-operator@^7.7.4":
version "7.17.12"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz#1e93079bbc2cbc756f6db6a1925157c4a92b94be"
integrity sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==
"@babel/plugin-proposal-nullish-coalescing-operator@^7.0.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8", "@babel/plugin-proposal-nullish-coalescing-operator@^7.17.12", "@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6", "@babel/plugin-proposal-nullish-coalescing-operator@^7.7.4":
version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
dependencies:
"@babel/helper-plugin-utils" "^7.17.12"
"@babel/helper-plugin-utils" "^7.18.6"
"@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"

"@babel/plugin-proposal-numeric-separator@^7.16.7":
Expand Down Expand Up @@ -3535,13 +3535,14 @@
recyclerlistview "4.1.2"
tslib "2.4.0"

"@shopify/react-native-skia@0.1.155":
version "0.1.155"
resolved "https://registry.yarnpkg.com/@shopify/react-native-skia/-/react-native-skia-0.1.155.tgz#44bc58a39939fd6f6bf83481f417fb8494b2e99e"
integrity sha512-tRJy1gXrRCjPgG4CLvyxEOSHDU5IHsBS7TGsdyP/6cz9gcb1QrTejUi1+dfixjMcsRof4wYpprlIvnfwjNLWpg==
"@shopify/react-native-skia@0.1.157":
version "0.1.157"
resolved "https://registry.yarnpkg.com/@shopify/react-native-skia/-/react-native-skia-0.1.157.tgz#85f7f5859aa06639fc780fb57af19e55ad10da35"
integrity sha512-dqOUn2SQ94WJRUAd+LufOyQlNvmCjKFlvVljbi/UjPK47to9Q1zd5amUxPa5acvOrolKsEaNHgiFzOBMyRf0nA==
dependencies:
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
canvaskit-wasm "0.36.1"
react-reconciler "0.26.2"
react-reconciler "^0.27.0"

"@sideway/address@^4.1.3":
version "4.1.4"
Expand Down Expand Up @@ -17431,14 +17432,13 @@ react-query@^3.34.16:
broadcast-channel "^3.4.1"
match-sorter "^6.0.2"

react-reconciler@0.26.2:
version "0.26.2"
resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.26.2.tgz#bbad0e2d1309423f76cf3c3309ac6c96e05e9d91"
integrity sha512-nK6kgY28HwrMNwDnMui3dvm3rCFjZrcGiuwLc5COUipBK5hWHLOxMJhSnSomirqWwjPBJKV1QcbkI0VJr7Gl1Q==
react-reconciler@^0.27.0:
version "0.27.0"
resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.27.0.tgz#360124fdf2d76447c7491ee5f0e04503ed9acf5b"
integrity sha512-HmMDKciQjYmBRGuuhIaKA1ba/7a+UsM5FzOZsMO2JYHt9Jh8reCb7j1eDC95NOyUlKM9KRyvdx0flBuDvYSBoA==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
scheduler "^0.20.2"
scheduler "^0.21.0"

react-redux@^7.2.0:
version "7.2.6"
Expand Down

0 comments on commit 43cf22e

Please sign in to comment.