chore: flarum-cli audit infra --fix

extensions/pusher/.editorconfig

@@ -15,5 +15,5 @@ indent_size = 2
 [*.{diff,md}]
 trim_trailing_whitespace = false
 
-[*.php]
+[*.{php,xml,json}]
 indent_size = 4

extensions/pusher/.gitattributes

@@ -1,5 +1,18 @@
 .gitattributes export-ignore
 .gitignore export-ignore
+.gitmodules export-ignore
+.github export-ignore
+.travis export-ignore
 .travis.yml export-ignore
+.editorconfig export-ignore
+.styleci.yml export-ignore
+
+phpunit.xml export-ignore
+tests export-ignore
 
 js/dist/* -diff
+js/dist/* linguist-generated
+js/dist-typings/* linguist-generated
+js/yarn.lock -diff
+
+* text=auto eol=lf

extensions/pusher/.github/workflows/backend.yml

@@ -0,0 +1,15 @@
+name: Pusher PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
+jobs:
+  run:
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
+    with:
+      enable_backend_testing: false
+
+      backend_directory: .

extensions/pusher/.github/workflows/build.yml

@@ -1,17 +0,0 @@
-name: Build JavaScript assets
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@master
-      - uses: flarum/action-build@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-

extensions/pusher/.github/workflows/frontend.yml

@@ -0,0 +1,21 @@
+name: Pusher JS
+
+on: [workflow_dispatch, push, pull_request]
+
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
+jobs:
+  run:
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
+    with:
+      enable_bundlewatch: false
+      enable_prettier: true
+      enable_typescript: true
+
+      frontend_directory: ./js
+      main_git_branch: master
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

extensions/pusher/.gitignore

@@ -1,8 +1,12 @@
 /vendor
 composer.lock
 composer.phar
+
 .DS_Store
 Thumbs.db
-node_modules
+tests/.phpunit.result.cache
-js/dist/*
+/tests/integration/tmp
-.idea
+.vagrant
+.idea/*
+.vscode
+js/coverage-ts

extensions/pusher/composer.json

@@ -2,7 +2,9 @@
     "name": "flarum/pusher",
     "description": "See new discussions and posts in real-time using Pusher.",
     "type": "flarum-extension",
-    "keywords": ["discussion"],
+    "keywords": [
+        "discussion"
+    ],
     "license": "MIT",
     "support": {
         "issues": "https://github.com/flarum/core/issues",
@@ -40,6 +42,23 @@
                 "backgroundColor": "#40bad8",
                 "color": "#fff"
             }
+        },
+        "flarum-cli": {
+            "modules": {
+                "admin": true,
+                "forum": true,
+                "js": true,
+                "jsCommon": false,
+                "css": true,
+                "gitConf": true,
+                "githubActions": true,
+                "prettier": true,
+                "typescript": true,
+                "bundlewatch": false,
+                "backendTesting": false,
+                "editorConfig": true,
+                "styleci": true
+            }
         }
     }
 }

extensions/pusher/js/.gitignore

@@ -0,0 +1,9 @@
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+node_modules

extensions/pusher/js/admin.ts

@@ -1,10 +1 @@
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 export * from './src/admin';

extensions/pusher/js/forum.ts

@@ -1,10 +1 @@
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 export * from './src/forum';

extensions/pusher/js/package.json

@@ -1,20 +1,26 @@
 {
-  "private": true,
+    "private": true,
-  "name": "@flarum/pusher",
+    "name": "@flarum/pusher",
-  "prettier": "@flarum/prettier-config",
+    "prettier": "@flarum/prettier-config",
-  "dependencies": {
+    "scripts": {
-    "flarum-webpack-config": "^1.0.0",
+        "dev": "webpack --mode development --watch",
-    "pusher-js": "^7.0.3",
+        "build": "webpack --mode production",
-    "webpack": "^4.46.0",
+        "analyze": "cross-env ANALYZER=true yarn build",
-    "webpack-cli": "^4.9.1"
+        "format": "prettier --write src",
-  },
+        "format-check": "prettier --check src",
-  "scripts": {
+        "clean-typings": "npx rimraf dist-typings && mkdir dist-typings",
-    "dev": "webpack --mode development --watch",
+        "build-typings": "npm run clean-typings && cp -r src/@types dist-typings/@types && tsc",
-    "build": "webpack --mode production"
+        "check-typings": "tsc --noEmit --emitDeclarationOnly false",
-  },
+        "check-typings-coverage": "typescript-coverage-report"
-  "devDependencies": {
+    },
-    "@flarum/prettier-config": "^1.0.0",
+    "devDependencies": {
-    "flarum-tsconfig": "^1.0.2",
+        "@flarum/prettier-config": "^1.0.0",
-    "prettier": "^2.5.1"
+        "flarum-tsconfig": "^1.0.2",
-  }
+        "prettier": "^2.5.1",
+        "flarum-webpack-config": "^2.0.0",
+        "webpack": "^5.65.0",
+        "webpack-cli": "^4.9.1",
+        "typescript": "^4.5.4",
+        "typescript-coverage-report": "^0.6.1"
+    }
 }

extensions/pusher/js/tsconfig.json

@@ -1,13 +1,16 @@
 {
+  // Use Flarum's tsconfig as a starting point
   "extends": "flarum-tsconfig",
-  "include": ["src/**/*", "../vendor/flarum/core/js/dist-typings/@types/**/*"],
+  // This will match all .ts, .tsx, .d.ts, .js, .jsx files in your `src` folder
-  "files": ["shims.d.ts"],
+  // and also tells your Typescript server to read core's global typings for
+  // access to `dayjs` and `$` in the global namespace.
+  "include": ["src/**/*", "../vendor/flarum/core/js/dist-typings/@types/**/*", "@types/**/*"],
   "compilerOptions": {
+    // This will output typings to `dist-typings`
     "declarationDir": "./dist-typings",
     "baseUrl": ".",
     "paths": {
       "flarum/*": ["../vendor/flarum/core/js/dist-typings/*"]
-    },
+    }
-    "module": "es2020"
   }
 }

extensions/pusher/js/webpack.config.js

@@ -1,3 +1 @@
-const config = require('flarum-webpack-config');
+module.exports = require('flarum-webpack-config')();
-
-module.exports = config();