Merge pull request #41 from fourkitchens/2.x

Update master to match 2.x branch

.circleci/config.yml

@@ -11,13 +11,13 @@ jobs:
       - node/install-packages:
           cache-path: ~/project/node_modules
           override-ci-command: npm ci
-  build_php:
-    executor: php/default
-    steps:
-      - checkout
-      - php/install-composer:
-          install-version: 2.0.8
-      - php/install-packages
+#  build_php:
+#    executor: php/default
+#    steps:
+#      - checkout
+#      - php/install-composer:
+#          install-version: 2.1.9
+#      - php/install-packages
   release:
     executor:
       name: node/default
@@ -33,13 +33,13 @@ workflows:
   build:
     jobs:
       - build_node
-      - build_php
+#      - build_php
       - release:
           requires:
             - build_node
-            - build_php
+#            - build_php
           filters:
             branches:
               only:
-                - '+([0-9])?(.{+([0-9]),x}).x'
+                - '2.x'
                 - 'master'

composer.json

@@ -57,9 +57,6 @@
             "web/core": [
                 "type:drupal-core"
             ],
-            "web/libraries/masonry": [
-                "bower-asset/masonry-layout"
-            ],
             "web/libraries/{$name}": [
                 "type:drupal-library",
                 "type:bower-asset",

package.json

@@ -3,6 +3,11 @@
   "version": "0.0.1",
   "description": "A starter kit for a Drupal project",
   "scripts": {
+    "confim": "./scripts/sous/confim.sh",
+    "confex": "./scripts/sous/confex.sh",
+    "import-data": "./scripts/sous/import-data.sh",
+    "rebuild": "./scripts/sous/rebuild.sh",
+    "local-data-bak": "./scripts/sous/local-data-bak.sh",
     "publish": "semantic-release --tag-format '${version}'",
     "publish-test": "semantic-release --tag-format '${version}' --dry-run --debug",
     "postinstall": "patch-package"

release.config.js

@@ -1,6 +1,6 @@
 module.exports = {
   branches: [
-    '+([0-9])?(.{+([0-9]),x}).x',
+    '2.x',
     'master'
   ],
   plugins: [

scripts/sous/rebuild.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-composer install
-yarn import-data
-yarn confim
+lando composer install
+npm run import-data
+npm run confim
+lando drush user:unblock superuser_1
 lando drush uli

sous/Starter.php

@@ -20,10 +20,12 @@ public static function installTheme() {
   // New DrupalFinder to get the Composer root path.
   $drupalFinder = new DrupalFinder();
   $drupalFinder->locateRoot(getcwd());
-  $composerRoot = str_replace('-', '_', strtolower(basename($drupalFinder->getComposerRoot())));
+  $removeChars = array("-", "_", " ");
+  $composerRoot = str_replace($removeChars, '', strtolower(basename($drupalFinder->getComposerRoot())));
   // Execute the Emulsify theme build based on composer create path.
-  shell_exec ("cd web/themes/contrib/emulsify-design-system/ && php emulsify.php $composerRoot");
-  shell_exec ("cd web/themes/contrib/emulsify-design-system/ && npm install");
+  shell_exec ("cd web/themes/contrib/emulsify-drupal/ && php emulsify.php $composerRoot");
+  shell_exec ("cd web/themes/contrib/emulsify-drupal/ && npm install");
+  shell_exec ("cd web/themes/custom/$composerRoot/ && npm install");
   // Generate  system.theme.yml and append new theme to install.
   $system_theme_yml = [
     "default" => $composerRoot,