Merge branch 'release/1.0.12'

nystudio107 · Jan 25, 2018 · 338759b · 338759b
2 parents 58cf11e + 4a9c9a8
commit 338759b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,11 @@
 # nystudio107/craft Change Log
 
-## 1.0.11 - 2018.01.23
+## 1.0.12 - 2018.01.25
 ### Changed
+* Switched from `craft.app.config.general.custom.baseUrl` to `alias('@baseUrl')`
+
+## 1.0.11 - 2018.01.23
+### Added
 * Added `post-install-cmd` to `composer.json`
 
 ## 1.0.10 - 2018.01.18

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "nystudio107/craft",
   "description": "nystudio107 Craft 3 CMS scaffolding project",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "keywords": [
     "craft",
     "cms",
@@ -20,7 +20,7 @@
   "minimum-stability": "RC",
   "require": {
     "php": ">=7.0.0",
-    "craftcms/cms": "^3.0.0-RC1",
+    "craftcms/cms": "^3.0.0-RC7",
     "vlucas/phpdotenv": "^2.4.0",
     "roave/security-advisories": "dev-master",
     "yiisoft/yii2-redis": "^2.0.6",

diff --git a/templates/_layouts/_amp_layout.twig b/templates/_layouts/_amp_layout.twig
@@ -1,6 +1,6 @@
 {# @var craft \craft\web\twig\variables\CraftVariable #}
 {% minify %}
-{% set baseUrl = craft.app.config.general.custom.baseUrl %}
+{% set baseUrl = alias('@baseUrl') ~ '/' %}
 {% set staticAssetsVersion = craft.app.config.general.custom.staticAssetsVersion %}
 {% header "Link: <#{baseUrl}>; rel=dns-prefetch;,<#{baseUrl}>; rel=preconnect; crossorigin;" %}
 <!DOCTYPE html>

diff --git a/templates/_layouts/_layout.twig b/templates/_layouts/_layout.twig
@@ -1,6 +1,6 @@
 {# @var craft \craft\web\twig\variables\CraftVariable #}
 {%- minify -%}
-{% set baseUrl = craft.app.config.general.custom.baseUrl %}
+{% set baseUrl = alias('@baseUrl') ~ '/' %}
 {% set staticAssetsVersion = craft.app.config.general.custom.staticAssetsVersion %}
 {% header "Link: <#{baseUrl}>; rel=dns-prefetch;,<#{baseUrl}>; rel=preconnect; crossorigin;" %}
 <!DOCTYPE html>

diff --git a/templates/sw.js b/templates/sw.js
@@ -1,4 +1,4 @@
-{% set baseUrl = craft.app.config.general.custom.baseUrl %}
+{% set baseUrl = alias('@baseUrl') ~ '/' %}
 {% set staticAssetsVersion = craft.app.config.general.custom.staticAssetsVersion %}
 {% minify js %}
 // borrowed mightily from Fillament Group - https://www.filamentgroup.com/lab/modernizing-delivery.html