From 8f8a9e732d4a2abf5ff2f1b64179e08adb976582 Mon Sep 17 00:00:00 2001 From: Leevi Graham Date: Tue, 27 Oct 2020 11:52:45 +1100 Subject: [PATCH 1/2] composer 2 support --- CHANGELOG.md | 4 ++++ composer.json | 2 +- .../{addressfield => AddressField}/AddressFieldAsset.php | 2 +- .../{addressfield => AddressField}/dist/css/Address.css | 0 .../{addressfield => AddressField}/dist/js/Address.js | 0 .../{embedfield => EmbedField}/EmbedFieldAsset.php | 2 +- .../{embedfield => EmbedField}/dist/css/Embed.css | 0 src/assetbundles/{embedfield => EmbedField}/dist/js/Embed.js | 0 src/fields/Address.php | 2 +- src/fields/Embed.php | 2 +- 10 files changed, 9 insertions(+), 5 deletions(-) rename src/assetbundles/{addressfield => AddressField}/AddressFieldAsset.php (97%) rename src/assetbundles/{addressfield => AddressField}/dist/css/Address.css (100%) rename src/assetbundles/{addressfield => AddressField}/dist/js/Address.js (100%) rename src/assetbundles/{embedfield => EmbedField}/EmbedFieldAsset.php (97%) rename src/assetbundles/{embedfield => EmbedField}/dist/css/Embed.css (100%) rename src/assetbundles/{embedfield => EmbedField}/dist/js/Embed.js (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0806a85..7d4a87f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## 0.0.25 - 2020.10.27 +### Fixes + - Asset bundle namespace - Composer 2 support + ## 0.0.24 - 2020.09.14 ### Fixes - Changed: Autocomplete now fills in street address line 1 instead of 2. diff --git a/composer.json b/composer.json index e092e7a..bb1afc5 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "newism/craft3-fields", "description": "Address, telephone and email fields for CraftCMS 3.x", "type": "craft-plugin", - "version": "0.0.24", + "version": "0.0.25", "keywords": [ "craft", "cms", diff --git a/src/assetbundles/addressfield/AddressFieldAsset.php b/src/assetbundles/AddressField/AddressFieldAsset.php similarity index 97% rename from src/assetbundles/addressfield/AddressFieldAsset.php rename to src/assetbundles/AddressField/AddressFieldAsset.php index b5630cc..a45be04 100644 --- a/src/assetbundles/addressfield/AddressFieldAsset.php +++ b/src/assetbundles/AddressField/AddressFieldAsset.php @@ -8,7 +8,7 @@ * @copyright Copyright (c) 2017 Leevi Graham */ -namespace newism\fields\assetbundles\addressfield; +namespace newism\fields\assetbundles\AddressField; use craft\web\AssetBundle; use craft\web\assets\cp\CpAsset; diff --git a/src/assetbundles/addressfield/dist/css/Address.css b/src/assetbundles/AddressField/dist/css/Address.css similarity index 100% rename from src/assetbundles/addressfield/dist/css/Address.css rename to src/assetbundles/AddressField/dist/css/Address.css diff --git a/src/assetbundles/addressfield/dist/js/Address.js b/src/assetbundles/AddressField/dist/js/Address.js similarity index 100% rename from src/assetbundles/addressfield/dist/js/Address.js rename to src/assetbundles/AddressField/dist/js/Address.js diff --git a/src/assetbundles/embedfield/EmbedFieldAsset.php b/src/assetbundles/EmbedField/EmbedFieldAsset.php similarity index 97% rename from src/assetbundles/embedfield/EmbedFieldAsset.php rename to src/assetbundles/EmbedField/EmbedFieldAsset.php index 684a9d0..c1b82ce 100644 --- a/src/assetbundles/embedfield/EmbedFieldAsset.php +++ b/src/assetbundles/EmbedField/EmbedFieldAsset.php @@ -8,7 +8,7 @@ * @copyright Copyright (c) 2017 Leevi Graham */ -namespace newism\fields\assetbundles\embedfield; +namespace newism\fields\assetbundles\EmbedField; use craft\web\AssetBundle; use craft\web\assets\cp\CpAsset; diff --git a/src/assetbundles/embedfield/dist/css/Embed.css b/src/assetbundles/EmbedField/dist/css/Embed.css similarity index 100% rename from src/assetbundles/embedfield/dist/css/Embed.css rename to src/assetbundles/EmbedField/dist/css/Embed.css diff --git a/src/assetbundles/embedfield/dist/js/Embed.js b/src/assetbundles/EmbedField/dist/js/Embed.js similarity index 100% rename from src/assetbundles/embedfield/dist/js/Embed.js rename to src/assetbundles/EmbedField/dist/js/Embed.js diff --git a/src/fields/Address.php b/src/fields/Address.php index cae6105..32c9041 100644 --- a/src/fields/Address.php +++ b/src/fields/Address.php @@ -27,7 +27,7 @@ use craft\helpers\StringHelper; use craft\web\View; use JsonException; -use newism\fields\assetbundles\addressfield\AddressFieldAsset; +use newism\fields\assetbundles\AddressField\AddressFieldAsset; use newism\fields\models\AddressModel; use newism\fields\NsmFields; use newism\fields\validators\JsonValidator; diff --git a/src/fields/Embed.php b/src/fields/Embed.php index 1d1f18a..5e6ebbd 100644 --- a/src/fields/Embed.php +++ b/src/fields/Embed.php @@ -16,7 +16,7 @@ use craft\base\PreviewableFieldInterface; use craft\helpers\StringHelper; use craft\helpers\UrlHelper; -use newism\fields\assetbundles\embedfield\EmbedFieldAsset; +use newism\fields\assetbundles\EmbedField\EmbedFieldAsset; use newism\fields\models\EmbedModel; use newism\fields\NsmFields; use RuntimeException; From 94e88c8bd4ef360e64acdd87e37b21865691f00e Mon Sep 17 00:00:00 2001 From: Leevi Graham Date: Tue, 27 Oct 2020 12:00:18 +1100 Subject: [PATCH 2/2] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bb1afc5..88fdff7 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "newism/craft3-fields", "description": "Address, telephone and email fields for CraftCMS 3.x", "type": "craft-plugin", - "version": "0.0.25", + "version": "1.0.0", "keywords": [ "craft", "cms",