[Module Bundling] improved imports/exports

Jovert Lota Palonpon · Jovert Lota Palonpon · commit 695cb7dd857c · 2019-03-23T13:40:37.000+08:00
diff --git a/public/assets.json b/public/assets.json
@@ -1,4 +1,4 @@
 {
-  "js/backoffice.js": "js/backoffice.bundle.997a6e48e5aeafd35415.js",
+  "js/backoffice.js": "js/backoffice.bundle.0d984d671fd00bfd1a94.js",
   "js/vendor.js": "js/vendor.bundle.60bab7ed0c4b898e6cd4.js"
 }
diff --git a/public/js/backoffice.bundle.0d984d671fd00bfd1a94.js b/public/js/backoffice.bundle.0d984d671fd00bfd1a94.js
diff --git a/resources/js/config/routes.js b/resources/js/config/routes.js
@@ -1,32 +1,33 @@
-import * as Views from '../views';
 import { BACKOFFICE_ROUTES } from '../routers';
+import * as Auth from '../views/auth';
+import * as Errors from '../views/errors';
 
 export default [
     {
         name: 'auth.signin',
         path: '/signin',
-        component: Views.AuthSignin,
+        component: Auth.SignIn,
         auth: false,
     },
 
     {
         name: 'auth.passwords.request',
         path: '/password/request',
-        component: Views.AuthPasswordRequest,
+        component: Auth.PasswordRequest,
         auth: false,
     },
 
     {
         name: 'auth.passwords.reset',
         path: '/password/reset/:token',
-        component: Views.AuthPasswordReset,
+        component: Auth.PasswordReset,
         auth: false,
     },
 
     ...BACKOFFICE_ROUTES,
 
     {
         name: 'errors.not-found',
-        component: Views.ErrorNotFound,
+        component: Errors.NotFound,
     },
 ];
diff --git a/resources/js/routers/backoffice.js b/resources/js/routers/backoffice.js
@@ -1,31 +1,32 @@
-import * as BackofficeViews from '../views/__backoffice';
+import { Home } from '../views/__backoffice';
+import * as Users from '../views/__backoffice/users';
 
 export default [
     {
         name: 'home',
         path: '/',
-        component: BackofficeViews.Home,
+        component: Home,
         auth: true,
     },
 
     {
         name: 'users.index',
         path: '/r/users',
-        component: BackofficeViews.UserList,
+        component: Users.List,
         auth: true,
     },
 
     {
         name: 'users.create',
         path: '/r/users/create',
-        component: BackofficeViews.UserCreate,
+        component: Users.Create,
         auth: true,
     },
 
     {
         name: 'users.edit',
         path: '/r/users/:id/edit',
-        component: BackofficeViews.UserEdit,
+        component: Users.Edit,
         auth: true,
     },
 ].map(route => {
diff --git a/resources/js/views/__backoffice/Home.js b/resources/js/views/__backoffice/Home.js
@@ -1,9 +1,9 @@
 import React, { Component } from 'react';
 import { Typography } from '@material-ui/core';
 
-import { MasterLayout } from './';
+import { Master as MasterLayout } from './layouts';
 
-export class Home extends Component {
+class Home extends Component {
     render() {
         const primaryAction = {
             text: 'Export Stats',
@@ -29,3 +29,5 @@ export class Home extends Component {
         );
     }
 }
+
+export default Home;
diff --git a/resources/js/views/__backoffice/index.js b/resources/js/views/__backoffice/index.js
@@ -1,9 +1 @@
-export { Master as MasterLayout } from './layouts/Master';
-export { Header } from './partials/Header';
-export { Sidebar } from './partials/Sidebar';
-
-export { Home } from './Home';
-
-export { List as UserList } from './users';
-export { Create as UserCreate } from './users';
-export { Edit as UserEdit } from './users';
+export { default as Home } from './Home';
diff --git a/resources/js/views/__backoffice/layouts/Master.js b/resources/js/views/__backoffice/layouts/Master.js
@@ -10,7 +10,7 @@ import {
     withStyles,
 } from '@material-ui/core';
 
-import { Header, Sidebar } from '../';
+import { Header, Sidebar } from '../partials';
 
 class Master extends Component {
     state = {
@@ -180,6 +180,4 @@ const styles = theme => ({
     },
 });
 
-const Styled = withStyles(styles)(Master);
-
-export { Styled as Master };
+export default withStyles(styles)(Master);
diff --git a/resources/js/views/__backoffice/layouts/index.js b/resources/js/views/__backoffice/layouts/index.js
@@ -0,0 +1 @@
+export { default as Master } from './Master';
diff --git a/resources/js/views/__backoffice/partials/Header.js b/resources/js/views/__backoffice/partials/Header.js
@@ -455,6 +455,4 @@ const styles = theme => ({
     },
 });
 
-const Styled = withStyles(styles)(Header);
-
-export { Styled as Header };
+export default withStyles(styles)(Header);
diff --git a/resources/js/views/__backoffice/partials/Sidebar.js b/resources/js/views/__backoffice/partials/Sidebar.js
@@ -183,6 +183,4 @@ const styles = theme => ({
     },
 });
 
-const Styled = withStyles(styles)(Sidebar);
-
-export { Styled as Sidebar };
+export default withStyles(styles)(Sidebar);
diff --git a/resources/js/views/__backoffice/partials/index.js b/resources/js/views/__backoffice/partials/index.js
@@ -0,0 +1,2 @@
+export { default as Header } from './Header';
+export { default as Sidebar } from './Sidebar';
diff --git a/resources/js/views/__backoffice/users/Create.js b/resources/js/views/__backoffice/users/Create.js
@@ -1,7 +1,8 @@
 import React, { Component } from 'react';
-import { MasterLayout } from '../';
 
-export class Create extends Component {
+import { Master as MasterLayout } from '../layouts';
+
+class Create extends Component {
     render() {
         return (
             <MasterLayout {...this.props} pageTitle="Create a user">
@@ -10,3 +11,5 @@ export class Create extends Component {
         );
     }
 }
+
+export default Create;
diff --git a/resources/js/views/__backoffice/users/Edit.js b/resources/js/views/__backoffice/users/Edit.js
@@ -1,7 +1,8 @@
 import React, { Component } from 'react';
-import { MasterLayout } from '../';
 
-export class Edit extends Component {
+import { Master as MasterLayout } from '../layouts';
+
+class Edit extends Component {
     render() {
         const { params } = this.props.match;
 
@@ -12,3 +13,5 @@ export class Edit extends Component {
         );
     }
 }
+
+export default Edit;
diff --git a/resources/js/views/__backoffice/users/List.js b/resources/js/views/__backoffice/users/List.js
@@ -8,7 +8,7 @@ import { _route } from '../../../utils/Navigation';
 import { _color } from '../../../utils/Random';
 import { _queryParams, _queryString } from '../../../utils/URL';
 import { Table } from '../../../ui';
-import { MasterLayout } from '../';
+import { Master as MasterLayout } from '../layouts';
 import { User } from '../../../models';
 
 class List extends Component {
@@ -331,4 +331,4 @@ class List extends Component {
     }
 }
 
-export { List };
+export default List;
diff --git a/resources/js/views/__backoffice/users/index.js b/resources/js/views/__backoffice/users/index.js
@@ -1,3 +1,3 @@
-export { List } from './List';
-export { Create } from './Create';
-export { Edit } from './Edit';
+export { default as List } from './List';
+export { default as Create } from './Create';
+export { default as Edit } from './Edit';
diff --git a/resources/js/views/auth/SignIn.js b/resources/js/views/auth/SignIn.js
@@ -23,7 +23,7 @@ import {
 
 import { _queryParams, _queryString } from '../../utils/URL';
 import { _route } from '../../utils/Navigation';
-import { AuthLayout } from '../';
+import { Auth as AuthLayout } from '../layouts';
 
 class SignIn extends Component {
     state = {
@@ -406,6 +406,5 @@ const styles = theme => ({
 });
 
 const Styled = withStyles(styles)(SignIn);
-const WrappedForm = withFormik({})(Styled);
 
-export { WrappedForm as SignIn };
+export default withFormik({})(Styled);
diff --git a/resources/js/views/auth/index.js b/resources/js/views/auth/index.js
@@ -0,0 +1,3 @@
+export { default as SignIn } from './SignIn';
+export { default as PasswordRequest } from './passwords/Request';
+export { default as PasswordReset } from './passwords/Reset';
diff --git a/resources/js/views/auth/passwords/Request.js b/resources/js/views/auth/passwords/Request.js
@@ -4,7 +4,7 @@ import { Formik, Form, withFormik } from 'formik';
 import * as Yup from 'yup';
 import { Grid, TextField, Button, Link, withStyles } from '@material-ui/core';
 
-import { AuthLayout } from '../../';
+import { Auth as AuthLayout } from '../../layouts';
 import { _route } from '../../../utils/Navigation';
 import { _queryParams, _queryString } from '../../../utils/URL';
 
@@ -205,6 +205,5 @@ const styles = theme => ({
 });
 
 const Styled = withStyles(styles)(PasswordRequest);
-const WrappedForm = withFormik({})(Styled);
 
-export { WrappedForm as PasswordRequest };
+export default withFormik({})(Styled);
diff --git a/resources/js/views/auth/passwords/Reset.js b/resources/js/views/auth/passwords/Reset.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 
-export class PasswordReset extends Component {
+export default class PasswordReset extends Component {
     render() {
         return <h1>Password Reset</h1>;
     }
diff --git a/resources/js/views/errors/NotFound.js b/resources/js/views/errors/NotFound.js
@@ -1,9 +1,11 @@
 import React from 'react';
 
-import { ErrorLayout } from '../';
+import { Error as ErrorLayout } from '../layouts';
 
-export const NotFound = () => (
+const NotFound = () => (
     <ErrorLayout>
         <h1>Whooops! We couldn't find what you're looking for :(</h1>
     </ErrorLayout>
 );
+
+export default NotFound;
diff --git a/resources/js/views/errors/index.js b/resources/js/views/errors/index.js
@@ -0,0 +1 @@
+export { default as NotFound } from './NotFound';
diff --git a/resources/js/views/index.js b/resources/js/views/index.js
@@ -1,11 +1 @@
-export { default as AuthLayout } from './layouts/Auth';
-export { default as ErrorLayout } from './layouts/Error';
-
-export { SignIn as AuthSignin } from './auth/SignIn';
-export {
-    PasswordRequest as AuthPasswordRequest,
-} from './auth/passwords/Request';
-export { PasswordReset as AuthPasswordReset } from './auth/passwords/Reset';
-
 export { default as Loading } from './Loading';
-export { NotFound as ErrorNotFound } from './errors/NotFound';
diff --git a/resources/js/views/layouts/index.js b/resources/js/views/layouts/index.js
@@ -0,0 +1,2 @@
+export { default as Auth } from './Auth';
+export { default as Error } from './Error';

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "js/backoffice.js": "js/backoffice.bundle.997a6e48e5aeafd35415.js",`
	`2`	`+ "js/backoffice.js": "js/backoffice.bundle.0d984d671fd00bfd1a94.js",`
`3`	`3`	`"js/vendor.js": "js/vendor.bundle.60bab7ed0c4b898e6cd4.js"`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export { default as Master } from './Master';`