diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 88439ed..3b3a6ae 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,24 +2,21 @@ name: Build and deploy on: push: - branches: [main, master] + branches: [master] jobs: deploy: runs-on: ubuntu-latest - permissions: - contents: read - pages: write - id-token: write + contents: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Prepare environment - uses: actions/setup-node@v4 + uses: actions/setup-node@v3 with: - node-version: 22 + node-version: "18" - run: npm install --global pnpm @@ -29,6 +26,10 @@ jobs: - name: Build plugin(s) run: node ./build.mjs + # Foolproof feature: + # - Copies over README so that the root of the deployed website shows it + # - Changes 404 page to README so that you don't get lost while clicking links + # If you remove this step then you should probably remove the enable_jekyll option in the next one - name: Copy additional files run: | cp README.md dist/README.md @@ -36,14 +37,13 @@ jobs: printf -- "> **Note:** You accessed a link that returned a 404, probably by clicking one of the plugin links. You're supposed to copy the link address and add it into Vendetta.\n\n" >> dist/404.md cat README.md >> dist/404.md - - name: Setup Pages - uses: actions/configure-pages@v4 - - - name: Upload artifact - uses: actions/upload-pages-artifact@v3 - with: - path: ./dist - + # Documentation: https://github.com/peaceiris/actions-gh-pages - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v4 + uses: peaceiris/actions-gh-pages@v3 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./dist + # Makes it so the md files in the previous step get processed by GitHub Pages + enable_jekyll: true + # This creates the CNAME file required to host GitHub Pages on a custom domain + # cname: example.com diff --git a/package.json b/package.json index 750821e..188e53e 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "devDependencies": { "@rollup/plugin-commonjs": "^24.1.0", "@rollup/plugin-node-resolve": "^15.0.2", - "@swc/core": "^1.3.51", "@types/react": "^18.0.37", "@types/react-native": "^0.70.13", "@typescript-eslint/eslint-plugin": "^5.59.0", diff --git a/plugins/Commands/index.ts b/plugins/Commands/index.ts index 9285149..c550a1a 100644 --- a/plugins/Commands/index.ts +++ b/plugins/Commands/index.ts @@ -9,6 +9,7 @@ import { pluginListCommand, themeListCommand } from "./src/commands/lists"; import { petPetCommand } from "./src/commands/petpet"; import { konoSelfCommand, konoSendCommand } from "./src/commands/konochan"; import { firstMessageCommand } from "./src/commands/firstmessage"; +import { sysinfoCommand } from "./src/commands/sysinfo"; import settings from "./settings"; // Initialize storage with default values @@ -37,6 +38,7 @@ if (!storage.enabledCommands) { konoself: true, konosend: true, firstmessage: true, + sysinfo: true, // Add sysinfo to enabled commands }; } @@ -51,6 +53,7 @@ const commandMap = { konoself: konoSelfCommand, konosend: konoSendCommand, firstmessage: firstMessageCommand, + sysinfo: sysinfoCommand, // Add sysinfo to command map }; // Store registered commands for cleanup diff --git a/plugins/Commands/settings.tsx b/plugins/Commands/settings.tsx index 49e1642..5810c0c 100644 --- a/plugins/Commands/settings.tsx +++ b/plugins/Commands/settings.tsx @@ -217,7 +217,7 @@ export default function Settings() { {/* About */} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 2a603e8..38904c0 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,2 +1,6 @@ packages: - - plugins/* \ No newline at end of file + - plugins/* + +ignoredBuiltDependencies: + - '@swc/core' + - esbuild