@airfleet/generator-init 0.38.0 → 0.39.1

package/generators/project-plugin/templates/.github/workflows/test-wordpress.yml

@@ -2,7 +2,7 @@ name: 🧪 Test
 
 on:
   push:
-    branches: ["staging", "development"]
+    branches: ["main", "staging", "development"]
   pull_request:
     branches: ["main", "staging", "development"]
   workflow_dispatch:
@@ -13,20 +13,16 @@ jobs:
 
     steps:
       - name: 🚚 Get latest code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: ⚙️ Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: "8.2"
           ini-values: short_open_tag=1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: ⚙️ Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
+      - name: ⚙️ Install bun
+        uses: oven-sh/setup-bun@v2
 
       - name: 🔨 Increase composer timeout
         run: composer --global config process-timeout 1500
@@ -34,11 +30,46 @@ jobs:
       - name: 🔨 Composer install
         run: composer install --prefer-dist --no-ansi --no-interaction --no-progress --optimize-autoloader
 
-      - name: 🔨 npm install
-        run: npm ci
+      - name: 🔨 Bun install
+        run: bun ci
+
+      - name: 🔬 Lint
+        run: bun run --if-present lint
 
       - name: 🔬 Test
-        run: npm test
+        run: bun run --if-present test
 
       - name: 📦 Build
-        run: npm run build --if-present
+        run: bun run --if-present build
+
+  test-php:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        php-versions: ["8.2", "8.3", "8.4", "8.5"]
+
+    steps:
+      - name: 🚚 Get latest code
+        uses: actions/checkout@v6
+
+      - name: ⚙️ Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "${{ matrix.php-versions }}"
+          ini-values: short_open_tag=1
+
+      - name: ⚙️ Install bun
+        uses: oven-sh/setup-bun@v2
+
+      - name: 🔨 Increase composer timeout
+        run: composer --global config process-timeout 1500
+
+      - name: 🔨 Composer install
+        run: composer install --prefer-dist --no-ansi --no-interaction --no-progress --optimize-autoloader
+
+      - name: 🔨 Bun install
+        run: bun ci
+
+      - name: 🔬 Lint
+        run: bun run lint --php

package/generators/project-plugin/templates/.husky/pre-commit

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npx lint-staged
+bunx lint-staged

package/generators/project-plugin/templates/.lintstagedrc.json

@@ -0,0 +1,12 @@
+{
+  "*.{js,mjs,cjs,jsx,ts,mts,cts,tsx}": ["oxlint --fix", "dprint fmt"],
+  "*.{json,jsonc,md,yaml,yml}": "dprint fmt",
+  "*.{css,scss}": [
+    "stylelint --cache --ignore-path .gitignore --allow-empty-input --fix",
+    "dprint fmt"
+  ],
+  "*.php": [
+    "composer exec phpcbf",
+    "composer exec \"parallel-lint . --show-deprecated --exclude .git --exclude .parcel-cache --exclude dist --exclude node_modules --exclude wp-content --exclude vendor --exclude vendor-scoped\""
+  ]
+}

package/generators/project-plugin/templates/.node-version.ejs

@@ -0,0 +1 @@
+<%- answers.pluginNodeVersion %>

package/generators/project-plugin/templates/.oxlintrc.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["./node_modules/@airfleet/wordpress-dev/config/.oxlintrc.json"]
+}

package/generators/project-plugin/templates/.parcelrc

@@ -1,4 +1,3 @@
 {
-  "extends": "@parcel/config-default",
-  "reporters": ["...", "parcel-reporter-bundle-manifest"]
+  "extends": "./node_modules/@airfleet/wordpress-dev/config/.parcelrc"
 }

package/generators/project-plugin/templates/.stylelintrc.json

@@ -0,0 +1,4 @@
+{
+  "extends": ["@airfleet/stylelint-config-wordpress"],
+  "ignoreFiles": ["**/_figma-variables.scss"]
+}

package/generators/project-plugin/templates/.vscode/airfleet.code-snippets.ejs

@@ -7,7 +7,11 @@
       "",
       "namespace Airfleet\\Plugins\\<%= nameNoAirfleet.pascal %>\\\\${TM_DIRECTORY/^.+[\\/\\\\]+(.*)$/$1/};",
       "",
+      <%_ if (answers.addScoper) { _%>
       "use Airfleet\\Plugins\\<%= nameNoAirfleet.pascal %>\\Vendor\\Airfleet\\Framework\\Features\\BasePluginFeature;",
+      <% } else { %>,
+      "use Airfleet\\Framework\\Features\\BasePluginFeature;",
+      <% } _%>
       "",
       "class $TM_FILENAME_BASE extends BasePluginFeature {",
       "	public function initialize(): void {",
@@ -181,4 +185,4 @@
     ],
     "description": "Bootstrap a Blade template for a partial"
   }
-}
+}

package/generators/project-plugin/templates/.vscode/settings.json

@@ -1,8 +1,9 @@
 {
   "editor.codeActionsOnSave": {
     "source.fixAll": "explicit",
-    "source.fixAll.eslint": "explicit"
+    "source.fixAll.oxc": "explicit"
   },
+  "editor.defaultFormatter": "dprint.dprint",
   "editor.formatOnSave": true,
   "stylelint.validate": ["css", "scss", "postcss"],
   "phpSniffer.autoDetect": true,
@@ -10,24 +11,33 @@
     "editor.defaultFormatter": "wongjn.php-sniffer"
   },
   "[javascript]": {
-    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+    "editor.defaultFormatter": "dprint.dprint"
   },
   "[javascriptreact]": {
-    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+    "editor.defaultFormatter": "dprint.dprint"
   },
   "[typescript]": {
-    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+    "editor.defaultFormatter": "dprint.dprint"
   },
   "[typescriptreact]": {
-    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+    "editor.defaultFormatter": "dprint.dprint"
   },
   "[postcss]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "dprint.dprint"
   },
   "[scss]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "dprint.dprint"
   },
   "[css]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "dprint.dprint"
+  },
+  "[json]": {
+    "editor.defaultFormatter": "dprint.dprint"
+  },
+  "[yaml]": {
+    "editor.defaultFormatter": "dprint.dprint"
+  },
+  "[markdown]": {
+    "editor.defaultFormatter": "dprint.dprint"
   }
 }

package/generators/project-plugin/templates/README.md.ejs

@@ -4,13 +4,6 @@
 
 <%= answers.pluginDescription %>
 
-## Getting Started
-
-```bash
-composer install
-npm install
-```
-
 ## License
 
 © [Airfleet](https://www.airfleet.co/)

package/generators/project-plugin/templates/assets/admin/styles/admin.entry.scss

@@ -1,2 +1,2 @@
-@import '../../shared/styles/root';
-@import '../../shared/styles/shared';
+@use "../../shared/styles/root";
+@use "../../shared/styles/shared";

package/generators/project-plugin/templates/assets/editor/styles/editor.entry.scss

@@ -1,6 +1,8 @@
-@import '../../shared/styles/lib';
-@import '../../frontend/styles/root';
-@import '../../frontend/styles/placeholders';
+@use "../../shared/styles/lib";
+@use "../../frontend/styles/root";
+@use "../../frontend/styles/placeholders";
+@use "../../frontend/styles/main";
+@include placeholders.placeholders;
 
 @mixin fix-editor-conflicts {
   p {
@@ -12,12 +14,11 @@
 }
 
 :where(.acf-block-preview) {
-  /* stylelint-disable-next-line no-invalid-position-at-import-rule */
-  @import '../../frontend/styles/main';
+  @include main.main;
 
   // ! Theme body
-  @include theme-body-styles();
+  @include lib.theme-body-styles;
 
   // ! Editor overrides
-  @include fix-editor-conflicts();
+  @include fix-editor-conflicts;
 }

package/generators/project-plugin/templates/assets/frontend/styles/_main.scss

@@ -1,3 +1,7 @@
-// ! Import main styles
-@import 'main/reset';
-@import 'main/body';
+@use "main/reset" as *;
+@use "main/body" as *;
+
+@mixin main() {
+  @include reset;
+  @include body;
+}

package/generators/project-plugin/templates/assets/frontend/styles/_placeholders.scss

@@ -1,3 +1,9 @@
-@import 'placeholders/sections';
-@import 'placeholders/button';
-@import 'placeholders/container';
+@use "placeholders/sections" as *;
+@use "placeholders/button" as *;
+@use "placeholders/container" as *;
+
+@mixin placeholders() {
+  @include section;
+  @include button;
+  @include container;
+}

package/generators/project-plugin/templates/assets/frontend/styles/_root.scss

@@ -1,4 +1,4 @@
 // ! Imports that should be at the root/top of the styles
 // ! These cannot be scoped under other selectors
-@import 'root/fonts';
-@import '../../shared/styles/root';
+@use "root/fonts";
+@use "../../shared/styles/root";

package/generators/project-plugin/templates/assets/frontend/styles/critical.entry.scss

@@ -1 +1 @@
-@import '../../shared/styles/lib';
+@use "../../shared/styles/lib";

package/generators/project-plugin/templates/assets/frontend/styles/index.entry.scss

@@ -1,6 +1,8 @@
 // ! For variables and mixins, check the shared lib folder
-@import '../../shared/styles/lib';
-@import 'root';
-@import '../../shared/styles/shared';
-@import 'main';
-@import 'placeholders';
+@use "../../shared/styles/lib";
+@use "root";
+@use "../../shared/styles/shared";
+@use "main";
+@use "placeholders";
+@include main.main;
+@include placeholders.placeholders;

package/generators/project-plugin/templates/assets/frontend/styles/main/_body.scss

@@ -1,6 +1,8 @@
-@import '../../../shared/styles/lib';
+@use "../../../shared/styles/lib";
 
-body {
-  // ! Update the styles inside the mixin instead of adding them here! This will ensure editor previews look consistent.
-  @include theme-body-styles();
+@mixin body() {
+  body {
+    // ! Update the styles inside the mixin instead of adding them here! This will ensure editor previews look consistent.
+    @include lib.theme-body-styles;
+  }
 }

package/generators/project-plugin/templates/assets/frontend/styles/main/_reset.scss

@@ -1,121 +1,123 @@
 // ! This file is for global resets that are independent of project
-@import '../../../shared/styles/lib';
+@use "../../../shared/styles/lib";
 
-* {
-  margin: 0;
-}
+@mixin reset() {
+  * {
+    margin: 0;
+  }
 
-*,
-*::before,
-*::after {
-  box-sizing: border-box;
-}
+  *,
+  *::before,
+  *::after {
+    box-sizing: border-box;
+  }
 
-body {
-  /* stylelint-disable-next-line plugin/no-unsupported-browser-features */
-  text-size-adjust: 100%;
-  -webkit-tap-highlight-color: transparent;
-  -webkit-font-smoothing: antialiased;
-  min-height: 100vh;
-  line-height: 1.4;
-}
+  body {
+    /* stylelint-disable-next-line plugin/no-unsupported-browser-features */
+    text-size-adjust: 100%;
+    -webkit-tap-highlight-color: transparent;
+    -webkit-font-smoothing: antialiased;
+    min-height: 100vh;
+    line-height: 1.4;
+  }
 
-ul[role='list'],
-ol[role='list'] {
-  list-style: none;
-}
+  ul[role="list"],
+  ol[role="list"] {
+    list-style: none;
+  }
 
-:where(h1, h2, h3, h4, button, input, label) {
-  line-height: 1.1;
-}
+  :where(h1, h2, h3, h4, button, input, label) {
+    line-height: 1.1;
+  }
 
-p,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  overflow-wrap: break-word;
-}
+  p,
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    overflow-wrap: break-word;
+  }
 
-p {
-  text-wrap: pretty;
-}
+  p {
+    text-wrap: pretty;
+  }
 
-a:not([class]) {
-  text-decoration-skip-ink: auto;
-  color: currentcolor;
-}
+  a:not([class]) {
+    text-decoration-skip-ink: auto;
+    color: currentcolor;
+  }
 
-video,
-canvas,
-svg,
-img,
-picture {
-  max-width: 100%;
-  display: block;
-}
+  video,
+  canvas,
+  svg,
+  img,
+  picture {
+    max-width: 100%;
+    display: block;
+  }
 
-img {
-  height: auto;
-}
+  img {
+    height: auto;
+  }
 
-input,
-button,
-textarea,
-select {
-  font-family: inherit;
-  font-size: inherit;
-}
+  input,
+  button,
+  textarea,
+  select {
+    font-family: inherit;
+    font-size: inherit;
+  }
 
-textarea {
-  /* stylelint-disable-next-line plugin/no-unsupported-browser-features */
-  resize: vertical;
+  textarea {
+    /* stylelint-disable-next-line plugin/no-unsupported-browser-features */
+    resize: vertical;
 
-  &:not([rows]) {
-    min-height: 10em;
+    &:not([rows]) {
+      min-height: 10em;
+    }
   }
-}
 
-fieldset {
-  min-width: 0;
-  padding: 0;
-  border: 0;
-}
+  fieldset {
+    min-width: 0;
+    padding: 0;
+    border: 0;
+  }
 
-b,
-strong {
-  font-weight: bolder;
-}
+  b,
+  strong {
+    font-weight: bolder;
+  }
 
-table {
-  caption-side: bottom;
-  border-collapse: collapse;
-}
+  table {
+    caption-side: bottom;
+    border-collapse: collapse;
+  }
 
-iframe {
-  border: 0;
-}
+  iframe {
+    border: 0;
+  }
 
-label {
-  display: inline-block;
-}
+  label {
+    display: inline-block;
+  }
 
-[type='search'] {
-  appearance: textfield;
-  outline-offset: -2px;
-}
+  [type="search"] {
+    appearance: textfield;
+    outline-offset: -2px;
+  }
 
-[hidden] {
-  display: none;
-}
+  [hidden] {
+    display: none;
+  }
 
-:target {
-  scroll-margin-block: 5ex;
-}
+  :target {
+    scroll-margin-block: 5ex;
+  }
 
-::placeholder {
-  color: inherit;
-  opacity: 1;
+  ::placeholder {
+    color: inherit;
+    opacity: 1;
+  }
 }

package/generators/project-plugin/templates/assets/frontend/styles/placeholders/_button.scss

@@ -1,43 +1,45 @@
-:root {
-  // Default
-  --afs-button-font-size: 1rem;
-  --afs-button-padding-x: 16px;
-  --afs-button-padding-y: 6px;
-  --afs-button-border-width: 1px;
-  --afs-button-border-style: solid;
-  --afs-button-border-color: #ccc;
-  --afs-button-border-color-hover: #3a3a3a;
-  --afs-button-border-radius: 4px;
-  --afs-button-text-color: #000;
-  --afs-button-text-color-hover: #fff;
-  --afs-button-background: #fff;
-  --afs-button-background-hover: #3a3a3a;
+@mixin button() {
+  :root {
+    // Default
+    --afs-button-font-size: 1rem;
+    --afs-button-padding-x: 16px;
+    --afs-button-padding-y: 6px;
+    --afs-button-border-width: 1px;
+    --afs-button-border-style: solid;
+    --afs-button-border-color: #ccc;
+    --afs-button-border-color-hover: #3a3a3a;
+    --afs-button-border-radius: 4px;
+    --afs-button-text-color: #000;
+    --afs-button-text-color-hover: #fff;
+    --afs-button-background: #fff;
+    --afs-button-background-hover: #3a3a3a;
 
-  // Primary
-  --afs-button-primary-font-size: var(--afs-button-font-size);
-  --afs-button-primary-padding-x: var(--afs-button-padding-x);
-  --afs-button-primary-padding-y: var(--afs-button-padding-y);
-  --afs-button-primary-border-width: var(--afs-button-border-width);
-  --afs-button-primary-border-style: var(--afs-button-border-style);
-  --afs-button-primary-border-radius: var(--afs-button-border-radius);
-  --afs-button-primary-border-color: #a9b1b2;
-  --afs-button-primary-border-color-hover: #ccc;
-  --afs-button-primary-text-color: #000;
-  --afs-button-primary-text-color-hover: #000;
-  --afs-button-primary-background: #fff;
-  --afs-button-primary-background-hover: #ccc;
+    // Primary
+    --afs-button-primary-font-size: var(--afs-button-font-size);
+    --afs-button-primary-padding-x: var(--afs-button-padding-x);
+    --afs-button-primary-padding-y: var(--afs-button-padding-y);
+    --afs-button-primary-border-width: var(--afs-button-border-width);
+    --afs-button-primary-border-style: var(--afs-button-border-style);
+    --afs-button-primary-border-radius: var(--afs-button-border-radius);
+    --afs-button-primary-border-color: #a9b1b2;
+    --afs-button-primary-border-color-hover: #ccc;
+    --afs-button-primary-text-color: #000;
+    --afs-button-primary-text-color-hover: #000;
+    --afs-button-primary-background: #fff;
+    --afs-button-primary-background-hover: #ccc;
 
-  // Secondary
-  --afs-button-secondary-font-size: var(--afs-button-font-size);
-  --afs-button-secondary-padding-x: var(--afs-button-padding-x);
-  --afs-button-secondary-padding-y: var(--afs-button-padding-y);
-  --afs-button-secondary-border-width: var(--afs-button-border-width);
-  --afs-button-secondary-border-style: var(--afs-button-border-style);
-  --afs-button-secondary-border-radius: var(--afs-button-border-radius);
-  --afs-button-secondary-border-color: #30387d;
-  --afs-button-secondary-border-color-hover: #ccc;
-  --afs-button-secondary-text-color: #000;
-  --afs-button-secondary-text-color-hover: #000;
-  --afs-button-secondary-background: #fff;
-  --afs-button-secondary-background-hover: #ccc;
+    // Secondary
+    --afs-button-secondary-font-size: var(--afs-button-font-size);
+    --afs-button-secondary-padding-x: var(--afs-button-padding-x);
+    --afs-button-secondary-padding-y: var(--afs-button-padding-y);
+    --afs-button-secondary-border-width: var(--afs-button-border-width);
+    --afs-button-secondary-border-style: var(--afs-button-border-style);
+    --afs-button-secondary-border-radius: var(--afs-button-border-radius);
+    --afs-button-secondary-border-color: #30387d;
+    --afs-button-secondary-border-color-hover: #ccc;
+    --afs-button-secondary-text-color: #000;
+    --afs-button-secondary-text-color-hover: #000;
+    --afs-button-secondary-background: #fff;
+    --afs-button-secondary-background-hover: #ccc;
+  }
 }

package/generators/project-plugin/templates/assets/frontend/styles/placeholders/_container.scss

@@ -1,12 +1,14 @@
-:root {
-  --afs-container-max-width: 1200px;
-  --afs-container-padding-x: 40px;
-}
+@mixin container() {
+  :root {
+    --afs-container-max-width: 1200px;
+    --afs-container-padding-x: 40px;
+  }
 
-.container {
-  margin-inline: auto;
-  max-width: calc(
-    var(--afs-container-max-width) + var(--afs-container-padding-x)
-  );
-  padding-inline: calc(var(--afs-container-padding-x) * 0.5);
+  .container {
+    margin-inline: auto;
+    max-width: calc(
+      var(--afs-container-max-width) + var(--afs-container-padding-x)
+    );
+    padding-inline: calc(var(--afs-container-padding-x) * 0.5);
+  }
 }

package/generators/project-plugin/templates/assets/frontend/styles/placeholders/_sections.scss

@@ -1,6 +1,8 @@
-[style*='wp-block-airfleet-elements'],
-section {
-  &:nth-child(odd) {
-    background-color: var(--afa-color-neutral-150);
+@mixin section() {
+  [style*="wp-block-airfleet-elements"],
+  section {
+    &:nth-child(odd) {
+      background-color: var(--afa-color-neutral-150);
+    }
   }
 }