Merge branch 'release/3.1.46' into v3

nystudio107 · Feb 3, 2021 · f9f18d7 · f9f18d7
2 parents 9c2e986 + b6c09c0
commit f9f18d7
Show file tree

Hide file tree

Showing 29 changed files with 1,169 additions and 1,604 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Retour Changelog
 
+## 3.1.46 - 2021.02.02
+### Changed
+* Updated Axios to `^0.21.1`
+* Updated to latest npm deps
+* Rebuilt frontend assets
+
+### Fixed
+* Fixed an issue that could cause migration issues from Craft 2 to Craft 3.6, use `Use MigrationHelper::dropIndexIfExists()`
+
 ## 3.1.45 - 2020.12.10
 ### Changed
 * Split out vendors & commons chunks

diff --git a/buildchain/package-lock.json b/buildchain/package-lock.json
diff --git a/buildchain/package.json b/buildchain/package.json
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "apexcharts": "^3.8.0",
-    "axios": "^0.19.0",
+    "axios": "^0.21.1",
     "core-js": "^3.0.0",
     "regenerator-runtime": "^0.13.2",
     "tailwindcss": "^1.0.4",

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-retour",
     "description": "Retour allows you to intelligently redirect legacy URLs, so that you don't lose SEO value when rebuilding & restructuring a website",
     "type": "craft-plugin",
-    "version": "3.1.45",
+    "version": "3.1.46",
     "keywords": [
         "craftcms",
         "craft-plugin",

diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/src/assetbundles/retour/dist/css/styles.css b/src/assetbundles/retour/dist/css/styles.css
diff --git a/src/assetbundles/retour/dist/js/commons.js b/src/assetbundles/retour/dist/js/commons.js
diff --git a/src/assetbundles/retour/dist/js/commons.js.map b/src/assetbundles/retour/dist/js/commons.js.map
diff --git a/src/assetbundles/retour/dist/js/commons.js.map.gz b/src/assetbundles/retour/dist/js/commons.js.map.gz