From 2a31ea1c15fafd256a936d7f91eaf05b404a10a2 Mon Sep 17 00:00:00 2001
From: Alexander Skvortsov <sasha.skvortsov109@gmail.com>
Date: Thu, 27 Jan 2022 15:51:21 -0500
Subject: [PATCH] chore: flarum-cli audit infra --fix

---
 extensions/statistics/.gitattributes                 | 1 +
 extensions/statistics/.github/workflows/backend.yml  | 2 +-
 extensions/statistics/.github/workflows/frontend.yml | 6 ++++--
 extensions/statistics/composer.json                  | 5 ++++-
 extensions/statistics/tests/phpunit.integration.xml  | 1 +
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/extensions/statistics/.gitattributes b/extensions/statistics/.gitattributes
index ca0f40972..b9a08e27d 100644
--- a/extensions/statistics/.gitattributes
+++ b/extensions/statistics/.gitattributes
@@ -14,5 +14,6 @@ js/dist/* -diff
 js/dist/* linguist-generated
 js/dist-typings/* linguist-generated
 js/yarn.lock -diff
+js/package-lock.json -diff
 
 * text=auto eol=lf
diff --git a/extensions/statistics/.github/workflows/backend.yml b/extensions/statistics/.github/workflows/backend.yml
index 1b74b5fbe..4c7bbc152 100644
--- a/extensions/statistics/.github/workflows/backend.yml
+++ b/extensions/statistics/.github/workflows/backend.yml
@@ -12,4 +12,4 @@ jobs:
     with:
       enable_backend_testing: true
 
-      backend_directory: .
\ No newline at end of file
+      backend_directory: .
diff --git a/extensions/statistics/.github/workflows/frontend.yml b/extensions/statistics/.github/workflows/frontend.yml
index beea0df73..681c4a580 100644
--- a/extensions/statistics/.github/workflows/frontend.yml
+++ b/extensions/statistics/.github/workflows/frontend.yml
@@ -12,10 +12,12 @@ jobs:
     with:
       enable_bundlewatch: false
       enable_prettier: true
-      enable_typescript: false
+      enable_typescript: true
 
       frontend_directory: ./js
+      backend_directory: .
+      js_package_manager: yarn
       main_git_branch: master
 
     secrets:
-      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}
\ No newline at end of file
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}
diff --git a/extensions/statistics/composer.json b/extensions/statistics/composer.json
index 36ebe47b5..fc58ced38 100644
--- a/extensions/statistics/composer.json
+++ b/extensions/statistics/composer.json
@@ -40,6 +40,9 @@
             }
         },
         "flarum-cli": {
+            "excludeScaffolding": [
+                "js/src/admin/index.ts"
+            ],
             "modules": {
                 "admin": true,
                 "forum": false,
@@ -49,7 +52,7 @@
                 "gitConf": true,
                 "githubActions": true,
                 "prettier": true,
-                "typescript": false,
+                "typescript": true,
                 "bundlewatch": false,
                 "backendTesting": true,
                 "editorConfig": true,
diff --git a/extensions/statistics/tests/phpunit.integration.xml b/extensions/statistics/tests/phpunit.integration.xml
index 23afc237d..90fbbff37 100644
--- a/extensions/statistics/tests/phpunit.integration.xml
+++ b/extensions/statistics/tests/phpunit.integration.xml
@@ -19,6 +19,7 @@
     <testsuites>
         <testsuite name="Flarum Integration Tests">
             <directory suffix="Test.php">./integration</directory>
+             <exclude>./integration/tmp</exclude>
         </testsuite>
     </testsuites>
 </phpunit>