Merge branch 'main' into @tomekzaw/worklets

Expensify · Aug 1, 2024 · 16f4ac4 · 16f4ac4
2 parents 605ca14 + 7443e23
commit 16f4ac4
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 39 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -17,9 +17,12 @@ jobs:
        if: ${{ github.actor != 'OSBotify' }}
 
        steps:
-           - uses: actions/checkout@v3
+           - uses: actions/checkout@v4
              with:
                ref: main
+               # The OS_BOTIFY_COMMIT_TOKEN is a personal access token tied to osbotify
+               # This is a workaround to allow pushes to a protected branch
+               token: ${{ secrets.OS_BOTIFY_COMMIT_TOKEN }}
 
            - name: Decrypt & Import OSBotify GPG key
              run: |
@@ -36,17 +39,11 @@ jobs:
                git config --global user.name OSBotify
                git config --global user.email [email protected]
 
-           - uses: actions/setup-node@v3
+           - uses: actions/setup-node@v4
              with:
-               node-version: '16.x'
+               node-version-file: '.nvmrc'
                registry-url: 'https://registry.npmjs.org'
 
-           - name: Generate branch name
-             run: echo "BRANCH_NAME=OSBotify-bump-version-$(uuidgen)" >> $GITHUB_ENV
-
-           - name: Create branch for version-bump pull request
-             run: git checkout -b ${{ env.BRANCH_NAME }}
-
            - name: Install yarn packages
              run: yarn install --immutable
 
@@ -63,26 +60,7 @@ jobs:
              run: git tag ${{ env.NEW_VERSION }}
 
            - name: Push branch and publish tags
-             run: git push --set-upstream origin ${{ env.BRANCH_NAME }} && git push --tags
-
-           - name: Create pull request
-             run: |
-               gh pr create \
-                 --title "Update version to ${{ env.NEW_VERSION }}" \
-                 --body "Update version to ${{ env.NEW_VERSION }}"
-               sleep 5
-             env:
-               GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
-
-           - name: Auto-approve pull request
-             run: gh pr review --approve ${{ env.BRANCH_NAME }}
-             env:
-               GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-           - name: Auto-merge pull request
-             run: gh pr merge --squash --delete-branch ${{ env.BRANCH_NAME }}
-             env:
-               GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+             run: git push --set-upstream origin main && git push --tags
 
            - name: Build package
              run: yarn pack

diff --git a/example/package.json b/example/package.json
@@ -8,7 +8,7 @@
     "start": "react-native start"
   },
   "dependencies": {
-    "expensify-common": "2.0.55",
+    "expensify-common": "2.0.64",
     "react": "18.2.0",
     "react-native": "0.73.4",
     "react-native-reanimated": "3.15.0-nightly-20240724-d65549b9e"

diff --git a/example/src/parseExpensiMark.ts b/example/src/parseExpensiMark.ts
@@ -201,12 +201,12 @@ function parseTreeToTextAndRanges(tree: StackItem): [string, Range[]] {
       } else if (node.tag.startsWith('<video data-expensify-source="')) {
         const src = node.tag.match(/data-expensify-source="([^"]*)"/)![1]!; // always present
         const rawLink = node.tag.match(/data-raw-href="([^"]*)"/);
+        const hasAlt = node.tag.match(/data-link-variant="([^"]*)"/)![1] === 'labeled';
         const linkString = rawLink ? unescapeText(rawLink[1]!) : src;
-        const attachmentName = node.children?.join('')?.replaceAll('&#32;', ' ');
         appendSyntax('!');
-        if (attachmentName) {
+        if (hasAlt) {
           appendSyntax('[');
-          processChildren(unescapeText(attachmentName || ''));
+          node.children.forEach((child) => processChildren(child));
           appendSyntax(']');
         }
         appendSyntax('(');

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-live-markdown",
-  "version": "0.1.109",
+  "version": "0.1.111",
   "description": "Drop-in replacement for React Native's TextInput component with Markdown formatting.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

diff --git a/yarn.lock b/yarn.lock
@@ -2613,7 +2613,7 @@ __metadata:
     "@react-native/babel-preset": 0.73.21
     "@react-native/metro-config": 0.73.5
     babel-plugin-module-resolver: ^5.0.0
-    expensify-common: 2.0.55
+    expensify-common: 2.0.64
     react: 18.2.0
     react-native: 0.73.4
     react-native-reanimated: 3.15.0-nightly-20240724-d65549b9e
@@ -9862,9 +9862,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expensify-common@npm:2.0.55":
-  version: 2.0.55
-  resolution: "expensify-common@npm:2.0.55"
+"expensify-common@npm:2.0.64":
+  version: 2.0.64
+  resolution: "expensify-common@npm:2.0.64"
   dependencies:
     awesome-phonenumber: ^5.4.0
     classnames: 2.5.0
@@ -9879,7 +9879,7 @@ __metadata:
     semver: ^7.6.2
     simply-deferred: "git+https://github.com/Expensify/simply-deferred.git#77a08a95754660c7bd6e0b6979fdf84e8e831bf5"
     ua-parser-js: ^1.0.38
-  checksum: 43021adcc9e8d1f04bb23d7276b78a8a9c5ffd8e221e4f73a2689ead228da20bd395183bd09eb59d6037d3aa907acd9e8d40b1ecc20042f86b46728ee597b213
+  checksum: c58c9404da09be588be799798f03e2c74c5598b069218e6a895b65bb8e7132f11820c4f1b50f8e92fcb39b498f71159d75fadd90112632eac250dd09a346488a
   languageName: node
   linkType: hard