generator-chisel 1.0.0 → 2.0.0-alpha.0

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

@@ -0,0 +1,81 @@
+{% extends 'base.twig' %}
+
+{% block content %}
+
+<section class="o-wrapper__inner c-shop">
+
+  {#
+  * Hook: woocommerce_before_main_content.
+  *
+  * @hooked woocommerce_output_content_wrapper - 10 (Removed by the theme)
+  * @hooked woocommerce_breadcrumb - 20
+  * @hooked WC_Structured_Data::generate_website_data() - 30
+  #}
+  {% do action('woocommerce_before_main_content') %}
+
+  {#
+  * Hook: woocommerce_shop_loop_header.
+  *
+  * @since 8.6.0
+  *
+  * @hooked woocommerce_product_taxonomy_archive_header - 10
+  #}
+  {% do action('woocommerce_shop_loop_header') %}
+
+  {#
+  * Hook: woocommerce_before_shop_loop.
+  *
+  * @hooked woocommerce_output_all_notices - 10
+  * @hooked woocommerce_result_count - 20
+  * @hooked woocommerce_catalog_ordering - 30
+  #}
+  {% 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="c-posts-items c-shop-items {{ loop_columns_class }} js-load-more-container">
+      {% if products is not empty %}
+        {% for post in products %}
+
+          {#
+          * Hook: woocommerce_shop_loop.
+          #}
+          {% do action('woocommerce_shop_loop') %}
+
+          {% include "woocommerce/content-product.twig" with {post: post} %}
+        {% endfor %}
+
+        {% include 'partials/pagination.twig' with {type: 'load-more'} %}
+
+        {#
+        * Hook: woocommerce_after_shop_loop.
+        *
+        * @hooked woocommerce_pagination - 10 (Removed by the theme)
+        #}
+        {% do action('woocommerce_after_shop_loop') %}
+      {% else %}
+        {#
+        * Hook: woocommerce_no_products_found.
+        *
+        * @hooked wc_no_products_found - 10
+        #}
+        {% do action('woocommerce_no_products_found') %}
+      {% endif %}
+      </div>
+    </div>
+
+    {% if sidebar %}
+      {% include 'sidebar-blog.twig' %}
+    {% endif %}
+  </div>
+
+
+  {#
+  * Hook: woocommerce_after_main_content.
+  *
+  * @hooked woocommerce_output_content_wrapper_end - 10 (Removed by the theme)
+  #}
+  {% do action('woocommerce_after_main_content') %}
+</section>
+
+{% endblock %}

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

@@ -0,0 +1,51 @@
+<article class="{{ post_classes(post.class) }} c-product-item c-post-card">
+
+  {{ timber_set_product(post) }}
+
+  <div class="c-product-item__inner">
+
+    {#
+     * Hook: woocommerce_before_shop_loop_item.
+    *
+    * @hooked woocommerce_template_loop_product_link_open - 10 (Removed by the theme)
+    #}
+    {% do action('woocommerce_before_shop_loop_item') %}
+
+    <a class="c-product-item__content" href="{{ post.link }}">
+
+      {#
+      * Hook: woocommerce_before_shop_loop_item_title.
+      *
+      * @hooked woocommerce_show_product_loop_sale_flash - 10
+      * @hooked woocommerce_template_loop_product_thumbnail - 10 (Removed by the theme)
+      #}
+      {% do action('woocommerce_before_shop_loop_item_title') %}
+
+      <h2 class="c-product-item__title">{{ post.title }}</h2>
+
+      {#
+      * Hook: woocommerce_after_shop_loop_item_title.
+      *
+      * @hooked woocommerce_template_loop_rating - 5
+      * @hooked woocommerce_template_loop_price - 10
+      #}
+      {% do action('woocommerce_after_shop_loop_item_title') %}
+
+      {% if post.get_thumbnail() %}
+        <div class="c-product-item__image">
+          {{ post.get_thumbnail() }}
+        </div>
+      {% endif %}
+
+    </a>
+
+    {#
+    * Hook: woocommerce_after_shop_loop_item.
+    *
+    * @hooked woocommerce_template_loop_product_link_close - 5 (Removed by the theme)
+    * @hooked woocommerce_template_loop_add_to_cart - 10
+    #}
+    {% do action('woocommerce_after_shop_loop_item') %}
+  </div>
+
+</article>

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

@@ -0,0 +1,15 @@
+<div class="o-layout c-product-linked 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="c-product-linked__items o-grid o-grid--cols-1 o-grid--cols-3-medium">
+      {% for post in linked_products %}
+        {% include "woocommerce/content-product.twig" with {post: post} %}
+      {% endfor %}
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,75 @@
+{% extends "base.twig" %}
+
+{% block content %}
+
+  {% 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') }}">
+
+      <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="o-layout c-product__inner">
+            <div class="c-product__gallery o-layout__item o-layout__item--6-large">
+              {#
+              * Hook: woocommerce_before_single_product_summary.
+              *
+              * @hooked woocommerce_show_product_sale_flash - 10
+              * @hooked woocommerce_show_product_images - 20
+              #}
+              {% do action('woocommerce_before_single_product_summary') %}
+            </div>
+
+            <div class="c-product__summary o-layout__item o-layout__item--6-large">
+              {#
+              * Hook: woocommerce_single_product_summary.
+              *
+              * @hooked woocommerce_template_single_title - 5
+              * @hooked woocommerce_template_single_rating - 10
+              * @hooked woocommerce_template_single_price - 10
+              * @hooked woocommerce_template_single_excerpt - 20
+              * @hooked woocommerce_template_single_add_to_cart - 30
+              * @hooked woocommerce_template_single_meta - 40
+              * @hooked woocommerce_template_single_sharing - 50
+              * @hooked WC_Structured_Data::generate_product_data() - 60
+              #}
+              {% do action('woocommerce_single_product_summary') %}
+            </div>
+          </div>
+
+          <div class="c-product__content">
+            {#
+            * Hook: woocommerce_after_single_product_summary.
+            *
+            * @hooked woocommerce_output_product_data_tabs - 10
+            * @hooked woocommerce_upsell_display - 15
+            * @hooked woocommerce_output_related_products - 20
+            #}
+            {% do action('woocommerce_after_single_product_summary') %}
+
+            {% if upsells_products is not empty %}
+              {% include 'woocommerce/linked-products.twig' with {linked_title: __('You may also like:', 'chisel'), linked_products: upsells_products, linked_type: 'upsells'} %}
+            {% endif %}
+
+            {% if related_products is not empty %}
+              {% include 'woocommerce/linked-products.twig' with {linked_title: __('Related products:', 'chisel'), linked_products: related_products, linked_type: 'related'} %}
+            {% endif %}
+
+            <meta itemprop="url" content="{{ post.link }}" />
+          </div>
+        </div>
+
+        {% if sidebar %}
+          {% include 'sidebar-blog.twig' %}
+        {% endif %}
+      </div>
+    </section>
+  </article>
+
+  {#
+  * Hook: woocommerce_after_single_product.
+  #}
+  {% do action('woocommerce_after_single_product') %}
+
+{% endblock %}

package/lib/commands/create/creators/app/chisel-starter-theme/webpack.config.js

@@ -0,0 +1,6 @@
+const defaultConfig = require('@wordpress/scripts/config/webpack.config');
+const { adjustWebpackConfig } = require('chisel-scripts');
+
+const updatedConfig = adjustWebpackConfig(defaultConfig, __dirname);
+
+module.exports = updatedConfig;

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

@@ -10,17 +10,17 @@ const {
 const packagesVersions = require('../../packages-versions');
 
 module.exports = async (api) => {
+  let app;
+
   const runLocalCurrent = (args, opts) =>
-    runLocal(args, { ...opts, cwd: api.resolve() });
+    runLocal(args, { ...opts, cwd: api.resolve(app.themePath) });
 
   api.schedule(api.PRIORITIES.PROMPT, async () => {
-    // TODO: project exisits
-
     const userName = execa('git', ['config', 'user.name'], {
       timeout: 2000,
     }).catch(() => ({}));
 
-    const app = await api.prompt([
+    app = await api.prompt([
       {
         name: 'name',
         message: 'Please enter the project name:',
@@ -32,59 +32,17 @@ module.exports = async (api) => {
         message: 'Please enter author name:',
         default: async () => (await userName).stdout,
       },
-      {
-        type: 'list',
-        name: 'projectType',
-        message: 'Please select project type:',
-        choices: [
-          {
-            name: 'WordPress Website',
-            value: 'wp-with-fe',
-          },
-          {
-            name: 'Static Website',
-            value: 'fe',
-          },
-        ],
-      },
-      {
-        type: 'checkbox',
-        name: 'browsers',
-        message: 'Which browsers are you supporting?',
-        choices: [
-          {
-            name: 'Modern (3 recent versions of popular browsers)',
-            short: 'Modern',
-            value: 'modern',
-            checked: true,
-          },
-          {
-            name: 'Edge 18 (last Edge version before engine change)',
-            short: 'Edge 18',
-            value: 'edge18',
-            checked: true,
-          },
-          {
-            name: 'Internet Explorer 11',
-            value: 'ie11',
-          },
-        ],
-      },
     ]);
 
-    const { projectType } = app;
-
     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}`;
 
-    if (projectType === 'wp-with-fe') {
-      await api.creator.loadCreator('wp');
-    } else if (projectType === 'fe') {
-      await api.creator.loadCreator('fe');
-    }
+    await api.creator.loadCreator('wp');
   });
 
   // For linking we need to first install packages from npm registry and then
@@ -93,19 +51,17 @@ module.exports = async (api) => {
   let installedPackages;
   api.schedule(api.PRIORITIES.COPY, async () => {
     await api.copy();
+    await api.copy({ from: 'chisel-starter-theme', to: app.themePath });
 
     const modifyDependencies = (deps) => {
       Object.keys(deps).forEach((dep) => {
         if (!packagesVersions[dep]) return;
-        if (process.env.CHISEL_TEST) {
-          deps[dep] = `file:../../packages/${dep}`;
-          return;
-        }
+
         deps[dep] = `^${packagesVersions[dep]}`;
       });
     };
 
-    await api.modifyFile('package.json', (body) => {
+    await api.modifyFile(`${app.themePath}/package.json`, (body) => {
       installedPackages = [
         ...Object.keys(body.dependencies),
         ...Object.keys(body.devDependencies),
@@ -119,15 +75,16 @@ module.exports = async (api) => {
   api.schedule(api.PRIORITIES.INSTALL_DEPENDENCIES, async () => {
     if (api.creator.cmd.skipDependenciesInstall) return;
 
-    if (process.env.CHISEL_TEST && !process.env.CI) {
-      require('fs').symlinkSync(
-        process.env.CHISEL_TEST_NODE_MODULES,
-        api.resolve('node_modules'),
-        'junction',
-      );
-    }
+    await installDependencies({ cwd: api.resolve(app.themePath) });
+
+    // await run(['xfive-coding-standards', '--skip-staged-check'], {
+    //   cwd: api.resolve(app.themePath),
+    // });
 
-    await installDependencies({ cwd: api.resolve() });
+    await run(
+      ['npx', '--yes', '@xfive/coding-standards@latest', '--skip-staged-check'],
+      { cwd: api.resolve(app.themePath) },
+    );
 
     if (api.creator.cmd.link) {
       const availablePackages = Object.keys(packagesVersions);
@@ -136,24 +93,20 @@ module.exports = async (api) => {
       );
 
       for (const pkg of installedAndAvailable) {
-        console.log(`Running yarn link ${pkg}...`);
-        await run(['yarn', 'link', pkg], { cwd: api.resolve() });
+        console.log(`Running npm link ${pkg}...`);
+        await run(['npm', 'link', pkg], { cwd: api.resolve(app.themePath) });
       }
-
-      console.log(`Linking done`);
     }
   });
 
-  api.schedule(api.PRIORITIES.COPY_SECOND, async () => {
-    await api.copy({ file: 'chisel.config.chisel-tpl.js' });
-  });
+  // formatting done during coding standards installation but we may do extra for php and twig
+  // api.schedule(api.PRIORITIES.FORMAT, async () => {
+  //   if (api.creator.cmd.skipFormatAndBuild) return;
 
-  api.schedule(api.PRIORITIES.FORMAT, async () => {
-    if (api.creator.cmd.skipFormatAndBuild) return;
-
-    console.log('Formatting code...');
-    await runLocalCurrent(['chisel-scripts', 'lint'], { silent: true });
-  });
+  //   // console.log('Formatting code...');
+  //   // console.log('TODO');
+  //   // await runLocalCurrent(['chisel-scripts', 'lint'], { silent: true });
+  // });
 
   api.schedule(api.PRIORITIES.BUILD, async () => {
     if (api.creator.cmd.skipFormatAndBuild) return;

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

@@ -49,5 +49,5 @@ npm-debug.log
 
 # Chisel
 /dev-vhost.conf
-/chisel.config.local.js
-/dist
+/wp-content/uploads
+/wp-config-local.php

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

@@ -24,7 +24,6 @@ module.exports = async (api) => {
   }
 
   api.schedule(api.PRIORITIES.HELLO, async () => {
-    if (process.env.CHISEL_TEST) return;
     console.log();
     console.log(chalk.yellow('*'.repeat(47)));
     console.log();
@@ -38,8 +37,6 @@ module.exports = async (api) => {
   });
 
   api.schedule(api.PRIORITIES.CHECK_UPDATE, async () => {
-    if (process.env.CHISEL_TEST) return;
-
     const timeout = new Promise((_, reject) =>
       setTimeout(() => reject(new Error('timeout')), 5000),
     );
@@ -79,7 +76,8 @@ module.exports = async (api) => {
   });
 
   api.schedule(api.PRIORITIES.CHECK_EXIST, async () => {
-    if (await fs.pathExists(api.resolve('chisel.config.js'))) {
+    // TODO: check chisel in package.json
+    if (await fs.pathExists(api.resolve('wp-config.php'))) {
       console.log('A Chisel project already exists in this folder.');
       console.log(
         'If you are trying to setup an existing project, check out the' +

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

@@ -3,19 +3,24 @@ const crypto = require('crypto');
 const fs = require('fs-extra');
 
 module.exports = (api) => {
-  const wp = (args, opts) =>
-    runLocal(['chisel-scripts', 'wp', ...args], {
-      ...opts,
-      cwd: api.resolve(),
-    });
-
   const gitConfig = (field) =>
     execa('git', ['config', field], {
       timeout: 2000,
       cwd: api.resolve(),
     }).catch(() => ({}));
 
+  let themeName;
+  let themePath;
+
+  const wp = (args, opts) =>
+    runLocal(['chisel-scripts', 'wp', ...args], {
+      ...opts,
+      cwd: api.resolve(themePath),
+    });
+
   api.schedule(api.PRIORITIES.PROMPT, async () => {
+    ({ themeName, themePath } = api.creator.data.app);
+
     await api.creator.loadCreator('wp-plugins');
 
     const userName = gitConfig('user.name');
@@ -58,21 +63,6 @@ module.exports = (api) => {
           return /.+@.+/.test(email) ? email : undefined;
         },
       },
-      // {
-      //   type: 'list',
-      //   name: 'srcPlacement',
-      //   message: "Where do you want to place the 'src' folder:",
-      //   choices: [
-      //     {
-      //       name: 'Project root folder',
-      //       value: 'root',
-      //     },
-      //     {
-      //       name: 'WordPress theme folder',
-      //       value: 'theme',
-      //     },
-      //   ],
-      // },
     ]);
 
     api.creator.data.wp.tablePrefix = `${crypto
@@ -84,25 +74,25 @@ module.exports = (api) => {
   });
 
   api.schedule(api.PRIORITIES.COPY, async () => {
-    const wpDist = require(api.resolve('chisel.config.js')).output.base;
-
-    await fs.move(
-      api.resolve('src/templates'),
-      api.resolve(wpDist, '../templates'),
-      { overwrite: true },
-    );
-
-    await api.copy(); // template directory
-
     const { tablePrefix } = api.creator.data.wp;
-    await api.modifyFile('wp/wp-config.php', (body) =>
+    api.creator.data.app.tablePrefix = tablePrefix;
+    await api.modifyFile('wp-config.php', (body) =>
       body
         .replace('wp_', tablePrefix)
         .replace(/put your unique phrase here/g, () =>
           crypto.randomBytes(30).toString('base64'),
         ),
     );
-    await api.copy({ from: 'chisel-starter-theme', to: `${wpDist}/..` });
+
+    await api.modifyFile(
+      `${api.creator.data.app.themePath}/package.json`,
+      (body) => {
+        body.chisel = {
+          url: api.creator.data.wp.url,
+          tablePrefix,
+        };
+      },
+    );
   });
 
   api.schedule(api.PRIORITIES.WP_DOWNLOAD, async () => {
@@ -115,7 +105,7 @@ module.exports = (api) => {
     if (api.creator.cmd.skipWpConfig) return;
 
     await runLocal(['chisel-scripts', 'wp-config'], {
-      cwd: api.resolve(),
+      cwd: api.resolve(themePath),
       execaOpts: { stdio: 'inherit' },
     });
   });
@@ -146,19 +136,15 @@ module.exports = (api) => {
   api.schedule(api.PRIORITIES.WP_INSTALL_PLUGINS, async () => {
     if (api.creator.cmd.skipWpCommands) return;
 
-    await wp([
-      'plugin',
-      'install',
-      'timber-library',
-      'disable-emojis',
-      { activate: true },
-    ]);
+    await runLocal(['chisel-scripts', 'composer', 'install'], {
+      cwd: api.resolve(themePath),
+    });
+    await wp(['plugin', 'install', 'disable-emojis', { activate: true }]);
   });
 
   api.schedule(api.PRIORITIES.WP_THEME_ACTIVATE, async () => {
     if (api.creator.cmd.skipWpCommands) return;
 
-    const { themeName } = require(api.resolve('chisel.config.js')).wp;
     await wp(['theme', 'activate', themeName]);
   });
 

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

@@ -28,7 +28,7 @@ module.exports = (api) => {
         { activate: true },
         ...selectedPlugins.map((name) => plugins.plugins[name]),
       ],
-      { cwd: api.resolve() },
+      { cwd: api.resolve(api.creator.data.app.themePath) },
     );
   });
 };

package/lib/commands/create/packages-versions.js

@@ -1,11 +1,5 @@
 module.exports = {
-  'babel-preset-chisel': '1.0.0',
-  'chisel-plugin-code-style': '1.0.0',
-  'chisel-plugin-static-frontend': '1.0.0',
-  'chisel-plugin-wordpress': '1.0.0',
-  'chisel-scripts': '1.0.0',
-  'chisel-shared-utils': '1.0.0',
-  'eslint-config-chisel': '3.0.0',
-  'generator-chisel': '1.0.0',
-  'stylelint-config-chisel': '1.0.0',
+  'chisel-scripts': '2.0.0-alpha.0',
+  'chisel-shared-utils': '2.0.0-alpha.0',
+  'generator-chisel': '2.0.0-alpha.0',
 };

package/lib/commands/create/priorities.js

@@ -23,9 +23,6 @@ module.exports = {
   WP_THEME_ACTIVATE: 1500,
   WP_PLUGINS: 1600,
 
-  COPY_SECOND: 2000,
-
-  FE_ADD_INDEX: 2600,
   FORMAT: 2500,
 
   BUILD: 3000,

package/lib/utils/sort-package.js

@@ -28,15 +28,8 @@ function sortObject(obj, keyOrder, dontSortByUnicode) {
 module.exports = function sortPackage(pkg) {
   pkg.dependencies = sortObject(pkg.dependencies);
   pkg.devDependencies = sortObject(pkg.devDependencies);
-  pkg.scripts = sortObject(pkg.scripts, [
-    'dev',
-    'watch',
-    'build',
-    'build-report',
-    'lint',
-    'add-page',
-    'wp',
-  ]);
+  // pkg.scripts = sortObject(pkg.scripts, [
+  // ]);
   pkg = sortObject(pkg, [
     'name',
     'version',
@@ -51,6 +44,7 @@ module.exports = function sortPackage(pkg) {
     'jsDelivr',
     'unpkg',
     'files',
+    'chisel',
     'dependencies',
     'devDependencies',
     'peerDependencies',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-chisel",
-  "version": "1.0.0",
+  "version": "2.0.0-alpha.0",
   "description": "A generator for scaffolding front-end and WordPress projects",
   "bin": {
     "chisel": "bin/chisel.js"
@@ -25,14 +25,8 @@
     "webpack",
     "babel"
   ],
-  "scripts": {
-    "test": "bash test/run-tests.sh"
-  },
-  "engines": {
-    "node": "^10.13.0 || ^12 || ^14"
-  },
   "dependencies": {
-    "chisel-shared-utils": "^1.0.0",
+    "chisel-shared-utils": "^2.0.0-alpha.0",
     "commander": "^5.1.0",
     "execa": "^4.0.2",
     "fs-extra": "^9.0.1",
@@ -43,5 +37,5 @@
     "tinyqueue": "^2.0.3",
     "update-notifier": "^4.1.0"
   },
-  "gitHead": "a879e91b61e119d27439c9bd9e7298c89776a4fb"
+  "gitHead": "694c57055488e434f25c3397be312771a8763527"
 }

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

@@ -1,19 +0,0 @@
-<%=
-  [
-    app.browsers.includes('ie11') && 'ie 11',
-    app.browsers.includes('edge18') && 'edge 18',
-    ...(app.browsers.includes('modern')
-      ? [
-          'last 3 Android versions',
-          'last 3 ChromeAndroid versions',
-          'last 3 Chrome versions',
-          'last 3 Firefox versions',
-          'last 3 Safari versions',
-          'last 3 iOS versions',
-          'last 3 Edge versions',
-        ]
-      : []),
-  ]
-    .filter(Boolean)
-    .join('\n')
-%>

package/lib/commands/create/creators/app/template/.eslintignore

@@ -1,4 +0,0 @@
-!.eslintrc.js
-/src/assets
-/dist
-/wp