@airfleet/generator-init 0.37.0 → 0.39.0

package/generators/project/index.js

@@ -31,32 +31,23 @@ export default class extends Generator {
     await this._copyTheme();
     this._fixHusky();
     await this._installTheme();
-    await this._handleBootstrap();
   }
 
   async _copyTheme() {
     const repository = this._themeRepository();
     const themeFolder = this._themeFolder();
-    await this.spawnCommand('git', ['clone', '--depth=1', repository, themeFolder]);
+    await this.spawnCommand("git", [
+      "clone",
+      "--depth=1",
+      repository,
+      themeFolder,
+    ]);
     this._deleteFolder(`${themeFolder}/.git`);
   }
 
-  async _handleBootstrap() {
-    const themeFolder = this._themeFolder();
-
-    if (this.answers.addBootstrap) {
-      this._deleteFolder(`${themeFolder}/assets`);
-      this._moveFolder(`${themeFolder}/assets-bootstrap`, `${themeFolder}/assets`);
-      this._deleteFolder(`${themeFolder}/assets-bootstrap`);
-    } else {
-      this._deleteFolder(`${themeFolder}/assets-bootstrap`);
-      await this._spawnThemeCommand('npm', ['uninstall', "@popperjs/core", "bootstrap", "--save"]);
-    }
-  }
-
   async _installTheme() {
-    await this._spawnThemeCommand('composer', ['install']);
-    await this._spawnThemeCommand('npm', ['install']);
+    await this._spawnThemeCommand("composer", ["install"]);
+    await this._spawnThemeCommand("bun", ["install"]);
   }
 
   _fixHusky() {
@@ -64,7 +55,7 @@ export default class extends Generator {
     const packageJsonPath = `${this._themeFolder()}/package.json`;
     const packageJson = this.readDestinationJSON(packageJsonPath);
 
-    packageJson.scripts.prepare = "cd .. && cd .. && cd .. && husky install";
+    packageJson.scripts.prepare = "cd .. && cd .. && cd .. && husky";
     this.writeDestinationJSON(packageJsonPath, packageJson);
   }
 
@@ -79,7 +70,7 @@ export default class extends Generator {
   }
 
   _moveFolder(source, destination) {
-    this.moveDestination(source, destination, { globOptions: {dot: true} });
+    this.moveDestination(source, destination, { globOptions: { dot: true } });
   }
 
   _deleteFolder(path) {
@@ -88,7 +79,9 @@ export default class extends Generator {
     this.deleteDestination(`${path}/**/*`);
   }
 
-  async _spawnThemeCommand(command, params ) {
-    return await this.spawnCommand(command, params, { cwd: this.destinationPath(this._themeFolder())});
+  async _spawnThemeCommand(command, params) {
+    return await this.spawnCommand(command, params, {
+      cwd: this.destinationPath(this._themeFolder()),
+    });
   }
 }

package/generators/project/info.js

@@ -24,8 +24,8 @@ export default class {
             " - Navigated to the project folder on the command line",
             "",
             "Requirements for running the theme:",
-            " - Node >= 16",
-            " - PHP 8.2",
+            " - Node >= 24",
+            " - PHP 8.3",
             " - Composer 2",
             " - Required WP plugins (see the theme Notion docs)",
             "",

package/generators/project/prompts.js

@@ -13,8 +13,7 @@ export default class {
       repository: undefined,
       productionUrl: undefined,
       stagingUrl: undefined,
-      addBootstrap: false,
-    }
+    };
     this.answers = {};
   }
 
@@ -25,7 +24,6 @@ export default class {
       this._repositoryPrompt(),
       this._productionUrlPrompt(),
       this._stagingUrlPrompt(),
-      this._addBootstrapPrompt(),
     ]);
 
     return this.answers;
@@ -46,7 +44,10 @@ export default class {
     return {
       type: "input",
       name: "title",
-      message: this._message(`What is the name of the project?`, `(e.g. "Zenity Website 2023")`),
+      message: this._message(
+        `What is the name of the project?`,
+        `(e.g. "Zenity Website 2023")`
+      ),
       validate: requiredText("Please enter a name"),
       default: this.defaults.title,
     };
@@ -66,7 +67,10 @@ export default class {
     return {
       type: "input",
       name: "repository",
-      message: this._message("What's the repository URL?", `(start with https and end with .git)`),
+      message: this._message(
+        "What's the repository URL?",
+        `(start with https and end with .git)`
+      ),
       validate: function requiredText(text) {
         if (!text) {
           return "Please enter the repository URL";
@@ -76,7 +80,7 @@ export default class {
 
         if (!matches) {
           return "Repository URL must start with https:// and end in .git";
-        };
+        }
 
         return true;
       },
@@ -101,14 +105,4 @@ export default class {
       default: this.defaults.stagingUrl,
     };
   }
-
-  _addBootstrapPrompt() {
-    return {
-      type: "confirm",
-      name: "addBootstrap",
-      message: this._message("Add Bootstrap?"),
-      default: this.defaults.addBootstrap,
-      store: true,
-    };
-  }
 }

package/generators/project/templates/.deployignore

@@ -12,7 +12,9 @@
 **/.airfleet-release
 **/.airfleet-license
 **/.airfleet-visible
+**/.browserslistrc
 **/.deployignore
+**/.dprint.json
 **/.editorconfig
 .editorconfig
 **/.env
@@ -24,6 +26,9 @@
 .gitignore
 **/.gitkeep
 **/.gitlab-ci.yml
+**/.lintstagedrc.json
+**/.node-version
+**/.oxlintrc.json
 **/.parcelrc
 **/.phpcscache
 **/.prettierignore
@@ -31,12 +36,15 @@
 **/.stylelintrc.js
 **/.stylelintrc.json
 **/.travis
+**/AGENTS.md
+**/bun.lock
 **/CHANGELOG
 **/CHANGELOG.md
 **/CODE_OF_CONDUCT
 **/CODE_OF_CONDUCT.md
 **/composer.json
 **/composer.lock
+**/globals.d.ts
 **/LICENSE
 **/LICENSE.md
 **/package-lock.json

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

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: 🚚 Get latest code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: ⚙️ Setup PHP
         uses: shivammathur/setup-php@v2
@@ -25,10 +25,8 @@ jobs:
           php-version: "8.2"
           ini-values: short_open_tag=1
 
-      - 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
@@ -36,11 +34,50 @@ 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
+
+    defaults:
+      run:
+        working-directory: ./wp-content/themes/airfleet-lightyear
+
+    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/templates/.husky/pre-commit

@@ -1,5 +1,2 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 cd wp-content/themes/airfleet-lightyear
-npx lint-staged
+bunx lint-staged

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

@@ -7,7 +7,7 @@
       "",
       "namespace Airfleet\\Themes\\Lightyear\\\\${TM_DIRECTORY/^.+[\\/\\\\]+(.*)$/$1/};",
       "",
-      "use Airfleet\\Themes\\Lightyear\\Vendor\\Airfleet\\Framework\\Features\\Feature;",
+      "use Airfleet\\Framework\\Features\\Feature;",
       "",
       "class $TM_FILENAME_BASE implements Feature {",
       "	public function initialize(): void {",
@@ -168,4 +168,4 @@
     ],
     "description": "Bootstrap a Blade template for a partial"
   }
-}
+}

package/generators/project/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.executablesFolder": "./wp-content/themes/airfleet-lightyear/vendor/bin/",
@@ -28,24 +29,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/templates/README.md.ejs

@@ -4,15 +4,6 @@
 
 <%= answers.description %>
 
-## Getting Started
-
-Navigate to the theme folder (`wp-content/themes/airfleet-lightyear`) and run:
-
-```bash
-composer install
-npm install
-```
-
 ## License
 
 © [Airfleet](https://www.airfleet.co/)

package/generators/project-plugin/index.js

@@ -10,7 +10,6 @@ import title from "../../utils/log/title.js";
 import highlightText from "../../utils/log/text/highlightText.js";
 import lines from "../../utils/log/text/lines.js";
 import infoBox from "../../utils/log/boxes/infoBox.js";
-import objectPropertyFromValue from '../../utils/objectPropertyFromValue.js';
 
 export default class extends Generator {
   async prompting() {
@@ -58,14 +57,40 @@ export default class extends Generator {
         name: "pluginPhpVersion",
         message: "What's the required PHP version?",
         validate: requiredText("Please enter the PHP version"),
-        default: ">=8.2",
+        default: ">=8.3",
       },
       {
         type: "input",
         name: "pluginNodeVersion",
         message: "What's the required Node version?",
         validate: requiredText("Please enter the Node version"),
-        default: ">=16",
+        default: ">=24",
+      },
+      {
+        type: "confirm",
+        name: "useScopedFramework",
+        message: "Use scoped framework?",
+        default: false,
+      },
+      {
+        type: "confirm",
+        name: "addScoper",
+        message: "Add scoper setup?",
+        default: false,
+      },
+      {
+        type: "confirm",
+        name: "hasDependencies",
+        message: "Specify plugin dependencies?",
+        default: true,
+      },
+      {
+        type: "input",
+        name: "dependencies",
+        message: "Plugin dependencies (comma separated slugs)",
+        default:
+          "advanced-custom-fields-pro, airfleet-framework, airfleet-views, airfleet-elements-core",
+        when: (answers) => answers.hasDependencies,
       },
       {
         type: "confirm",
@@ -91,11 +116,14 @@ export default class extends Generator {
       mainBranch: "main",
       year: new Date().getFullYear(),
       phpVersion: this._getPhpVersion(this.answers.pluginPhpVersion),
+      frameworkNamespace: this.answers.useScopedFramework
+        ? `Airfleet\\Plugins\\${this.nameNoAirfleet.pascal}\\Vendor\\Airfleet\\Framework\\`
+        : `Airfleet\\Framework\\`,
     };
   }
 
   writing() {
-    const templateExtension = this.answers.pluginUseBlade ? 'blade.php' : 'php';
+    const templateExtension = this.answers.pluginUseBlade ? "blade.php" : "php";
 
     const files = [
       ".github/workflows/create-asana-attachment.yaml",
@@ -161,20 +189,23 @@ export default class extends Generator {
       "views-elements/partials/button/ButtonSetup.php.ejs",
       "views-elements/.gitkeep",
       ".airfleet-release",
+      ".browserslistrc",
+      ".dprint.json",
       ".editorconfig",
       ".env",
       ".gitattributes",
+      ".lintstagedrc.json",
+      ".node-version.ejs",
+      ".oxlintrc.json",
       ".parcelrc",
-      ".prettierignore",
+      ".stylelintrc.json",
       "CHANGELOG.md",
-      "composer.json.ejs",
-      "composer-scoped.json.ejs",
+      "globals.d.ts",
       "index.php",
       "LICENSE.ejs",
       "package.json.ejs",
       "phpcs.xml.ejs",
       "README.md.ejs",
-      "scoper.custom.php.ejs",      
       ".deployignore",
     ];
     const templates = [
@@ -190,9 +221,14 @@ export default class extends Generator {
         isEnabled: true,
       },
       {
-        template: "plugin-name.php.ejs",
+        template: "plugin-name-scoped-framework.php.ejs",
         destination: `${this.name.slug}.php`,
-        isEnabled: true,
+        isEnabled: this.answers.useScopedFramework,
+      },
+      {
+        template: "plugin-name-unscoped-framework.php.ejs",
+        destination: `${this.name.slug}.php`,
+        isEnabled: !this.answers.useScopedFramework,
       },
       {
         template: "acf-json/.gitkeep",
@@ -204,17 +240,53 @@ export default class extends Generator {
         destination: ".vscode/airfleet.code-snippets",
         isEnabled: true,
       },
+      {
+        template: "composer-with-scoper.json.ejs",
+        destination: "composer.json",
+        isEnabled: this.answers.addScoper,
+      },
+      {
+        template: "composer-without-scoper.json.ejs",
+        destination: "composer.json",
+        isEnabled: !this.answers.addScoper,
+      },
+      {
+        template: "composer-scoped-empty.json.ejs",
+        destination: "composer-scoped.json",
+        isEnabled: this.answers.addScoper && !this.answers.useScopedFramework,
+      },
+      {
+        template: "composer-scoped-empty.lock.ejs",
+        destination: "composer-scoped.lock",
+        isEnabled: this.answers.addScoper && !this.answers.useScopedFramework,
+      },
+      {
+        template: "composer-scoped-framework.json.ejs",
+        destination: "composer-scoped.json",
+        isEnabled: this.answers.addScoper && this.answers.useScopedFramework,
+      },
+      {
+        template: "composer-scoped-framework.lock.ejs",
+        destination: "composer-scoped.lock",
+        isEnabled: this.answers.addScoper && this.answers.useScopedFramework,
+      },
+      {
+        template: "scoper.custom.php.ejs",
+        destination: "scoper.custom.php",
+        isEnabled: this.answers.addScoper,
+      },
     ];
 
     copyTemplates(this, templates, this.data);
   }
 
-  install() {
-    this.spawnCommand("composer", ["install"]);
+  async install() {
+    await this.spawnCommand("composer", ["install"]);
+    await this.spawnCommand("bun", ["install"]);
   }
 
   _getPhpVersion(pluginPhpVersion) {
-    const toFind = ['=','>'];
+    const toFind = ["=", ">"];
 
     for (const char of toFind) {
       const index = pluginPhpVersion.indexOf(char);
@@ -226,5 +298,4 @@ export default class extends Generator {
 
     return pluginPhpVersion;
   }
-
 }

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

@@ -0,0 +1,2 @@
+> 0.5% and last 2 versions
+not dead

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

@@ -15,7 +15,12 @@
 .airfleet-license
 **/.airfleet-visible
 .airfleet-visible
+**/.browserslistrc
+.browserslistrc
 **/.deployignore
+.deployignore
+**/.dprint.json
+.dprint.json
 **/.editorconfig
 .editorconfig
 **/.env
@@ -24,20 +29,51 @@
 **/.eslintrc.js
 **/.gitattributes
 .gitattributes
+**/.gitignore
+.gitignore
+**/.gitkeep
+.gitkeep
+**/.lintstagedrc.json
+.lintstagedrc.json
+**/.node-version
+.node-version
+**/.oxlintrc.json
+.oxlintrc.json
 **/.parcelrc
 .parcelrc
+**/.phpcscache
+.phpcscache
 **/.prettierignore
 .prettierignore
+**/.stylelintcache
+.stylelintcache
+**/.stylelintrc.js
+.stylelintrc.js
+**/.stylelintrc.json
+.stylelintrc.json
+**/.travis
+**/AGENTS.md
+AGENTS.md
+**/bun.lock
+bun.lock
+**/CHANGELOG
+CHANGELOG
 **/CHANGELOG.md
 CHANGELOG.md
+**/CODE_OF_CONDUCT
+**/CODE_OF_CONDUCT.md
+**/globals.d.ts
+globals.d.ts
 **/LICENSE
 LICENSE
+**/LICENSE.md
+**/phpcs.xml
+phpcs.xml
+**/README
 **/README.md
 README.md
 **/*.md
 *.md
-**/.gitignore
-.gitignore
 **/package.json
 package.json
 **/composer-scoped.json
@@ -50,11 +86,5 @@ composer.json
 composer.lock
 **/package-lock.json
 package-lock.json
-**/phpcs.xml
-phpcs.xml
 **/scoper.custom.php
 scoper.custom.php
-
-
-
-

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

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