chore: flarum-cli audit infra --fix

extensions/nicknames/.editorconfig

@@ -1,4 +1,3 @@
-
 # EditorConfig helps developers define and maintain consistent
 # coding styles between different editors and IDEs
 # editorconfig.org
@@ -16,5 +15,5 @@ indent_size = 2
 [*.{diff,md}]
 trim_trailing_whitespace = false
 
-[*.php]
+[*.{php,xml,json}]
 indent_size = 4

extensions/nicknames/.gitattributes

@@ -1,7 +1,18 @@
 .gitattributes export-ignore
 .gitignore export-ignore
+.gitmodules export-ignore
+.github export-ignore
+.travis export-ignore
 .travis.yml export-ignore
-js/src export-ignore
-.git* export-ignore
+.editorconfig export-ignore
+.styleci.yml export-ignore
 
-js/dist/*.js -diff
+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/nicknames/.github/workflows/backend.yml

@@ -0,0 +1,15 @@
+name: Nicknames 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: true
+
+      backend_directory: .

extensions/nicknames/.github/workflows/build.yml

@@ -1,16 +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/nicknames/.github/workflows/frontend.yml

@@ -0,0 +1,21 @@
+name: Nicknames 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: false
+
+      frontend_directory: ./js
+      main_git_branch: master
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

extensions/nicknames/.github/workflows/test.yml

@@ -1,78 +0,0 @@
-name: Tests
-
-on: [push, pull_request]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        php: [7.3, 7.4, '8.0']
-        service: ['mysql:5.7', mariadb]
-        prefix: ['', flarum_]
-
-        include:
-          - service: 'mysql:5.7'
-            db: MySQL
-          - service: mariadb
-            db: MariaDB
-          - prefix: flarum_
-            prefixStr: (prefix)
-
-        exclude:
-          - php: 7.3
-            service: 'mysql:5.7'
-            prefix: flarum_
-          - php: 7.3
-            service: mariadb
-            prefix: flarum_
-          - php: 8.0
-            service: 'mysql:5.7'
-            prefix: flarum_
-          - php: 8.0
-            service: mariadb
-            prefix: flarum_
-
-    services:
-      mysql:
-        image: ${{ matrix.service }}
-        ports:
-          - 13306:3306
-
-    name: 'PHP ${{ matrix.php }} / ${{ matrix.db }} ${{ matrix.prefixStr }}'
-
-    steps:
-      - uses: actions/checkout@master
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          coverage: xdebug
-          extensions: curl, dom, gd, json, mbstring, openssl, pdo_mysql, tokenizer, zip
-          tools: phpunit, composer:v2
-
-      # The authentication alter is necessary because newer mysql versions use the `caching_sha2_password` driver,
-      # which isn't supported prior to PHP7.4
-      # When we drop support for PHP7.3, we should remove this from the setup.
-      - name: Create MySQL Database
-        run: |
-          sudo systemctl start mysql
-          mysql -uroot -proot -e 'CREATE DATABASE flarum_test;' --port 13306
-          mysql -uroot -proot -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'root';" --port 13306
-
-      - name: Install Composer dependencies
-        run: composer install
-
-      - name: Setup Composer tests
-        run: composer test:setup
-        env:
-          DB_PORT: 13306
-          DB_PASSWORD: root
-          DB_PREFIX: ${{ matrix.prefix }}
-
-      - name: Run Composer tests
-        run: composer test
-        env:
-          COMPOSER_PROCESS_TIMEOUT: 600

extensions/nicknames/.gitignore

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

extensions/nicknames/composer.json

@@ -1,56 +1,79 @@
 {
-  "name": "flarum/nicknames",
-  "description": "Allow users to set nicknames.",
-  "type": "flarum-extension",
-  "keywords": [
-    "nicknames"
-  ],
-  "license": "MIT",
-  "support": {
-    "issues": "https://github.com/flarum/core/issues",
-    "source": "https://github.com/flarum/nicknames",
-    "forum": "https://discuss.flarum.org"
-  },
-  "homepage": "https://flarum.org",
-  "funding": [
-    {
-      "type": "website",
-      "url": "https://flarum.org/donate/"
-    }
-  ],
-  "require": {
-    "flarum/core": "^1.1"
-  },
-  "autoload": {
-    "psr-4": {
-      "Flarum\\Nicknames\\": "src/"
-    }
-  },
-  "extra": {
-    "branch-alias": {
-      "dev-master": "1.x-dev"
-    },
-    "flarum-extension": {
-      "title": "Nicknames",
-      "category": "feature",
-      "icon": {
-        "name": "fas fa-user-tag",
-        "backgroundColor": "#8E4529",
-        "color": "#ffffff"
-      }
-    }
-  },
-  "scripts": {
-    "test": [
-      "@test:unit",
-      "@test:integration"
+    "name": "flarum/nicknames",
+    "description": "Allow users to set nicknames.",
+    "type": "flarum-extension",
+    "keywords": [
+        "nicknames"
     ],
-    "test:unit": "phpunit -c tests/phpunit.unit.xml",
-    "test:integration": "phpunit -c tests/phpunit.integration.xml",
-    "test:setup": "@php tests/integration/setup.php"
-  },
-  "require-dev": {
-    "flarum/testing": "^1.0",
-    "flarum/core": "1.x-dev"
-  }
+    "license": "MIT",
+    "support": {
+        "issues": "https://github.com/flarum/core/issues",
+        "source": "https://github.com/flarum/nicknames",
+        "forum": "https://discuss.flarum.org"
+    },
+    "homepage": "https://flarum.org",
+    "funding": [
+        {
+            "type": "website",
+            "url": "https://flarum.org/donate/"
+        }
+    ],
+    "require": {
+        "flarum/core": "^1.1"
+    },
+    "autoload": {
+        "psr-4": {
+            "Flarum\\Nicknames\\": "src/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.x-dev"
+        },
+        "flarum-extension": {
+            "title": "Nicknames",
+            "category": "feature",
+            "icon": {
+                "name": "fas fa-user-tag",
+                "backgroundColor": "#8E4529",
+                "color": "#ffffff"
+            }
+        },
+        "flarum-cli": {
+            "modules": {
+                "admin": true,
+                "forum": true,
+                "js": true,
+                "jsCommon": false,
+                "css": false,
+                "gitConf": true,
+                "githubActions": true,
+                "prettier": true,
+                "typescript": false,
+                "bundlewatch": false,
+                "backendTesting": true,
+                "editorConfig": true,
+                "styleci": true
+            }
+        }
+    },
+    "scripts": {
+        "test": [
+            "@test:unit",
+            "@test:integration"
+        ],
+        "test:unit": "phpunit -c tests/phpunit.unit.xml",
+        "test:integration": "phpunit -c tests/phpunit.integration.xml",
+        "test:setup": "@php tests/integration/setup.php"
+    },
+    "require-dev": {
+        "flarum/testing": "^1.0.0",
+        "flarum/core": "1.x-dev"
+    },
+    "scripts-descriptions": {
+        "test": "Runs all tests.",
+        "test:unit": "Runs all unit tests.",
+        "test:integration": "Runs all integration tests.",
+        "test:setup": "Sets up a database for use with integration tests. Execute this only once."
+    }
 }

extensions/nicknames/js/.gitignore

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

extensions/nicknames/js/package.json

@@ -1,22 +1,20 @@
 {
-  "name": "@flarum/nicknames",
-  "version": "0.0.0",
-  "private": true,
-  "prettier": "@flarum/prettier-config",
-  "dependencies": {
-    "@flarum/prettier-config": "^1.0.0",
-    "flarum-tsconfig": "^1.0.2",
-    "flarum-webpack-config": "^1.0.0",
-    "webpack": "^4.46.0",
-    "webpack-cli": "^4.9.1"
-  },
-  "devDependencies": {
-    "prettier": "^2.5.1"
-  },
-  "scripts": {
-    "dev": "webpack --mode development --watch",
-    "build": "webpack --mode production",
-    "format": "prettier --write src",
-    "format-check": "prettier --check src"
-  }
+    "name": "@flarum/nicknames",
+    "version": "0.0.0",
+    "private": true,
+    "prettier": "@flarum/prettier-config",
+    "devDependencies": {
+        "prettier": "^2.5.1",
+        "flarum-webpack-config": "^2.0.0",
+        "webpack": "^5.65.0",
+        "webpack-cli": "^4.9.1",
+        "@flarum/prettier-config": "^1.0.0"
+    },
+    "scripts": {
+        "dev": "webpack --mode development --watch",
+        "build": "webpack --mode production",
+        "format": "prettier --write src",
+        "format-check": "prettier --check src",
+        "analyze": "cross-env ANALYZER=true yarn build"
+    }
 }

extensions/nicknames/js/tsconfig.json

@@ -1,16 +0,0 @@
-{
-  // Use Flarum's tsconfig as a starting point
-  "extends": "flarum-tsconfig",
-  // This will match all .ts, .tsx, .d.ts, .js, .jsx files in your `src` folder
-  // 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/**/*"],
-  "compilerOptions": {
-    // This will output typings to `dist-typings`
-    "declarationDir": "./dist-typings",
-    "baseUrl": ".",
-    "paths": {
-      "flarum/*": ["../vendor/flarum/core/js/dist-typings/*"]
-    }
-  }
-}