Merge branch 'develop' into jbk/cast-query-bools

tighten · Oct 30, 2020 · 1dd348f · 1dd348f
2 parents 37f0dd9 + 9ec517c
commit 1dd348f
Show file tree

Hide file tree

Showing 24 changed files with 178 additions and 128 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,7 @@ Breaking changes are marked with ⚠️.
 - ⚠️ Rename `namedRoutes` → `routes`, `defaultParameters` → `defaults`, `baseUrl` → `url`, and `basePort` → `port` ([#338](https://github.com/tighten/ziggy/pull/338))
 - ⚠️ Make the `filter()` method on the `Ziggy` class return an instance of that class instead of a collection of routes ([#341](https://github.com/tighten/ziggy/pull/341))
 - ⚠️ Make the `nameKeyedRoutes()`, `resolveBindings()`, `applyFilters()`, and `group()` methods on the `Ziggy` class, and the `generate()` method on the `CommandRouteGenerator` class, private ([#341](https://github.com/tighten/ziggy/pull/341))
+- ⚠️ Export from `index.js` instead of `route.js` ([#344](https://github.com/tighten/ziggy/pull/344))
 - ⚠️ Encode boolean query parameters as integers ([#345](https://github.com/tighten/ziggy/pull/345))
 
 **Deprecated**

diff --git a/README.md b/README.md
@@ -282,7 +282,7 @@ const path = require('path');
 mix.webpackConfig({
     resolve: {
         alias: {
-            ziggy: path.resolve('vendor/tighten/ziggy/src/js/route.js'),
+            ziggy: path.resolve('vendor/tighten/ziggy/dist'),
         },
     },
 });

diff --git a/dist/index.es.js b/dist/index.es.js
diff --git a/dist/index.es.js.map b/dist/index.es.js.map
diff --git a/dist/route.js → dist/index.js b/dist/route.js → dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/index.m.js b/dist/index.m.js
diff --git a/dist/index.m.js.map b/dist/index.m.js.map