From 34c753040cc5b512b468ccd601f71e0c7eccfae2 Mon Sep 17 00:00:00 2001
From: Alexander Skvortsov <sasha.skvortsov109@gmail.com>
Date: Thu, 27 Jan 2022 16:45:10 -0500
Subject: [PATCH] chore: flarum-cli audit infra --fix

---
 .gitattributes                 | 1 +
 .github/workflows/backend.yml  | 2 +-
 .github/workflows/frontend.yml | 4 +++-
 js/package.json                | 7 ++++---
 tests/phpunit.integration.xml  | 1 +
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index ca0f40972..b9a08e27d 100644
--- a/.gitattributes
+++ b/.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/.github/workflows/backend.yml b/.github/workflows/backend.yml
index 8c4082b3f..be6cea247 100644
--- a/.github/workflows/backend.yml
+++ b/.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/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index b2c8373c4..e12159f2d 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -15,7 +15,9 @@ jobs:
       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/js/package.json b/js/package.json
index 50eb67fd1..872644beb 100644
--- a/js/package.json
+++ b/js/package.json
@@ -39,13 +39,14 @@
     "scripts": {
         "dev": "webpack --mode development --watch",
         "build": "webpack --mode production",
-        "analyze": "cross-env ANALYZER=true yarn build",
+        "analyze": "cross-env ANALYZER=true yarn run build",
         "format": "prettier --write src",
         "format-check": "prettier --check src",
         "clean-typings": "npx rimraf dist-typings && mkdir dist-typings",
-        "build-typings": "npm run clean-typings && tsc && [ -e src/@types ] && cp -r src/@types dist-typings/@types",
+        "build-typings": "yarn run clean-typings && tsc && [ -e src/@types ] && cp -r src/@types dist-typings/@types",
         "check-typings": "tsc --noEmit --emitDeclarationOnly false",
-        "check-typings-coverage": "typescript-coverage-report"
+        "check-typings-coverage": "typescript-coverage-report",
+        "ci": "yarn install --immutable --immutable-cache"
     },
     "packageManager": "yarn@3.1.1"
 }
diff --git a/tests/phpunit.integration.xml b/tests/phpunit.integration.xml
index 23afc237d..90fbbff37 100644
--- a/tests/phpunit.integration.xml
+++ b/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>