build: attempt to fix build

.bcr/presubmit.yml

@@ -1,8 +1,8 @@
 bcr_test_module:
-  module_path: "e2e/smoke"
+  module_path: "examples/simple"
   matrix:
-    platform: ["debian10", "macos", "ubuntu2004", "windows"]
-    bazel: ["8.x", "7.x", "6.x"]
+    platform: ["debian10", "macos", "ubuntu2004"]
+    bazel: ["8.x"]
   tasks:
     run_tests:
       name: "Run test module"

.github/workflows/ci.yaml

@@ -24,6 +24,20 @@ jobs:
       - uses: bazel-contrib/setup-bazel@0.16.0
         with:
           bazelisk-cache: true
+          disk-cache: ${{ github.workflow }}
+          repository-cache: true
+
       - name: Test ${{ matrix.folder }}
         working-directory: ${{ matrix.folder }}
         run: bazel test //...
+
+      - name: Upload test logs
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-logs-${{ matrix.os }}-${{ hashFiles(matrix.folder) }}
+          path: |
+            ${{ matrix.folder }}/bazel-testlogs/**/test.log
+            ${{ matrix.folder }}/bazel-testlogs/**/test.xml
+          if-no-files-found: warn
+          retention-days: 7

.github/workflows/publish.yaml

@@ -25,7 +25,7 @@ jobs:
     with:
       tag_name: ${{ inputs.tag_name }}
       # GitHub repository which is a fork of the upstream where the Pull Request will be opened.
-      registry_fork: myorg/bazel-central-registry
+      registry_fork: formatjs/bazel-central-registry
     permissions:
       attestations: write
       contents: write

.github/workflows/release_prep.sh

@@ -35,5 +35,5 @@ bazel_dep(name = "rules_formatjs", version = "${TAG:1}")
 
 EOF
 
-awk 'f;/--SNIP--/{f=1}' e2e/smoke/WORKSPACE.bazel
+awk 'f;/--SNIP--/{f=1}' examples/simple/MODULE.bazel
 echo "\`\`\`"

.github/workflows/verify-hooks.yml

@@ -23,6 +23,9 @@ jobs:
       - uses: bazel-contrib/setup-bazel@0.16.0
         with:
           bazelisk-cache: true
+          disk-cache: ${{ github.workflow }}
+          repository-cache: true
+
       - name: Get changed files
         id: changed-files
         run: |

MODULE.bazel

@@ -46,7 +46,7 @@ bazel_dep(name = "bazelrc-preset.bzl", version = "1.6.0")
 
 # FormatJS CLI toolchain
 formatjs_cli = use_extension("//formatjs_cli:extensions.bzl", "formatjs_cli")
-formatjs_cli.toolchain(version = "0.1.0")
+formatjs_cli.toolchain(version = "0.1.2")
 use_repo(
     formatjs_cli,
     "formatjs_cli_toolchains_darwin_arm64",

examples/aggregate/app/App.tsx

@@ -1,6 +1,6 @@
-import {Module1Messages} from '../module1/Messages'
-import {Module2Messages} from '../module2/Messages'
-import {Module3Messages} from '../module3/Messages'
+import { Module1Messages } from "../module1/Messages";
+import { Module2Messages } from "../module2/Messages";
+import { Module3Messages } from "../module3/Messages";
 
 export function App() {
   return (
@@ -9,5 +9,5 @@ export function App() {
       <Module2Messages />
       <Module3Messages />
     </>
-  )
+  );
 }

examples/aggregate/app/all_messages.fixture.json

@@ -1,4 +1,24 @@
 {
+  "common.cancel": {
+    "id": "common.cancel",
+    "defaultMessage": "Cancel",
+    "description": "Common cancel button"
+  },
+  "common.save": {
+    "id": "common.save",
+    "defaultMessage": "Save",
+    "description": "Common save button"
+  },
+  "module1.description": {
+    "id": "module1.description",
+    "defaultMessage": "This is the first module",
+    "description": "Description for module 1"
+  },
+  "module1.title": {
+    "id": "module1.title",
+    "defaultMessage": "Module 1 Title",
+    "description": "Title for module 1"
+  },
   "module2.description": {
     "id": "module2.description",
     "defaultMessage": "This is the second module",
@@ -9,11 +29,6 @@
     "defaultMessage": "Module 2 Title",
     "description": "Title for module 2"
   },
-  "common.save": {
-    "id": "common.save",
-    "defaultMessage": "Save",
-    "description": "Common save button"
-  },
   "module3.description": {
     "id": "module3.description",
     "defaultMessage": "This is the third module",
@@ -23,20 +38,5 @@
     "id": "module3.title",
     "defaultMessage": "Module 3 Title",
     "description": "Title for module 3"
-  },
-  "common.cancel": {
-    "id": "common.cancel",
-    "defaultMessage": "Cancel",
-    "description": "Common cancel button"
-  },
-  "module1.title": {
-    "id": "module1.title",
-    "defaultMessage": "Module 1 Title",
-    "description": "Title for module 1"
-  },
-  "module1.description": {
-    "id": "module1.description",
-    "defaultMessage": "This is the first module",
-    "description": "Description for module 1"
   }
 }

examples/aggregate/module1/Messages.tsx

@@ -1,4 +1,4 @@
-import {FormattedMessage} from 'react-intl'
+import { FormattedMessage } from "react-intl";
 
 export function Module1Messages() {
   return (
@@ -14,5 +14,5 @@ export function Module1Messages() {
         description="Description for module 1"
       />
     </>
-  )
+  );
 }

examples/aggregate/module2/Messages.tsx

@@ -1,4 +1,4 @@
-import {FormattedMessage} from 'react-intl'
+import { FormattedMessage } from "react-intl";
 
 export function Module2Messages() {
   return (
@@ -14,5 +14,5 @@ export function Module2Messages() {
         description="Description for module 2"
       />
     </>
-  )
+  );
 }

examples/aggregate/module3/Messages.tsx

@@ -1,4 +1,4 @@
-import {FormattedMessage} from 'react-intl'
+import { FormattedMessage } from "react-intl";
 
 export function Module3Messages() {
   return (
@@ -13,16 +13,12 @@ export function Module3Messages() {
         defaultMessage="This is the third module"
         description="Description for module 3"
       />
-      <FormattedMessage
-        id="common.save"
-        defaultMessage="Save"
-        description="Common save button"
-      />
+      <FormattedMessage id="common.save" defaultMessage="Save" description="Common save button" />
       <FormattedMessage
         id="common.cancel"
         defaultMessage="Cancel"
         description="Common cancel button"
       />
     </>
-  )
+  );
 }

examples/simple/extract_messages.fixture.json

@@ -1,17 +1,17 @@
 {
-  "app.description": {
-    "id": "app.description",
-    "defaultMessage": "This is an example of internationalized React app using FormatJS and Bazel.",
-    "description": "Application description"
-  },
   "app.button": {
     "id": "app.button",
     "defaultMessage": "Click me!",
     "description": "Button text"
   },
+  "app.description": {
+    "id": "app.description",
+    "defaultMessage": "This is an example of internationalized React app using FormatJS and Bazel.",
+    "description": "Application description"
+  },
   "app.title": {
     "id": "app.title",
     "defaultMessage": "Welcome to FormatJS",
     "description": "Main application title"
   }
-}
+}

examples/simple/src/App.tsx

@@ -1,7 +1,7 @@
-import {FormattedMessage, useIntl} from 'react-intl'
+import { FormattedMessage, useIntl } from "react-intl";
 
 export function App() {
-  const intl = useIntl()
+  const intl = useIntl();
 
   return (
     <div>
@@ -20,18 +20,10 @@ export function App() {
         />
       </p>
       <button
-        onClick={() =>
-          alert(
-            intl.formatMessage({id: 'app.button', defaultMessage: 'Click me!'})
-          )
-        }
+        onClick={() => alert(intl.formatMessage({ id: "app.button", defaultMessage: "Click me!" }))}
       >
-        <FormattedMessage
-          id="app.button"
-          defaultMessage="Click me!"
-          description="Button text"
-        />
+        <FormattedMessage id="app.button" defaultMessage="Click me!" description="Button text" />
       </button>
     </div>
-  )
+  );
 }