Update to latest version of craft and swap out submodules for composer.

Pennebaker · Jul 18, 2017 · 8419677 · 8419677
1 parent 0393c23
commit 8419677
Show file tree

Hide file tree

Showing 7 changed files with 1,339 additions and 160 deletions.
diff --git a/root/.gitignore b/root/.gitignore
@@ -5,3 +5,4 @@ src/media/
 src/fontello/scss
 docs/_book
 /vendor/
+/craft/
diff --git a/root/Gruntfile.coffee b/root/Gruntfile.coffee
@@ -2,7 +2,7 @@ module.exports = (grunt) ->
 
   global['craftMajor'] = 2
   global['craftMinor'] = 6
-  global['craftBuild'] = 2986
+  global['craftBuild'] = 2987
 
   # Automatically loads all Grunt tasks
   require('load-grunt-tasks')(grunt)

diff --git a/root/README.md b/root/README.md
@@ -1,6 +1,6 @@
 # {%= name %}
 ---
-### Currently running craft version 2.6 (2986)
+### Currently running craft version 2.6 (2987)
 
 ### Prerequisites:
 
@@ -13,7 +13,7 @@
 1. `npm install`  
 1. `cd dist && valet link {%= domain_name %} && cd ..`  
 1. `brew update && brew install bash` for OSX to upgrade to Bash 4.x  
-1. `addSubmodules.sh --force` to install submodules. If you want to cherry pick specific submodules, run the command without `--force`  
+1. `composer update`  
 1. `grunt`  
 1. Import DB via [Dev DB Restore](#dev-db-restore)  
 

diff --git a/root/addSubmodules.sh b/root/addSubmodules.sh
diff --git a/root/composer.json b/root/composer.json
@@ -1,27 +1,255 @@
 {
-    "name": "pennebaker/strathmoreproducts.com",
-    "type": "project",
-    "authors": [
-        {
-            "name": "Pennebaker",
-            "email": "[email protected]"
-        }
-    ],
-    "repositories": [
-        {
-            "type":"package",
-            "package": {
-              "name": "nystudio107/cookies",
-              "version":"1.0.4",
-              "source": {
-                  "url": "https://github.com/nystudio107/cookies.git",
-                  "type": "git",
-                  "reference":"1.0.4"
-                }
-            }
-        }
-    ],
-    "require": {
-        "nystudio107/cookies": "1.0.4"
+  "name": "pennebaker/thepreservehouston.com",
+  "minimum-stability": "dev",
+  "type": "project",
+  "authors": [
+    {
+      "name": "Pennebaker",
+      "email": "[email protected]"
     }
+  ],
+  "repositories": [
+    {
+      "type":"package",
+      "package": {
+      "name": "nystudio107/cookies",
+      "version":"1.0.4",
+      "source": {
+        "url": "https://github.com/nystudio107/cookies.git",
+        "type": "git",
+        "reference":"1.0.4"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "craftcms/contact-form",
+        "version":"1.9.0",
+        "source": {
+          "url": "https://github.com/craftcms/contact-form.git",
+          "type": "git",
+          "reference":"1.9.0"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "mmikkel/CpFieldLinks-Craft",
+        "version":"1.2.2",
+        "source": {
+          "url": "https://github.com/mmikkel/CpFieldLinks-Craft.git",
+          "type": "git",
+          "reference":"v.1.2.2"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "mmikkel/Reasons-Craft",
+        "version":"1.0.10",
+        "source": {
+          "url": "https://github.com/mmikkel/Reasons-Craft.git",
+          "type": "git",
+          "reference":"v.1.0.10"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "smcyr/Craft-FocusPoint",
+        "version":"1.1.3",
+        "source": {
+          "url": "https://github.com/smcyr/Craft-FocusPoint.git",
+          "type": "git",
+          "reference":"1.1.3"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "benjamminf/craft-neo",
+        "version":"1.4.1",
+        "source": {
+          "url": "https://github.com/benjamminf/craft-neo.git",
+          "type": "git",
+          "reference":"1.4.1"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "benjamminf/craft-quick-field",
+        "version":"0.3.4",
+        "source": {
+          "url": "https://github.com/benjamminf/craft-quick-field.git",
+          "type": "git",
+          "reference":"0.3.4"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "benjamminf/craft-nocache",
+        "version":"1.0.1",
+        "source": {
+          "url": "https://github.com/benjamminf/craft-nocache.git",
+          "type": "git",
+          "reference":"1.0.1"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "benjamminf/craft-relabel",
+        "version":"0.1.3",
+        "source": {
+          "url": "https://github.com/benjamminf/craft-relabel.git",
+          "type": "git",
+          "reference":"0.1.3"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "christianruhstaller/craft-safedelete",
+        "version":"0.3.0",
+        "source": {
+          "url": "https://github.com/christianruhstaller/craft-safedelete.git",
+          "type": "git",
+          "reference":"0.3.0"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "jamiepittock/craft-typogrify",
+        "version":"1.0.1",
+        "source": {
+          "url": "https://github.com/jamiepittock/craft-typogrify.git",
+          "type": "git",
+          "reference":"master"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "michaelrog/craftfieldnotes",
+        "version":"0.1",
+        "source": {
+          "url": "https://bitbucket.org/michaelrog/craftfieldnotes.git",
+          "type": "git",
+          "reference":"0.1"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "engram-design/ExpandedSingles",
+        "version":"0.2.4",
+        "source": {
+          "url": "https://github.com/engram-design/ExpandedSingles.git",
+          "type": "git",
+          "reference":"0.2.4"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "aelvan/Imager-Craft",
+        "version":"1.6.1",
+        "source": {
+          "url": "https://github.com/aelvan/Imager-Craft.git",
+          "type": "git",
+          "reference":"v1.6.1"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "fruitstudios/LinkIt",
+        "version":"2.3.4",
+        "source": {
+          "url": "https://github.com/fruitstudios/LinkIt.git",
+          "type": "git",
+          "reference":"2.3.4"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "fromtheoutfit/navee",
+        "version":"1.3.0",
+        "source": {
+          "url": "https://github.com/fromtheoutfit/navee.git",
+          "type": "git",
+          "reference":"v1.3.0"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "elliotlewis/Redactor-Extras",
+        "version":"1.3.2",
+        "source": {
+          "url": "https://github.com/elliotlewis/Redactor-Extras.git",
+          "type": "git",
+          "reference":"v1.3.2"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "engram-design/SuperTable",
+        "version":"1.0.5",
+        "source": {
+          "url": "https://github.com/engram-design/SuperTable.git",
+          "type": "git",
+          "reference":"1.0.5"
+        }
+      }
+    }
+  ],
+  "require": {
+    "pennebaker/craftcms-thearchitect": "1.6.0-beta.5",
+    "nystudio107/cookies": "1.0.4",
+    "nystudio107/instantanalytics": "1.1.8",
+    "nystudio107/minify": "1.1.2",
+    "nystudio107/richvariables": "1.0.5",
+    "nystudio107/seomatic": "1.1.47",
+    "nystudio107/transcoder": "1.1.1",
+    "craftcms/contact-form": "1.9.0",
+    "mmikkel/CpFieldLinks-Craft": "1.2.2",
+    "mmikkel/Reasons-Craft": "1.0.10",
+    "smcyr/Craft-FocusPoint": "1.1.3",
+    "benjamminf/craft-neo": "1.4.1",
+    "benjamminf/craft-quick-field": "0.3.4",
+    "benjamminf/craft-nocache": "1.0.1",
+    "benjamminf/craft-relabel": "0.1.3",
+    "christianruhstaller/craft-safedelete": "0.3.0",
+    "jamiepittock/craft-typogrify": "1.0.1",
+    "michaelrog/craftfieldnotes": "0.1",
+    "engram-design/ExpandedSingles": "0.2.4",
+    "aelvan/Imager-Craft": "1.6.1",
+    "fruitstudios/LinkIt": "2.3.4",
+    "fromtheoutfit/navee": "v1.3.0",
+    "elliotlewis/Redactor-Extras": "1.3.2",
+    "engram-design/SuperTable": "1.0.5"
+  }
 }