@panneau/app 3.0.112 → 3.0.114

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/es/index.js +11 -10
  2. package/lib/index.js +22 -21
  3. package/package.json +39 -40
package/es/index.js CHANGED
@@ -1,13 +1,12 @@
1
1
  import _defineProperty from '@babel/runtime/helpers/defineProperty';
2
2
  import _objectSpread from '@babel/runtime/helpers/objectSpread2';
3
- import { useLocation, createPathToRegexpMatcher, useMemoryLocationHook } from '@folklore/routes';
3
+ import { useMemoryRouter } from '@folklore/routes';
4
4
  import PropTypes from 'prop-types';
5
5
  import React, { useCallback, useMemo, useState, useEffect, Fragment } from 'react';
6
- import { Route, Switch, Redirect, Router } from 'wouter';
6
+ import { useLocation, useSearch, Route, Switch, Redirect, Router } from 'wouter';
7
7
  import { useUser, useLogout, useAuth, AuthProvider } from '@panneau/auth';
8
8
  import { PropTypes as PropTypes$1 } from '@panneau/core';
9
9
  import { useUrlGenerator, usePanneauResources, usePanneau, usePanneauColorScheme, ResourceProvider, useComponentsManager, useFormsComponents, useRoutes, usePagesComponentsManager, PanneauProvider, RoutesProvider, ModalProvider, ComponentsProvider } from '@panneau/core/contexts';
10
- import { UppyProvider } from '@panneau/uppy';
11
10
  import { useResourceItem, ApiProvider } from '@panneau/data';
12
11
  import DisplaysProvider from '@panneau/displays';
13
12
  import FieldsProvider from '@panneau/fields';
@@ -16,6 +15,7 @@ import FormsProvider from '@panneau/forms';
16
15
  import { useResourceValues, IntlProvider } from '@panneau/intl';
17
16
  import ListsProvider from '@panneau/lists';
18
17
  import ModalsProvider from '@panneau/modals';
18
+ import { UppyProvider } from '@panneau/uppy';
19
19
  import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
20
20
  import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
21
21
  import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
@@ -141,7 +141,7 @@ var ResourcesMenu = function ResourcesMenu(_ref) {
141
141
  linkClassName = _ref.linkClassName;
142
142
  var _useLocation = useLocation(),
143
143
  _useLocation2 = _slicedToArray(_useLocation, 1),
144
- pathname = _useLocation2[0].pathname;
144
+ pathname = _useLocation2[0];
145
145
  var resources = usePanneauResources();
146
146
  var resourceRoute = useResourceUrlGenerator();
147
147
  var items = useMemo(function () {
@@ -331,8 +331,8 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
331
331
  var resource = _ref.resource;
332
332
  var _useLocation = useLocation(),
333
333
  _useLocation2 = _slicedToArray(_useLocation, 2),
334
- search = _useLocation2[0].search,
335
334
  navigate = _useLocation2[1];
335
+ var search = useSearch();
336
336
  var resourceRoute = useResourceUrlGenerator(resource);
337
337
  var _useMemo = useMemo(function () {
338
338
  return queryString.parse(search, {
@@ -637,8 +637,8 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
637
637
  var componentsManager = useComponentsManager();
638
638
  var _useLocation = useLocation(),
639
639
  _useLocation2 = _slicedToArray(_useLocation, 2),
640
- search = _useLocation2[0].search,
641
640
  navigate = _useLocation2[1];
641
+ var search = useSearch();
642
642
  var query = useMemo(function () {
643
643
  return queryString.parse(search, {
644
644
  arrayFormat: 'bracket'
@@ -1182,7 +1182,7 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
1182
1182
  var routes = useRoutes();
1183
1183
  var _useLocation = useLocation(),
1184
1184
  _useLocation2 = _slicedToArray(_useLocation, 1),
1185
- pathname = _useLocation2[0].pathname;
1185
+ pathname = _useLocation2[0];
1186
1186
  var _useState = useState({
1187
1187
  statusCode: initialStatusCode,
1188
1188
  pathname: pathname
@@ -1304,7 +1304,6 @@ PanneauRoutes.propTypes = propTypes$1;
1304
1304
  PanneauRoutes.defaultProps = defaultProps$1;
1305
1305
  var Routes = PanneauRoutes;
1306
1306
 
1307
- var pathToRegexpMatcher = createPathToRegexpMatcher();
1308
1307
  var propTypes = {
1309
1308
  definition: PropTypes$1.panneauDefinition.isRequired,
1310
1309
  components: PropTypes.oneOfType([PropTypes.objectOf(PropTypes.elementType), PropTypes.objectOf(PropTypes.objectOf(PropTypes.elementType))]),
@@ -1367,10 +1366,12 @@ var Container = function Container(_ref) {
1367
1366
  var onLogout = useCallback(function () {
1368
1367
  window.location.reload();
1369
1368
  }, [baseUrl]);
1370
- var memoryLocationHook = useMemoryLocationHook();
1369
+ var _useMemoryRouter = useMemoryRouter(),
1370
+ memoryLocationHook = _useMemoryRouter.hook,
1371
+ memorySearchHook = _useMemoryRouter.searchHook;
1371
1372
  return /*#__PURE__*/React.createElement(Router, {
1372
1373
  hook: isMemoryRouter ? memoryLocationHook : null,
1373
- matcher: pathToRegexpMatcher
1374
+ searchHook: isMemoryRouter ? memorySearchHook : null
1374
1375
  }, /*#__PURE__*/React.createElement(IntlProvider, {
1375
1376
  locale: locale,
1376
1377
  locales: locales,
package/lib/index.js CHANGED
@@ -11,7 +11,6 @@ var wouter = require('wouter');
11
11
  var auth = require('@panneau/auth');
12
12
  var core = require('@panneau/core');
13
13
  var contexts = require('@panneau/core/contexts');
14
- var uppy = require('@panneau/uppy');
15
14
  var data = require('@panneau/data');
16
15
  var DisplaysProvider = require('@panneau/displays');
17
16
  var FieldsProvider = require('@panneau/fields');
@@ -20,6 +19,7 @@ var FormsProvider = require('@panneau/forms');
20
19
  var intl = require('@panneau/intl');
21
20
  var ListsProvider = require('@panneau/lists');
22
21
  var ModalsProvider = require('@panneau/modals');
22
+ var uppy = require('@panneau/uppy');
23
23
  var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
24
24
  var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
25
25
  var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
@@ -174,9 +174,9 @@ var ResourcesMenu = function ResourcesMenu(_ref) {
174
174
  var className = _ref.className,
175
175
  itemClassName = _ref.itemClassName,
176
176
  linkClassName = _ref.linkClassName;
177
- var _useLocation = routes.useLocation(),
177
+ var _useLocation = wouter.useLocation(),
178
178
  _useLocation2 = _slicedToArray__default["default"](_useLocation, 1),
179
- pathname = _useLocation2[0].pathname;
179
+ pathname = _useLocation2[0];
180
180
  var resources = contexts.usePanneauResources();
181
181
  var resourceRoute = hooks.useResourceUrlGenerator();
182
182
  var items = React.useMemo(function () {
@@ -364,10 +364,10 @@ var propTypes$e = {
364
364
  var defaultProps$d = {};
365
365
  var ResourceCreatePage = function ResourceCreatePage(_ref) {
366
366
  var resource = _ref.resource;
367
- var _useLocation = routes.useLocation(),
367
+ var _useLocation = wouter.useLocation(),
368
368
  _useLocation2 = _slicedToArray__default["default"](_useLocation, 2),
369
- search = _useLocation2[0].search,
370
369
  navigate = _useLocation2[1];
370
+ var search = wouter.useSearch();
371
371
  var resourceRoute = hooks.useResourceUrlGenerator(resource);
372
372
  var _useMemo = React.useMemo(function () {
373
373
  return queryString__default["default"].parse(search, {
@@ -422,7 +422,7 @@ var defaultProps$c = {};
422
422
  var ResourceDeletePage = function ResourceDeletePage(_ref) {
423
423
  var itemId = _ref.itemId,
424
424
  resource = _ref.resource;
425
- var _useLocation = routes.useLocation(),
425
+ var _useLocation = wouter.useLocation(),
426
426
  _useLocation2 = _slicedToArray__default["default"](_useLocation, 2),
427
427
  navigate = _useLocation2[1];
428
428
  var resourceRoute = hooks.useResourceUrlGenerator(resource);
@@ -670,10 +670,10 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
670
670
  }, [canCreate, actions]);
671
671
  var resourceValues = intl.useResourceValues(resource);
672
672
  var componentsManager = contexts.useComponentsManager();
673
- var _useLocation = routes.useLocation(),
673
+ var _useLocation = wouter.useLocation(),
674
674
  _useLocation2 = _slicedToArray__default["default"](_useLocation, 2),
675
- search = _useLocation2[0].search,
676
675
  navigate = _useLocation2[1];
676
+ var search = wouter.useSearch();
677
677
  var query = React.useMemo(function () {
678
678
  return queryString__default["default"].parse(search, {
679
679
  arrayFormat: 'bracket'
@@ -1214,10 +1214,10 @@ var defaultProps$1 = {
1214
1214
  };
1215
1215
  var PanneauRoutes = function PanneauRoutes(_ref) {
1216
1216
  var initialStatusCode = _ref.statusCode;
1217
- var routes$1 = contexts.useRoutes();
1218
- var _useLocation = routes.useLocation(),
1217
+ var routes = contexts.useRoutes();
1218
+ var _useLocation = wouter.useLocation(),
1219
1219
  _useLocation2 = _slicedToArray__default["default"](_useLocation, 1),
1220
- pathname = _useLocation2[0].pathname;
1220
+ pathname = _useLocation2[0];
1221
1221
  var _useState = React.useState({
1222
1222
  statusCode: initialStatusCode,
1223
1223
  pathname: pathname
@@ -1293,7 +1293,7 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
1293
1293
  // If user is unauthenticated
1294
1294
  if (user === null) {
1295
1295
  return /*#__PURE__*/React__default["default"].createElement(wouter.Switch, null, /*#__PURE__*/React__default["default"].createElement(wouter.Route, {
1296
- path: routes$1['auth.login']
1296
+ path: routes['auth.login']
1297
1297
  }, /*#__PURE__*/React__default["default"].createElement(LoginComponent, loginPage)), /*#__PURE__*/React__default["default"].createElement(wouter.Route, null, /*#__PURE__*/React__default["default"].createElement(wouter.Redirect, {
1298
1298
  to: "".concat(route('auth.login'), "?next=").concat(encodeURIComponent(pathname)),
1299
1299
  replace: true
@@ -1302,9 +1302,9 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
1302
1302
 
1303
1303
  // Normal routes
1304
1304
  return /*#__PURE__*/React__default["default"].createElement(wouter.Switch, null, user !== null ? /*#__PURE__*/React__default["default"].createElement(wouter.Route, {
1305
- path: routes$1['auth.login']
1305
+ path: routes['auth.login']
1306
1306
  }, /*#__PURE__*/React__default["default"].createElement(wouter.Redirect, {
1307
- to: routes$1.home,
1307
+ to: routes.home,
1308
1308
  replace: true
1309
1309
  })) : null, resources.map(function (resource) {
1310
1310
  var _ref4 = resource || {},
@@ -1317,7 +1317,7 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
1317
1317
  pages: pages
1318
1318
  }));
1319
1319
  }), /*#__PURE__*/React__default["default"].createElement(wouter.Route, {
1320
- path: routes$1.account
1320
+ path: routes.account
1321
1321
  }, /*#__PURE__*/React__default["default"].createElement(AccountComponent, accountPage)), customRoutes.map(function (_ref5) {
1322
1322
  var _ref5$path = _ref5.path,
1323
1323
  path = _ref5$path === void 0 ? null : _ref5$path,
@@ -1326,20 +1326,19 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
1326
1326
  component = _ref5.component,
1327
1327
  props = _objectWithoutProperties__default["default"](_ref5, _excluded2);
1328
1328
  var PageComponent = componentsManager.getComponent(component);
1329
- var finalPath = path || routes$1[pageRoute];
1329
+ var finalPath = path || routes[pageRoute];
1330
1330
  return PageComponent !== null ? /*#__PURE__*/React__default["default"].createElement(wouter.Route, {
1331
1331
  key: "custom-route-".concat(finalPath),
1332
- path: path || routes$1[pageRoute]
1332
+ path: path || routes[pageRoute]
1333
1333
  }, /*#__PURE__*/React__default["default"].createElement(PageComponent, props)) : null;
1334
1334
  }), /*#__PURE__*/React__default["default"].createElement(wouter.Route, {
1335
- path: routes$1.home
1335
+ path: routes.home
1336
1336
  }, /*#__PURE__*/React__default["default"].createElement(HomeComponent, homePage)), /*#__PURE__*/React__default["default"].createElement(wouter.Route, null, /*#__PURE__*/React__default["default"].createElement(ErrorComponent, null)));
1337
1337
  };
1338
1338
  PanneauRoutes.propTypes = propTypes$1;
1339
1339
  PanneauRoutes.defaultProps = defaultProps$1;
1340
1340
  var Routes = PanneauRoutes;
1341
1341
 
1342
- var pathToRegexpMatcher = routes.createPathToRegexpMatcher();
1343
1342
  var propTypes = {
1344
1343
  definition: core.PropTypes.panneauDefinition.isRequired,
1345
1344
  components: PropTypes__default["default"].oneOfType([PropTypes__default["default"].objectOf(PropTypes__default["default"].elementType), PropTypes__default["default"].objectOf(PropTypes__default["default"].objectOf(PropTypes__default["default"].elementType))]),
@@ -1402,10 +1401,12 @@ var Container = function Container(_ref) {
1402
1401
  var onLogout = React.useCallback(function () {
1403
1402
  window.location.reload();
1404
1403
  }, [baseUrl]);
1405
- var memoryLocationHook = routes.useMemoryLocationHook();
1404
+ var _useMemoryRouter = routes.useMemoryRouter(),
1405
+ memoryLocationHook = _useMemoryRouter.hook,
1406
+ memorySearchHook = _useMemoryRouter.searchHook;
1406
1407
  return /*#__PURE__*/React__default["default"].createElement(wouter.Router, {
1407
1408
  hook: isMemoryRouter ? memoryLocationHook : null,
1408
- matcher: pathToRegexpMatcher
1409
+ searchHook: isMemoryRouter ? memorySearchHook : null
1409
1410
  }, /*#__PURE__*/React__default["default"].createElement(intl.IntlProvider, {
1410
1411
  locale: locale,
1411
1412
  locales: locales,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@panneau/app",
3
- "version": "3.0.112",
3
+ "version": "3.0.114",
4
4
  "description": "",
5
5
  "keywords": [
6
6
  "javascript"
@@ -63,55 +63,54 @@
63
63
  },
64
64
  "dependencies": {
65
65
  "@babel/runtime": "^7.12.5",
66
- "@folklore/routes": "^0.2.6",
66
+ "@folklore/routes": "^0.2.18",
67
67
  "@fortawesome/fontawesome-svg-core": "^1.2.35",
68
68
  "@fortawesome/free-solid-svg-icons": "^5.15.3",
69
69
  "@fortawesome/react-fontawesome": "^0.1.14",
70
- "@panneau/auth": "^3.0.101",
71
- "@panneau/core": "^3.0.101",
72
- "@panneau/data": "^3.0.101",
73
- "@panneau/displays": "^3.0.112",
74
- "@panneau/element-accordion": "^3.0.101",
75
- "@panneau/element-alert": "^3.0.112",
76
- "@panneau/element-avatar": "^3.0.112",
77
- "@panneau/element-breadcrumbs": "^3.0.112",
78
- "@panneau/element-button": "^3.0.112",
79
- "@panneau/element-buttons": "^3.0.112",
80
- "@panneau/element-dropdown": "^3.0.112",
81
- "@panneau/element-form": "^3.0.112",
82
- "@panneau/element-form-group": "^3.0.112",
83
- "@panneau/element-form-row": "^3.0.112",
84
- "@panneau/element-icon": "^3.0.101",
85
- "@panneau/element-label": "^3.0.101",
86
- "@panneau/element-link": "^3.0.112",
87
- "@panneau/element-loading": "^3.0.101",
88
- "@panneau/element-menu": "^3.0.112",
89
- "@panneau/element-modal": "^3.0.112",
90
- "@panneau/element-navbar": "^3.0.112",
91
- "@panneau/element-pagination": "^3.0.112",
92
- "@panneau/element-radios": "^3.0.112",
93
- "@panneau/element-range": "^3.0.101",
94
- "@panneau/fields": "^3.0.112",
95
- "@panneau/filter-filters": "^3.0.112",
96
- "@panneau/filters": "^3.0.112",
97
- "@panneau/form-resource": "^3.0.112",
98
- "@panneau/forms": "^3.0.112",
99
- "@panneau/intl": "^3.0.101",
100
- "@panneau/list-resource-items": "^3.0.112",
101
- "@panneau/lists": "^3.0.112",
102
- "@panneau/modals": "^3.0.112",
103
- "@panneau/themes": "^3.0.112",
104
- "@panneau/uppy": "^3.0.105",
70
+ "@panneau/auth": "^3.0.113",
71
+ "@panneau/core": "^3.0.113",
72
+ "@panneau/data": "^3.0.113",
73
+ "@panneau/displays": "^3.0.113",
74
+ "@panneau/element-accordion": "^3.0.113",
75
+ "@panneau/element-alert": "^3.0.114",
76
+ "@panneau/element-avatar": "^3.0.114",
77
+ "@panneau/element-breadcrumbs": "^3.0.114",
78
+ "@panneau/element-button": "^3.0.114",
79
+ "@panneau/element-buttons": "^3.0.114",
80
+ "@panneau/element-dropdown": "^3.0.114",
81
+ "@panneau/element-form": "^3.0.114",
82
+ "@panneau/element-form-group": "^3.0.114",
83
+ "@panneau/element-form-row": "^3.0.113",
84
+ "@panneau/element-icon": "^3.0.113",
85
+ "@panneau/element-label": "^3.0.113",
86
+ "@panneau/element-link": "^3.0.114",
87
+ "@panneau/element-loading": "^3.0.113",
88
+ "@panneau/element-menu": "^3.0.114",
89
+ "@panneau/element-modal": "^3.0.114",
90
+ "@panneau/element-navbar": "^3.0.114",
91
+ "@panneau/element-pagination": "^3.0.114",
92
+ "@panneau/element-radios": "^3.0.113",
93
+ "@panneau/element-range": "^3.0.113",
94
+ "@panneau/fields": "^3.0.114",
95
+ "@panneau/filter-filters": "^3.0.114",
96
+ "@panneau/filters": "^3.0.114",
97
+ "@panneau/form-resource": "^3.0.114",
98
+ "@panneau/forms": "^3.0.114",
99
+ "@panneau/intl": "^3.0.113",
100
+ "@panneau/list-resource-items": "^3.0.114",
101
+ "@panneau/lists": "^3.0.114",
102
+ "@panneau/modals": "^3.0.114",
103
+ "@panneau/themes": "^3.0.113",
104
+ "@panneau/uppy": "^3.0.113",
105
105
  "classnames": "^2.2.6",
106
106
  "lodash": "^4.17.21",
107
- "path-to-regexp": "^6.2.1",
108
107
  "prop-types": "^15.7.2",
109
108
  "query-string": "^8.1.0",
110
109
  "react-intl": "^5.15.8||^6.0.0",
111
- "wouter": "^2.11.0"
110
+ "wouter": "^3.0.0"
112
111
  },
113
112
  "publishConfig": {
114
113
  "access": "public"
115
114
  },
116
- "gitHead": "30208f166ba7d2c138e58389d835125cd20ef67f"
115
+ "gitHead": "dff9827ffa36f1504fbdfa02667eb8f210f1c990"
117
116
  }