generator-chisel 2.0.0-alpha.9 → 2.0.0

package/lib/commands/create/creators/app/chisel-starter-theme/views/partials/icons-preview.twig

@@ -0,0 +1,81 @@
+<section class="o-wrapper__inner c-icons-preview">
+  <h2>Icons preview</h2>
+
+
+  <article class="c-icons-preview__article">
+    <h3>Icons HTML usage example</h3>
+
+    <section class="c-icons-preview__section">
+      <h4 class="c-icons-preview__h4">Monochromatic</h4>
+      <div style="font-size: 2rem;">
+        {% include 'objects/icon.twig' with {name: 'chisel-logo', rectangle: true, alt: 'Chisel logo'} %}
+        {% include 'objects/icon.twig' with {name: 'x-logo', inline: true} %}
+        {% include 'objects/icon.twig' with {name: 'color-pallet', forceMono: true, inline: true} %}
+        {% include 'objects/icon.twig' with {name: 'chisel-icon', forceMono: true, inline: true} %}
+        <span style="font-size: 4rem">{% include 'objects/icon.twig' with {name: 'chisel-icon', forceMono: true, inline: true} %}</span>
+        <span style="display: inline-block;padding: 1rem; background: rgba(0, 0, 255, 20%);">
+          {% include 'objects/icon.twig' with {name: 'chisel-icon'} %}
+        </span>
+        <span style="display: inline-block; color: green">
+          {% include 'objects/icon.twig' with {name: 'chisel-icon'} %}
+        </span>
+        <span style="display: block; color: blue; font-size: 1.2rem; --o-icon-color: red; --o-icon-size: 2rem">
+          Blue text with red icon: {% include 'objects/icon.twig' with {name: 'chisel-icon', inline: true} %}
+        </span>
+      </div>
+    </section>
+
+    <section class="c-icons-preview__section">
+      <h4 class="c-icons-preview__h4">Multicolor</h4>
+      <div style="font-size: 2rem;">
+        {% include 'objects/icon.twig' with {name: 'color-chisel-logo', alt: 'Chisel logo ALT', rectangle: true, inline: true} %}
+        {% include 'objects/icon.twig' with {name: 'color-facebook-logo', inline: true} %}
+        {% include 'objects/icon.twig' with {name: 'color-chisel-icon', inline: true} %}
+        <span style="font-size: 4rem">
+          {% include 'objects/icon.twig' with {name: 'color-chisel-icon', inline: true} %}
+        </span>
+        <span style="display: inline-block;padding: 1rem; background: rgba(0, 0, 255, 20%);">
+          {% include 'objects/icon.twig' with {name: 'color-chisel-icon', inline: false} %}
+        </span>
+      </div>
+    </section>
+  </article>
+
+  <article class="c-icons-preview__article">
+    <h3>Icons CSS usage example</h3>
+
+    <section class="c-icons-preview__section">
+      <h4 class="c-icons-preview__h4">Monochromatic</h4>
+      <div style="font-size: 2rem;">
+        <i class="c-icons-preview__css-icon1"></i>
+        <i class="c-icons-preview__css-icon2"></i>
+        <i class="c-icons-preview__css-icon3"></i>
+        <i class="c-icons-preview__css-icon4"></i>
+        <i class="c-icons-preview__css-icon5"></i>
+        <i class="c-icons-preview__css-icon6"></i>
+        <i class="c-icons-preview__css-icon7"></i>
+        <div style="display: block; color: blue; font-size: 1.2rem;">
+          Blue text with red icon: <i class="c-icons-preview__css-icon8"></i>
+        </div>
+      </div>
+    </section>
+
+    <section class="c-icons-preview__section">
+      <h4 class="c-icons-preview__h4">Multicolor</h4>
+      <div style="font-size: 2rem;">
+        <i class="c-icons-preview__css-color-icon1"></i>
+        <i class="c-icons-preview__css-color-icon2"></i>
+        <i class="c-icons-preview__css-color-icon3"></i>
+        <i class="c-icons-preview__css-color-icon4"></i>
+        <i class="c-icons-preview__css-color-icon5"></i>
+      </div>
+    </section>
+  </article>
+
+  <!-- TODO: list all of the available icons -->
+  <article class="c-icons-preview__article">
+    <h3>All available icons</h3>
+    <section class="c-icons-preview__section">TODO :)</section>
+  </article>
+
+</section>

package/lib/commands/create/creators/app/chisel-starter-theme/views/sidebar-blog.twig

@@ -1,4 +1,4 @@
-<aside class="c-sidebar o-layout__item o-layout__item--4-large">
+<aside class="c-sidebar {{ bem('o-layout__item', '4-large') }}">
   <div class="c-sidebar__inner">
     {{ sidebar }}
   </div>

package/lib/commands/create/creators/app/chisel-starter-theme/views/sidebar-woocommerce.twig

@@ -1,4 +1,4 @@
-<aside class="c-sidebar c-sidebar--left o-layout__item o-layout__item--4-large">
+<aside class="{{ bem('c-sidebar', 'left') }} {{ bem('o-layout__item', '4-large') }}">
   <div class="c-sidebar__inner">
     {{ sidebar }}
   </div>

package/lib/commands/create/creators/app/chisel-starter-theme/views/single.twig

@@ -5,9 +5,9 @@
     <section class="o-wrapper__inner c-post__inner {{ wrapper_class }}">
 
       <div class="o-layout c-content{% if sidebar %} has-sidebar{% endif %}">
-        <div class="o-layout__item o-layout__item--{% if sidebar %}8{% else %}12{% endif %}-large c-content__inner">
+        <div class="{{ bem('o-layout__item', (sidebar ? '8' : '12') ~ '-large') }} c-content__inner">
 
-          {{ the_title }}
+          {% include 'components/the-title.twig' %}
 
           {% block inner_content %}
 

package/lib/commands/create/creators/app/chisel-starter-theme/views/woocommerce/archive-product.twig

@@ -32,7 +32,7 @@
   {% do action('woocommerce_before_shop_loop') %}
 
   <div class="o-layout">
-    <div class="o-layout__item o-layout__item--{% if sidebar %}8{% else %}12{% endif %}-large">
+    <div class="{{ bem('o-layout__item', (sidebar ? '8' : '12') ~ '-large') }}">
       <div class="c-posts-items c-shop-items {{ loop_columns_class }} js-load-more-container">
       {% if products is not empty %}
         {% for post in products %}
@@ -62,7 +62,7 @@
       </div>
 
       {% if products is not empty %}
-        {% include 'partials/pagination.twig' with {type: 'load-more'} %}
+        {% include 'components/pagination.twig' with {type: 'load-more'} %}
       {% endif %}
     </div>
 

package/lib/commands/create/creators/app/chisel-starter-theme/views/woocommerce/linked-products.twig

@@ -1,11 +1,11 @@
-<div class="o-layout c-product-linked c-product-linked--{{ linked_type|default('related') }}">
+<div class="o-layout {{ bem('c-product-linked', linked_type|default('related')) }}">
   {% if linked_title %}
   <div class="o-layout__item">
     <h2 class="c-product-linked__title">{{ linked_title }}</h2>
   </div>
   {% endif %}
 
-  <div class="o-layout__item o-layout__item--{% if sidebar %}8{% else %}12{% endif %}-large">
+  <div class="{{ bem('o-layout__item', (sidebar ? '8' : '12') ~ '-large') }}">
     <div class="c-product-linked__items {{ grid_classnames }}">
       {% for post in linked_products %}
         {% include "woocommerce/content-product.twig" with {post: post} %}

package/lib/commands/create/creators/app/chisel-starter-theme/views/woocommerce/single-product.twig

@@ -5,13 +5,13 @@
   {% do action('woocommerce_before_single_product') %}
 
   <article id="post-{{ post.ID }}" itemscope itemtype="https://schema.org/Product" class="{{ post_classes(post.class) }}">
-    <section class="o-wrapper__inner {{ wrapper_class }} c-post c-post--{{ post.type|default('page') }}">
+    <section class="o-wrapper__inner {{ wrapper_class }} {{ bem('c-post', post.type|default('page')) }}">
 
       <div class="o-layout c-content{% if sidebar %} has-sidebar{% endif %} product">
-        <div class="o-layout__item o-layout__item--{% if sidebar %}8{% else %}12{% endif %}-large c-content__inner">
+        <div class="{{ bem('o-layout__item', (sidebar ? '8' : '12') ~ '-large') }} c-content__inner">
 
           <div class="o-layout c-product__inner">
-            <div class="c-product__gallery o-layout__item o-layout__item--6-large">
+            <div class="c-product__gallery {{ bem('o-layout__item', '6-large') }}">
               {#
               * Hook: woocommerce_before_single_product_summary.
               *
@@ -21,7 +21,7 @@
               {% do action('woocommerce_before_single_product_summary') %}
             </div>
 
-            <div class="c-product__summary o-layout__item o-layout__item--6-large">
+            <div class="c-product__summary {{ bem('o-layout__item', '6-large') }}">
               {#
               * Hook: woocommerce_single_product_summary.
               *

package/lib/commands/create/creators/app/chisel-starter-theme/woocommerce.php

@@ -5,9 +5,9 @@
  * @package Chisel
  */
 
-use Chisel\ChiselCache;
-use Chisel\Woocommerce;
 use Timber\Timber;
+use Chisel\Helper\CacheHelpers;
+use Chisel\Helper\WoocommerceHelpers;
 
 $context = Timber::context();
 
@@ -25,19 +25,19 @@ if ( is_singular( 'product' ) ) {
 	$context['upsells_products'] = $upsells_ids ? Timber::get_posts( $upsells_ids ) : array();
 	$context['related_products'] = $related_ids ? Timber::get_posts( $related_ids ) : array();
 	$context['wrapper_class']    = 'c-product';
-	$context['grid_classnames']  = Woocommerce::get_products_grid_classnames( true, false );
+	$context['grid_classnames']  = WoocommerceHelpers::get_products_grid_classnames( true, false );
 
 	// Restore the context and loop back to the main query loop.
 	wp_reset_postdata();
 
-	Timber::render( 'woocommerce/single-product.twig', $context, ChiselCache::expiry() );
+	Timber::render( 'woocommerce/single-product.twig', $context, CacheHelpers::expiry() );
 } else {
 	$products     = Timber::get_posts();
 	$has_sidebar  = ! empty( $context['sidebar'] );
 	$loop_columns = wc_get_loop_prop( 'columns' );
 	$loop_rows    = wc_get_default_product_rows_per_page();
 
-	$grid_classnames = Woocommerce::get_products_grid_classnames( $products, $has_sidebar );
+	$grid_classnames = WoocommerceHelpers::get_products_grid_classnames( $products, $has_sidebar );
 
 	$context['products']           = $products;
 	$context['loop_columns_class'] = $grid_classnames;
@@ -53,5 +53,5 @@ if ( is_singular( 'product' ) ) {
 		$context['title']    = single_term_title( '', false );
 	}
 
-	Timber::render( 'woocommerce/archive-product.twig', $context, ChiselCache::expiry() );
+	Timber::render( 'woocommerce/archive-product.twig', $context, CacheHelpers::expiry() );
 }

package/lib/commands/create/creators/app/index.js

@@ -1,6 +1,5 @@
 const path = require('path');
 const { startCase } = require('lodash');
-const speakingUrl = require('speakingurl');
 const {
   execa,
   run,
@@ -8,6 +7,8 @@ const {
   installDependencies,
 } = require('chisel-shared-utils');
 const packagesVersions = require('../../packages-versions');
+const { prepareName, getDevcontainerBaseImageVersion } = require('../utils');
+const fs = require('fs/promises');
 
 module.exports = async (api) => {
   let app;
@@ -20,27 +21,40 @@ module.exports = async (api) => {
       timeout: 2000,
     }).catch(() => ({}));
 
-    app = await api.prompt([
-      {
-        name: 'name',
-        message: 'Please enter the project name:',
-        default: () => startCase(path.basename(process.cwd())),
-        validate: (val) => Boolean(val),
-      },
-      {
-        name: 'author',
-        message: 'Please enter author name:',
-        default: async () => (await userName).stdout,
-      },
-    ]);
+    const { devcontainerComplete } = api.creator.data;
+
+    app = await api.prompt(
+      [
+        !devcontainerComplete && {
+          name: 'name',
+          message: 'Please enter the project name:',
+          default: () => startCase(path.basename(process.cwd())),
+          validate: (val) => Boolean(val),
+        },
+        !devcontainerComplete && {
+          type: 'number',
+          name: 'devcontainerPort',
+          message: 'Enter the devcontainer port:',
+          default: 3000,
+          validate: (val) => Boolean(val),
+        },
+        {
+          name: 'author',
+          message: 'Please enter author name:',
+          default: async () => (await userName).stdout,
+          validate: (val) => Boolean(val),
+        },
+      ].filter(Boolean),
+    );
 
-    app.nameSlug = speakingUrl(app.name)
-      .replace(/(?<=[^\d])-(\d+)/g, (_, d) => d)
-      .replace(/[^a-z0-9-]/g, '-');
-    // app.nameCamel = camelCase(app.nameSlug);
     app.hasJQuery = false;
-    app.themeName = `${app.nameSlug}-chisel`;
-    app.themePath = `wp-content/themes/${app.themeName}`;
+    app.devcontainerBaseImageVersion = await getDevcontainerBaseImageVersion();
+
+    if (devcontainerComplete) {
+      Object.assign(app, devcontainerComplete);
+    }
+
+    Object.assign(app, prepareName(app.name));
 
     await api.creator.loadCreator('wp');
   });
@@ -86,6 +100,46 @@ module.exports = async (api) => {
       { cwd: api.resolve(app.themePath) },
     );
 
+    await api.modifyFile(
+      '.devcontainer/devcontainer.json',
+      async (body) => {
+        const extensionsText = await fs.readFile(
+          api.resolve(app.themePath, '.vscode/extensions.json'),
+          'utf8',
+        );
+        const { recommendations } = JSON.parse(extensionsText);
+
+        return body.replace(
+          / +\/\/ EXTENSIONS-FROM-VSCODE-EXTENSIONS-FILE/,
+          recommendations
+            .map((ext) => `        ${JSON.stringify(ext)}`)
+            .join(',\n'),
+        );
+      },
+      { isJson: false },
+    );
+
+    const preCommitPath = api.resolve(app.themePath, '.husky/pre-commit');
+
+    if (
+      await fs
+        .access(preCommitPath)
+        .then(() => true)
+        .catch(() => false)
+    ) {
+      await api.modifyFile(preCommitPath, (body) => {
+        const str = [
+          '',
+          'if [ -f .use-devcontainer ]; then',
+          '  alias npx="/usr/bin/env bash ../../../.devcontainer/exec npx"',
+          'fi',
+          '',
+        ].join('\n');
+
+        return body.replace('npx ', str + '\nnpx ');
+      });
+    }
+
     if (api.creator.cmd.link) {
       const availablePackages = Object.keys(packagesVersions);
       const installedAndAvailable = installedPackages.filter((pkg) =>

package/lib/commands/create/creators/app/template/.devcontainer/Dockerfile

@@ -0,0 +1,21 @@
+ARG BASE_IMAGE_VERSION
+FROM wordpress:${BASE_IMAGE_VERSION}
+
+ARG CHISEL_PORT=3000
+
+# Install MariaDB Client
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends mariadb-client
+
+# Install WP CLI
+RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar \
+ && chmod +x wp-cli.phar \
+ && mv wp-cli.phar /usr/local/bin/wp
+
+# Update port
+RUN sed -i 's/80/${CHISEL_PORT}/' /etc/apache2/ports.conf
+
+# Use wordpress user to run apache
+ENV APACHE_RUN_USER wordpress
+ENV APACHE_RUN_GROUP wordpress
+ENV CHISEL_PORT=${CHISEL_PORT}

package/lib/commands/create/creators/app/template/.devcontainer/compose.chisel-tpl

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+docker compose -p <%= app.nameSlug %>_devcontainer <%= '"${@}"' %>

package/lib/commands/create/creators/app/template/.devcontainer/devcontainer.json.chisel-tpl

@@ -0,0 +1,31 @@
+// For format details, see https://aka.ms/devcontainer.json.
+{
+  "name": "WordPress Development",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "app",
+  // when changing workspace name or theme path, also update the docker-compose.yml file
+  "workspaceFolder": "/workspaces/<%= app.nameSlug %>/<%= app.themePath %>",
+
+  // Features to add to the dev container. More info: https://containers.dev/features.
+  "features": {
+    "ghcr.io/devcontainers/features/common-utils:2": {
+      "username": "wordpress"
+    },
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "20"
+    },
+    "ghcr.io/devcontainers/features/git:1": {}
+  },
+
+  "postCreateCommand": "bash ../../../.devcontainer/post-create-command.sh",
+
+  "remoteUser": "wordpress",
+
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        // EXTENSIONS-FROM-VSCODE-EXTENSIONS-FILE
+      ]
+    }
+  }
+}

package/lib/commands/create/creators/app/template/.devcontainer/docker-compose.yml.chisel-tpl

@@ -0,0 +1,40 @@
+name: <%= app.nameSlug %>_devcontainer
+
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        # Keep this in sync with installed WordPress version and
+        # PHP version used in production
+        # See https://hub.docker.com/_/wordpress for available versions
+        BASE_IMAGE_VERSION: <%= app.devcontainerBaseImageVersion %>
+        CHISEL_PORT: <%= app.devcontainerPort %>
+
+    ports:
+      - '127.0.0.1:<%= app.devcontainerPort %>:<%= app.devcontainerPort %>' # should be CHISEL_PORT
+      - '127.0.0.1:<%= app.devcontainerPort + 1 %>:<%= app.devcontainerPort + 1 %>' # should be CHISEL_PORT + 1
+
+    volumes:
+      - ..:/workspaces/<%= app.nameSlug %>
+      - ..:/var/www/html
+      - node_modules:/workspaces/<%= app.nameSlug %>/wp-content/themes/<%= app.themeName %>/node_modules
+      - vendor:/workspaces/<%= app.nameSlug %>/wp-content/themes/<%= app.themeName %>/vendor
+      - vendor:/var/www/html/wp-content/themes/<%= app.themeName %>/vendor
+
+  db:
+    image: mariadb:11.4
+    restart: unless-stopped
+    volumes:
+      - db:/var/lib/mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: mariadb
+      MYSQL_DATABASE: mariadb
+      MYSQL_USER: mariadb
+      MYSQL_PASSWORD: mariadb
+
+volumes:
+  db:
+  vendor:
+  node_modules:

package/lib/commands/create/creators/app/template/.devcontainer/exec

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+if [ -f /.dockerenv ]; then
+  exec "${@}"
+else
+  this_file_dir=$(dirname "${BASH_SOURCE[0]}")
+  npm run --silent devcontainer -- exec --workspace-folder "${this_file_dir}/.." "${@}"
+fi

package/lib/commands/create/creators/app/template/.devcontainer/post-create-command.sh.chisel-tpl

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -eux
+
+sudo chown "$USER:$USER" node_modules vendor
+touch .use-devcontainer
+
+pushd ../../..
+
+sudo chown "$USER:$USER" . index.php wp-config.php
+if [ -d .git ] ; then sudo chown "$USER:$USER" .git ; fi
+chmod +x .devcontainer/compose .devcontainer/exec
+<% if (app.devcontainer) { %>
+{
+    npx --yes generator-chisel@<%= chiselVersion %> --devcontainer-complete <%= app.responsesAsBase64 %>
+    exit
+}
+<% } %>
+popd
+<% if (!app.devcontainer) { %>
+npm install
+npm run wp-config -- --devcontainer
+npm run composer install
+npm run build<% } %>

package/lib/commands/create/creators/devcontainer.js

@@ -0,0 +1,62 @@
+const { prepareName, getDevcontainerBaseImageVersion } = require('./utils');
+const fsPromises = require('fs/promises');
+
+module.exports = async (api) => {
+  let app;
+
+  api.schedule(api.PRIORITIES.PROMPT, async () => {
+    app = await api.prompt([
+      {
+        name: 'name',
+        message: 'Please enter the project name:',
+        validate: (val) => Boolean(val),
+      },
+      {
+        type: 'number',
+        name: 'devcontainerPort',
+        message: 'Enter the devcontainer port:',
+        default: 3000,
+        validate: (val) => Boolean(val),
+      },
+    ]);
+
+    const responsesAsBase64 = Buffer.from(JSON.stringify(app)).toString(
+      'base64'
+    );
+
+    Object.assign(app, prepareName(app.name));
+    app.devcontainer = true;
+    app.responsesAsBase64 = responsesAsBase64;
+    app.devcontainerBaseImageVersion = await getDevcontainerBaseImageVersion();
+    api.creator.data.app = app;
+  });
+
+  api.schedule(api.PRIORITIES.COPY, async () => {
+    await api.copy({
+      from: '../app/template/.devcontainer',
+      to: '.devcontainer',
+    });
+
+    await fsPromises.mkdir(api.creator.data.app.themePath, {
+      recursive: true,
+    });
+
+    await fsPromises.writeFile('index.php', '');
+    await fsPromises.writeFile('wp-config.php', '');
+  });
+
+  api.schedule(api.PRIORITIES.END_MESSAGE, async () => {
+    console.log(`
+Devcontainer definition is ready.
+
+To continue creating the project do one of the following:
+
+1. If you are using VS Code, open the folder in VS Code and run
+   "Dev Containers: Reopen in Container" from the command palette.
+
+2. Otherwise you have to use Dev Containers CLI to start the container:
+   > npx -y @devcontainers/cli@latest up --workspace-folder .
+   (dot at the end is part of the command)
+`);
+  });
+};

package/lib/commands/create/creators/utils.js

@@ -0,0 +1,58 @@
+module.exports.prepareName = (name) => {
+  const speakingUrl = require('speakingurl');
+  const nameSlug = speakingUrl(name)
+    .replace(/(?<=[^\d])-(\d+)/g, (_, d) => d)
+    .replace(/[^a-z0-9-]/g, '-');
+
+  const themeName = `${nameSlug}-chisel`;
+
+  return {
+    nameSlug,
+    themeName,
+    themePath: `wp-content/themes/${themeName}`,
+  };
+};
+
+module.exports.getDevcontainerBaseImageVersion = async () => {
+  const phpVersion = '8.3';
+
+  try {
+    const response = await fetch(
+      'https://api.wordpress.org/core/version-check/1.7/',
+    );
+
+    if (!response.ok) {
+      throw new Error('Failed to fetch WordPress version');
+    }
+
+    const data = await response.json();
+
+    const { version } = data.offers.find(
+      (offer) => offer.response === 'upgrade',
+    );
+
+    const versionForTag =
+      version.split('.').length === 2 ? `${version}.0` : version;
+
+    const tag = `${versionForTag}-php${phpVersion}`;
+
+    const tagExists = await fetch(
+      `https://hub.docker.com/v2/namespaces/library/repositories/wordpress/tags/${tag}`,
+      { method: 'HEAD' },
+    ).then((res) => {
+      if (res.status === 200) return true;
+      if (res.status === 404) return false;
+      throw new Error(
+        `Failed to check if tag exists: ${res.status} ${res.statusText}`,
+      );
+    });
+
+    if (tagExists) {
+      return tag;
+    }
+  } catch (e) {
+    // noop
+  }
+
+  return `6-php${phpVersion}`;
+};

package/lib/commands/create/creators/wp/index.js

@@ -26,16 +26,31 @@ module.exports = (api) => {
     const userName = gitConfig('user.name');
     const userEmail = gitConfig('user.email');
 
+    let url = `http://${api.creator.data.app.nameSlug}.test/`;
+    const { devcontainerPort } = api.creator.data.app;
+
+    if (process.env.CODESPACES === 'true') {
+      const {
+        CODESPACE_NAME,
+        GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN,
+      } = process.env;
+      url = `https://${CODESPACE_NAME}-${devcontainerPort}.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}/`;
+    } else if (await fs.exists('/.dockerenv')) {
+      url = `http://127.0.0.1:${devcontainerPort}/`;
+    }
+
     await api.prompt([
       {
         name: 'title',
         message: 'Enter title for the new site:',
         default: api.creator.data.app.name,
+        validate: (val) => Boolean(val),
       },
       {
         name: 'url',
         message: 'Enter URL:',
-        default: `http://${api.creator.data.app.nameSlug}.test/`,
+        default: url,
+        validate: (val) => Boolean(val),
       },
       {
         name: 'adminUser',
@@ -47,6 +62,7 @@ module.exports = (api) => {
             nameParts[0].toLowerCase() + Math.floor(1000 + Math.random() * 9000)
           );
         },
+        validate: (val) => Boolean(val),
       },
       {
         name: 'adminPassword',
@@ -88,7 +104,6 @@ module.exports = (api) => {
       `${api.creator.data.app.themePath}/package.json`,
       (body) => {
         body.chisel = {
-          url: api.creator.data.wp.url,
           tablePrefix,
         };
       },
@@ -104,7 +119,13 @@ module.exports = (api) => {
   api.schedule(api.PRIORITIES.WP_CONFIG, async () => {
     if (api.creator.cmd.skipWpConfig) return;
 
-    await runLocal(['chisel-scripts', 'wp-config'], {
+    const extraArgs = [];
+
+    if (api.creator.data.devcontainerComplete) {
+      extraArgs.push('--devcontainer');
+    }
+
+    await runLocal(['chisel-scripts', 'wp-config', ...extraArgs], {
       cwd: api.resolve(themePath),
       execaOpts: { stdio: 'inherit' },
     });

package/lib/commands/create/creators/wp-plugins/plugins.json

@@ -1,6 +1,6 @@
 {
   "plugins": {
-    "WP Premium: Gravity Forms": "https://github.com/wp-premium/gravityforms/archive/master.zip",
+    "WP Premium: Gravity Forms": "https://github.com/pronamic/gravityforms/archive/master.zip",
     "SVG Support": "svg-support",
     "Yoast SEO": "wordpress-seo",
     "Yoast SEO ACF": "acf-content-analysis-for-yoast-seo"