chore: flarum-cli audit infra --fix

flarum · Jan 27, 2022 · 548eec7 · 548eec7
1 parent d440e99
commit 548eec7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git 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
@@ -12,4 +12,4 @@ jobs:
     with:
       enable_backend_testing: true
 
-      backend_directory: .
+      backend_directory: .
diff --git a/.github/workflows/frontend.yml b/.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 }}
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}
diff --git a/composer.json b/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/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>