Format generate-config.js using Prettier

Author: ethitter

.github/workflows/master.yml

@@ -23,6 +23,8 @@ jobs:
       - name: Install dependencies
         run: npm ci
       - name: Build config.yml
-        run: npm run build
+        run: |
+          npm run format
+          npm run build
       - name: Confirm committed config.yml matches built version
         run: git diff --exit-code

config.yml

@@ -604,7 +604,7 @@ vm_config:
   cores: 3
 general:
   db_backup: true
-  db_restore: true
+  db_restore: false
   db_share: false
 vagrant-plugins:
   disksize: 65GB

generate-config.js

@@ -1,104 +1,103 @@
-const fs = require('fs');
-const YAML = require('yaml');
+const fs = require("fs");
+const YAML = require("yaml");
 
-const configFileName = 'config.yml';
+const configFileName = "config.yml";
 const defaultPhpVersion = 7.4;
 
 console.info(`Generating ${configFileName}...`);
 
-const sitesConfig = require('./sites.json');
+const sitesConfig = require("./sites.json");
 
 const vvvConfig = {
   sites: {},
   utilities: {
     core: [
-      'tls-ca',
-      'phpmyadmin',
-      'memcached-admin',
-      'opcache-status',
-      'webgrind',
-      'php73',
-      'php74',
-      'php80',
+      "tls-ca",
+      "phpmyadmin",
+      "memcached-admin",
+      "opcache-status",
+      "webgrind",
+      "php73",
+      "php74",
+      "php80",
     ],
     pmc: [
-      'coretech',
+      "coretech",
       // 'dev-tools',
-      'http-concat',
-      'phpcs',
+      "http-concat",
+      "phpcs",
     ],
   },
-  'utility-sources': {
+  "utility-sources": {
     pmc: {
-      repo: '[email protected]:penske-media-corp/pmc-vvv-utilities.git',
-      branch: 'main',
+      repo: "[email protected]:penske-media-corp/pmc-vvv-utilities.git",
+      branch: "main",
     },
   },
-  'vm_config': {
+  vm_config: {
     memory: 4096,
     cores: 3,
   },
   general: {
-    'db_backup': true,
-    'db_restore': true,
-    'db_share': false,
+    db_backup: true,
+    db_restore: false,
+    db_share: false,
   },
-  'vagrant-plugins': {
-    disksize: '65GB',
+  "vagrant-plugins": {
+    disksize: "65GB",
   },
 };
 
-Object.entries(sitesConfig).forEach(
-  (entry) => {
-    const [ liveUrl, config ] = entry;
+Object.entries(sitesConfig).forEach((entry) => {
+  const [liveUrl, config] = entry;
 
-    if (! config.theme_repo) {
-      console.warn(` - Skipping ${liveUrl} due to misconfiguration`);
-      return;
-    }
+  if (!config.theme_repo) {
+    console.warn(` - Skipping ${liveUrl} due to misconfiguration`);
+    return;
+  }
 
-    const slugifiedUrl = liveUrl.replace(/\./g,'-');
+  const slugifiedUrl = liveUrl.replace(/\./g, "-");
 
-    const phpVersion = parseFloat(config.php_version ?? defaultPhpVersion).toFixed(1);
-    const nginxUpstream = `php${phpVersion}`.replace('.', '');
+  const phpVersion = parseFloat(
+    config.php_version ?? defaultPhpVersion
+  ).toFixed(1);
+  const nginxUpstream = `php${phpVersion}`.replace(".", "");
 
-    vvvConfig.sites[slugifiedUrl] = {
-      skip_provisioning: true,
-      description: liveUrl,
-      repo: config.provisioner_url ?? '[email protected]:penske-media-corp/pmc-vvv-site-provisioners.git',
-      branch: config.provisioner_branch ?? 'main',
-      hosts: [
-        `${slugifiedUrl}.test`,
-      ],
-      nginx_upstream: nginxUpstream,
-      custom: {
-        live_url: `https://${liveUrl}`,
-        site_title: `${config.site_title_prefix} (LOCAL)`,
-        admin_user: 'pmcdev',
-        admin_password: 'pmcdev',
-        pmc: {
-          theme_repo: config.theme_repo,
-          theme_slug: config.theme_slug ?? '',
-          parent_theme_slug: config.parent_theme_slug ?? '',
-          theme_dir_uses_vip: config.theme_dir_uses_vip ?? false,
-        }
-      }
-    };
-  }
-);
+  vvvConfig.sites[slugifiedUrl] = {
+    skip_provisioning: true,
+    description: liveUrl,
+    repo:
+      config.provisioner_url ??
+      "[email protected]:penske-media-corp/pmc-vvv-site-provisioners.git",
+    branch: config.provisioner_branch ?? "main",
+    hosts: [`${slugifiedUrl}.test`],
+    nginx_upstream: nginxUpstream,
+    custom: {
+      live_url: `https://${liveUrl}`,
+      site_title: `${config.site_title_prefix} (LOCAL)`,
+      admin_user: "pmcdev",
+      admin_password: "pmcdev",
+      pmc: {
+        theme_repo: config.theme_repo,
+        theme_slug: config.theme_slug ?? "",
+        parent_theme_slug: config.parent_theme_slug ?? "",
+        theme_dir_uses_vip: config.theme_dir_uses_vip ?? false,
+      },
+    },
+  };
+});
 
-vvvConfig.sites['wordpress-trunk'] = {
+vvvConfig.sites["wordpress-trunk"] = {
   skip_provisioning: true,
-  description: "An svn based WP Core trunk dev setup, useful for contributor days, Trac tickets, patches",
-  repo: 'https://github.com/Varying-Vagrant-Vagrants/custom-site-template-develop.git',
-  hosts: [
-    'trunk.wordpress.test',
-  ],
+  description:
+    "An svn based WP Core trunk dev setup, useful for contributor days, Trac tickets, patches",
+  repo: "https://github.com/Varying-Vagrant-Vagrants/custom-site-template-develop.git",
+  hosts: ["trunk.wordpress.test"],
 };
 
 fs.writeFileSync(
   configFileName,
   YAML.stringify(vvvConfig, null, { lineWidth: 0 })
 );
 
-console.info('Done!');
+console.info("Done!");

package-lock.json

@@ -1,8 +1,27 @@
 {
-  "dependencies": {
-    "yaml": "^2.1.1"
+  "name": "pmc-vvv",
+  "description": "Configuration repo for PMC's use of VVV.",
+  "version": "1.0.0",
+  "main": "generate-config.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/penske-media-corp/pmc-vvv.git"
+  },
+  "keywords": [
+    "VVV"
+  ],
+  "author": "Penske Media Corporation, LLC",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/penske-media-corp/pmc-vvv/issues"
   },
+  "homepage": "https://github.com/penske-media-corp/pmc-vvv#readme",
   "scripts": {
-    "build": "node generate-config.js"
+    "build": "node generate-config.js",
+    "format": "prettier --write generate-config.js"
+  },
+  "devDependencies": {
+    "prettier": "^2.7.1",
+    "yaml": "^2.1.1"
   }
 }