Merge remote-tracking branch 'origin/master' into clean-up-and-optimize-generated-props

Author: greglittlefield-wf

.github/workflows/dart_ci.yml .github/workflows/ci.yml.github/workflows/dart_ci.yml renamed to .github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Dart CI
+name: CI
 
 on:
   push:
@@ -19,22 +19,16 @@ permissions:
 jobs:
   # Run as a separate job outside the Dart SDK matrix below,
   # since we can only emit a single SBOM.
-  create-sbom-release-asset:
-    name: Create SBOM Release Asset
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dart-lang/setup-dart@v1
-        with:
-          sdk: 2.19.6 # This version doesn't matter so long as it resolves.
-      - run: dart pub get
-      - name: Publish SBOM to Release Assets
-        uses: anchore/sbom-action@v0
-        with:
-          path: ./
-          format: cyclonedx-json
-
   build:
+    uses: Workiva/gha-dart-oss/.github/workflows/[email protected]
+
+  checks:
+    uses: Workiva/gha-dart-oss/.github/workflows/[email protected]
+    with:
+      additional-checks: |
+        no_entrypoint_imports
+
+  test_and_check_generated_files:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -60,17 +54,10 @@ jobs:
           if [[ "$DART_VERSION" =~ ^3 ]]; then
             ./tool/delete_dart_2_only_files.sh
             ./tool/update_tests_for_dart_3.sh
+            # Stage these changes so they don't show up in the generated file `git diff` check below
+            git add .
           fi
 
-      - name: Validate dependencies
-        run: dart run dependency_validator
-        if: always() && steps.install.outcome == 'success'
-
-      - name: Verify formatting
-        run: dart run dart_dev format --check
-        # Only run on one sdk version in case there are conflicts
-        if: always() && matrix.sdk == '2.19.6' && steps.install.outcome == 'success'
-
       # Analyze before generated files are created to verify that component boilerplate analysis is "clean" without the need for building
       - name: Analyze example source (pre-build)
         run: |
@@ -89,13 +76,7 @@ jobs:
 
       - name: Verify that generated files are up-to-date
         run: |
-          if [ ${{ matrix.sdk }} = '2.19.6' ]; then
-            git diff --exit-code
-          else
-            # Don't check these generated files for other SDKs, since they may generate differently
-            # due to different resolved dependencies.
-            git diff --exit-code -- ":(exclude)test/over_react/component_declaration/redux_component_test/test_reducer.g.dart"
-          fi
+          git diff --exit-code
         if: always() && steps.install.outcome == 'success' && steps.build.outcome == 'success'
 
       # Analyze again after generated files are created to verify that those generated classes don't cause analysis errors
@@ -234,3 +215,16 @@ jobs:
         run: dart run dart_dev test
         if: always() && steps.install.outcome == 'success'
         timeout-minutes: 8
+
+  testing-and-checks-complete:
+    name: Testing and Checks Completed
+    needs: [ build, checks, test_and_check_generated_files, validate_analyzer, analyzer_plugin ]
+    if: ${{ !cancelled() && github.event_name == 'pull_request' || github.ref_type == 'tag' }}
+    runs-on: ubuntu-latest
+    steps:
+      - run: |
+          if [ "${{ needs.checks.result }}" == "failure" ]; then
+            echo "Some checks have failed. Please fix the issues and try again."
+            exit 1
+          fi
+          echo 'All Testing and checks have completed.'

.github/workflows/publish.yml

@@ -0,0 +1,15 @@
+name: Publish
+
+on:
+  push:
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+
+permissions:
+  contents: write
+  id-token: write
+  pull-requests: write
+
+jobs:
+  publish:
+    uses: Workiva/gha-dart-oss/.github/workflows/[email protected]

CHANGELOG.md

@@ -1,7 +1,13 @@
 # OverReact Changelog
 
 ## Unreleased
-- Optimize generated code to decrease dart2js compile size, saving ~577 bytes per component (when using `-03 --csp --minify`)
+- [#989] Optimize generated code to decrease dart2js compile size, saving ~577 bytes per component (when using `-03 --csp --minify`)
+- [#992] Fix compilation errors for legacy boilerplate defined in libraries with a Dart language version of >=3.0
+
+## 5.4.6
+- [#986] Set up gha-dart-oss
+- [#985] Remove entrypoint imports
+- [#984] Rollout React 18 to tests and example apps
 
 ## 5.4.5
 - Update analyzer dependency to `>=5.13.0 <8.0.0` (allow v8)

example/boilerplate_versions/dart2_only/basic_component1.over_react.g.dart

@@ -82,7 +82,7 @@ abstract class TypedMapAccessorsGenerator extends BoilerplateDeclarationGenerato
       final implementsClause = 'implements ${names.consumerName}$typeParamsOnSuper';
       generatedClass
         ..write(generatedCodeUseOnlyDeprecation)
-        ..writeln('abstract class $accessorsMixinName$typeParamsOnClass $implementsClause {\n'
+        ..writeln('mixin $accessorsMixinName$typeParamsOnClass $implementsClause {\n'
             '  @override'
             '  Map get ${type.isProps ? 'props' : 'state'};\n');
       if (type.isMixin) {