remove workspaces from shellapp

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Add Android beta tarball for SDK 43
+- Add iOS beta tarball for SDK 43
+- Bump xdl to fix Android shell app for SDK 43
+
 # [0.22.6] - 2021-10-01
 
 - add `ACCESS_MEDIA_LOCATION` to blacklist for android permissions

Dockerfile

@@ -11,12 +11,13 @@ RUN ln -s /app/turtle/workingdir /app/workingdir && \
   for SDK_VERSION in `ls /app/workingdir/android/`; do \
   echo "preparing $SDK_VERSION shell app" && \
   cd /app/workingdir/android/$SDK_VERSION && \
-  mv packages non-workspace-packages && \
+  mv package.json copy_package.json && \
+  jq '.workspaces.packages = ["packages/expo", "packages/expo-modules-autolinking"]' copy_package.json > package.json && \
+  rm -f copy_package.json && \
   # Keep in sync with src/bin/setup/android/index.ts#_installNodeModules
   # --prod requires --ignore-scripts (otherwise
   # expo-yarn-workspaces errors as missing)
-  yarn install --ignore-scripts --prod && \
-  mv non-workspace-packages packages ; \
+  yarn install --ignore-scripts --prod ; \
   done
 
 ENV NODE_ENV "production"

package.json

@@ -107,7 +107,7 @@
   "dependencies": {
     "@expo/config": "~3.3.9",
     "@expo/spawn-async": "^1.4.2",
-    "@expo/xdl": "59.1.5",
+    "@expo/xdl": "59.1.7",
     "@google-cloud/logging-bunyan": "^2.0.3",
     "async-retry": "^1.2.1",
     "aws-sdk": "^2.226.1",

shellTarballs/android/sdk43

@@ -0,0 +1 @@
+s3://exp-artifacts/android-shell-builder-f84f90bc6c328e9cc9873384df87bacceba6bbe4.tar.gz

shellTarballs/ios/sdk43

@@ -0,0 +1 @@
+s3://exp-artifacts/ios-shell-builder-sdk-latest-dae4058caf45270ad7cec96a17f63dc9df98908b.tar.gz

yarn.lock

@@ -2866,10 +2866,10 @@
     workbox-webpack-plugin "^3.6.3"
     worker-loader "^2.0.0"
 
-"@expo/[email protected].5":
-  version "59.1.5"
-  resolved "https://registry.yarnpkg.com/@expo/xdl/-/xdl-59.1.5.tgz#e631aedceb03ca8fe3e7d5cab6b407554ca632fb"
-  integrity sha512-8SlNyyzpOdMwJXYqKDb09Yxp8zqxMMDSy8El0bLTibgHCyHrNgrfvWZi3f8O10+4M26LyITZ/OZy2Io2P/3uRg==
+"@expo/[email protected].7":
+  version "59.1.7"
+  resolved "https://registry.yarnpkg.com/@expo/xdl/-/xdl-59.1.7.tgz#b11463b1b72493e9608b5de7492e62cf855198a5"
+  integrity sha512-tOW95XRegMryP5QVu+UNIMcia1Sp/1Qb7ieMuB7QC4k6K5KkuIADtlbKD/SsrFFz+DBUorj9pZW+Cw+qUd89Vw==
   dependencies:
     "@expo/bunyan" "4.0.0"
     "@expo/config" "3.3.30"