Skip to content

Commit c63f56d

Browse files
pshrmntimdorr
authored andcommitted
Update website to Webpack v3 (#5725)
* Update website to Webpack v3 * Move bundle loaders to Webpack config * Add prismjs devDep * +resolve.modules, -dot-dots * Latest deps * Add prismjs-loader license
1 parent 6ab573f commit c63f56d

File tree

9 files changed

+3515
-1610
lines changed

9 files changed

+3515
-1610
lines changed

website/modules/components/Environment.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import Loading from './Loading'
99
import { Redirect } from 'react-router-dom'
1010

1111
const envData = {
12-
web: require('bundle?lazy!../docs/Web'),
13-
native: require('bundle?lazy!../docs/Native'),
14-
core: require('bundle?lazy!../docs/Core')
12+
web: require('bundle-loader?lazy!../docs/Web'),
13+
native: require('bundle-loader?lazy!../docs/Native'),
14+
core: require('bundle-loader?lazy!../docs/Core')
1515
}
1616

1717
class Environment extends Component {

website/modules/docs/Core.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
export default {
22
api: [
3-
require('../../../packages/react-router/docs/api/MemoryRouter.md'),
4-
require('../../../packages/react-router/docs/api/Prompt.md'),
5-
require('../../../packages/react-router/docs/api/Redirect.md'),
6-
require('../../../packages/react-router/docs/api/Route.md'),
7-
require('../../../packages/react-router/docs/api/Router.md'),
8-
require('../../../packages/react-router/docs/api/StaticRouter.md'),
9-
require('../../../packages/react-router/docs/api/Switch.md'),
10-
require('../../../packages/react-router/docs/api/context.router.md'),
11-
require('../../../packages/react-router/docs/api/history.md'),
12-
require('../../../packages/react-router/docs/api/location.md'),
13-
require('../../../packages/react-router/docs/api/match.md'),
14-
require('../../../packages/react-router/docs/api/withRouter.md')
3+
require('packages/react-router/docs/api/MemoryRouter.md'),
4+
require('packages/react-router/docs/api/Prompt.md'),
5+
require('packages/react-router/docs/api/Redirect.md'),
6+
require('packages/react-router/docs/api/Route.md'),
7+
require('packages/react-router/docs/api/Router.md'),
8+
require('packages/react-router/docs/api/StaticRouter.md'),
9+
require('packages/react-router/docs/api/Switch.md'),
10+
require('packages/react-router/docs/api/context.router.md'),
11+
require('packages/react-router/docs/api/history.md'),
12+
require('packages/react-router/docs/api/location.md'),
13+
require('packages/react-router/docs/api/match.md'),
14+
require('packages/react-router/docs/api/withRouter.md')
1515
],
1616
examples: [],
1717
guides: [
18-
require('../../../packages/react-router/docs/guides/philosophy.md'),
19-
require('../../../packages/react-router/docs/guides/quick-start.md'),
20-
require('../../../packages/react-router/docs/guides/testing.md'),
21-
require('../../../packages/react-router/docs/guides/redux.md'),
22-
require('../../../packages/react-router/docs/guides/static-routes.md'),
23-
require('../../../packages/react-router/docs/guides/blocked-updates.md')
18+
require('packages/react-router/docs/guides/philosophy.md'),
19+
require('packages/react-router/docs/guides/quick-start.md'),
20+
require('packages/react-router/docs/guides/testing.md'),
21+
require('packages/react-router/docs/guides/redux.md'),
22+
require('packages/react-router/docs/guides/static-routes.md'),
23+
require('packages/react-router/docs/guides/blocked-updates.md')
2424
]
2525
}

website/modules/docs/Native.js

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,89 @@
11
export default {
22
api: [
3-
require('../../../packages/react-router-native/docs/api/BackButton.md'),
4-
require('../../../packages/react-router-native/docs/api/DeepLinking.md'),
5-
require('../../../packages/react-router-native/docs/api/Link.md'),
6-
require('../../../packages/react-router-native/docs/api/NativeRouter.md'),
7-
require('../../../packages/react-router/docs/api/MemoryRouter.md?native'),
8-
require('../../../packages/react-router/docs/api/Redirect.md?native'),
9-
require('../../../packages/react-router/docs/api/Route.md?native'),
10-
require('../../../packages/react-router/docs/api/Router.md?native'),
11-
require('../../../packages/react-router/docs/api/StaticRouter.md?native'),
12-
require('../../../packages/react-router/docs/api/Switch.md?native'),
13-
require('../../../packages/react-router/docs/api/history.md?native'),
14-
require('../../../packages/react-router/docs/api/location.md?native'),
15-
require('../../../packages/react-router/docs/api/match.md?native'),
16-
require('../../../packages/react-router/docs/api/matchPath.md?native'),
17-
require('../../../packages/react-router/docs/api/withRouter.md?native')
3+
require('packages/react-router-native/docs/api/BackButton.md'),
4+
require('packages/react-router-native/docs/api/DeepLinking.md'),
5+
require('packages/react-router-native/docs/api/Link.md'),
6+
require('packages/react-router-native/docs/api/NativeRouter.md'),
7+
require('packages/react-router/docs/api/MemoryRouter.md?native'),
8+
require('packages/react-router/docs/api/Redirect.md?native'),
9+
require('packages/react-router/docs/api/Route.md?native'),
10+
require('packages/react-router/docs/api/Router.md?native'),
11+
require('packages/react-router/docs/api/StaticRouter.md?native'),
12+
require('packages/react-router/docs/api/Switch.md?native'),
13+
require('packages/react-router/docs/api/history.md?native'),
14+
require('packages/react-router/docs/api/location.md?native'),
15+
require('packages/react-router/docs/api/match.md?native'),
16+
require('packages/react-router/docs/api/matchPath.md?native'),
17+
require('packages/react-router/docs/api/withRouter.md?native')
1818
],
1919
examples: [
2020
{
2121
label: 'Basic',
2222
slug: 'Basic',
2323
appetizeURL: 'https://appetize.io/embed/kq15zzzz6u328rvg49bdu75vum',
24-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/BasicExample.js')
24+
loadSource: require('packages/react-router-native/examples/BasicExample.js?prismjs')
2525
},
2626
{
2727
label: 'URL Parameters',
2828
slug: 'url-params',
2929
appetizeURL: 'https://appetize.io/embed/gudt9n7654nawc85ufn4fa78uw',
30-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/Params.js')
30+
loadSource: require('packages/react-router-native/examples/Params.js?prismjs')
3131
},
3232
{
3333
label: 'Redirects (Auth)',
3434
slug: 'auth-workflow',
3535
appetizeURL: 'https://appetize.io/embed/77urbu5w9g111yeauhe59cac6w',
36-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/Auth.js')
36+
loadSource: require('packages/react-router-native/examples/Auth.js?prismjs')
3737
},
3838
{
3939
label: 'Custom Link',
4040
slug: 'custom-link',
4141
appetizeURL: 'https://appetize.io/embed/0tyewzy1w3d47n8bqvfwfw7k88',
42-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/CustomLink.js')
42+
loadSource: require('packages/react-router-native/examples/CustomLink.js?prismjs')
4343
},
4444
{
4545
label: 'Preventing Transitions',
4646
slug: 'preventing-transitions',
4747
appetizeURL: 'https://appetize.io/embed/vdudnenr9rzv323tty60th51ag',
48-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/PreventingTransitions.js')
48+
loadSource: require('packages/react-router-native/examples/PreventingTransitions.js?prismjs')
4949
},
5050
{
5151
label: 'No Match',
5252
slug: 'no-match',
5353
appetizeURL: 'https://appetize.io/embed/cbp7d494t1g9jvb7fvgjt4fun4',
54-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/NoMatch.js')
54+
loadSource: require('packages/react-router-native/examples/NoMatch.js?prismjs')
5555
},
5656
{
5757
label: 'Recursive Paths',
5858
slug: 'recursive-paths',
5959
appetizeURL: 'https://appetize.io/embed/7jtxzvxhrqgg48ffy6nj5n5gmc',
60-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/Recursive.js')
60+
loadSource: require('packages/react-router-native/examples/Recursive.js?prismjs')
6161
},
6262
{
6363
label: 'Sidebar',
6464
slug: 'sidebar',
6565
appetizeURL: 'https://appetize.io/embed/t91v5044ay0vktbvbwhw580ax0',
66-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/Sidebar.js')
66+
loadSource: require('packages/react-router-native/examples/Sidebar.js?prismjs')
6767
},
6868
{
6969
label: 'Ambiguous Matches',
7070
slug: 'ambiguous-matches',
7171
appetizeURL: 'https://appetize.io/embed/0xzpxy9vxb9z64zd3auyz1c3h0',
72-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/Ambiguous.js')
72+
loadSource: require('packages/react-router-native/examples/Ambiguous.js?prismjs')
7373
},
7474
{
7575
label: 'Route Config',
7676
slug: 'route-config',
7777
appetizeURL: 'https://appetize.io/embed/kb15rx5ngmuf78hh3hefg7kh5g',
78-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/RouteConfig.js')
78+
loadSource: require('packages/react-router-native/examples/RouteConfig.js?prismjs')
7979
}
8080
],
8181
guides: [
82-
require('../../../packages/react-router/docs/guides/philosophy.md'),
83-
require('../../../packages/react-router-native/docs/guides/quick-start.md'),
84-
require('../../../packages/react-router-native/docs/guides/deep-linking.md'),
85-
require('../../../packages/react-router-native/docs/guides/animation.md'),
86-
require('../../../packages/react-router/docs/guides/redux.md'),
87-
require('../../../packages/react-router/docs/guides/blocked-updates.md')
82+
require('packages/react-router/docs/guides/philosophy.md'),
83+
require('packages/react-router-native/docs/guides/quick-start.md'),
84+
require('packages/react-router-native/docs/guides/deep-linking.md'),
85+
require('packages/react-router-native/docs/guides/animation.md'),
86+
require('packages/react-router/docs/guides/redux.md'),
87+
require('packages/react-router/docs/guides/blocked-updates.md')
8888
]
8989
}

website/modules/docs/Web.js

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,114 @@
11
export default {
22
api: [
3-
require('../../../packages/react-router-dom/docs/api/BrowserRouter.md'),
4-
require('../../../packages/react-router-dom/docs/api/HashRouter.md'),
5-
require('../../../packages/react-router-dom/docs/api/Link.md'),
6-
require('../../../packages/react-router-dom/docs/api/NavLink.md'),
7-
require('../../../packages/react-router-dom/docs/api/Prompt.md'),
8-
require('../../../packages/react-router/docs/api/MemoryRouter.md?web'),
9-
require('../../../packages/react-router/docs/api/Redirect.md?web'),
10-
require('../../../packages/react-router/docs/api/Route.md?web'),
11-
require('../../../packages/react-router/docs/api/Router.md?web'),
12-
require('../../../packages/react-router/docs/api/StaticRouter.md?web'),
13-
require('../../../packages/react-router/docs/api/Switch.md?web'),
14-
require('../../../packages/react-router/docs/api/history.md?web'),
15-
require('../../../packages/react-router/docs/api/location.md?web'),
16-
require('../../../packages/react-router/docs/api/match.md?web'),
17-
require('../../../packages/react-router/docs/api/matchPath.md?web'),
18-
require('../../../packages/react-router/docs/api/withRouter.md?web')
3+
require('packages/react-router-dom/docs/api/BrowserRouter.md'),
4+
require('packages/react-router-dom/docs/api/HashRouter.md'),
5+
require('packages/react-router-dom/docs/api/Link.md'),
6+
require('packages/react-router-dom/docs/api/NavLink.md'),
7+
require('packages/react-router-dom/docs/api/Prompt.md'),
8+
require('packages/react-router/docs/api/MemoryRouter.md?web'),
9+
require('packages/react-router/docs/api/Redirect.md?web'),
10+
require('packages/react-router/docs/api/Route.md?web'),
11+
require('packages/react-router/docs/api/Router.md?web'),
12+
require('packages/react-router/docs/api/StaticRouter.md?web'),
13+
require('packages/react-router/docs/api/Switch.md?web'),
14+
require('packages/react-router/docs/api/history.md?web'),
15+
require('packages/react-router/docs/api/location.md?web'),
16+
require('packages/react-router/docs/api/match.md?web'),
17+
require('packages/react-router/docs/api/matchPath.md?web'),
18+
require('packages/react-router/docs/api/withRouter.md?web')
1919
],
2020

2121
guides: [
22-
require('../../../packages/react-router/docs/guides/philosophy.md'),
23-
require('../../../packages/react-router-dom/docs/guides/basic-components.md'),
24-
require('../../../packages/react-router-dom/docs/guides/quick-start.md'),
25-
require('../../../packages/react-router-dom/docs/guides/server-rendering.md'),
26-
require('../../../packages/react-router-dom/docs/guides/code-splitting.md'),
27-
require('../../../packages/react-router-dom/docs/guides/scroll-restoration.md'),
28-
require('../../../packages/react-router/docs/guides/testing.md?web'),
29-
require('../../../packages/react-router/docs/guides/redux.md'),
30-
require('../../../packages/react-router/docs/guides/static-routes.md'),
31-
require('../../../packages/react-router/docs/guides/blocked-updates.md')
22+
require('packages/react-router/docs/guides/philosophy.md'),
23+
require('packages/react-router-dom/docs/guides/basic-components.md'),
24+
require('packages/react-router-dom/docs/guides/quick-start.md'),
25+
require('packages/react-router-dom/docs/guides/server-rendering.md'),
26+
require('packages/react-router-dom/docs/guides/code-splitting.md'),
27+
require('packages/react-router-dom/docs/guides/scroll-restoration.md'),
28+
require('packages/react-router/docs/guides/testing.md?web'),
29+
require('packages/react-router/docs/guides/redux.md'),
30+
require('packages/react-router/docs/guides/static-routes.md'),
31+
require('packages/react-router/docs/guides/blocked-updates.md')
3232
],
3333

3434
examples: [
3535
{
3636
label: 'Basic',
3737
slug: 'basic',
38-
load: require('bundle?lazy!babel!../examples/Basic'),
39-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/Basic.js')
38+
load: require('../examples/Basic?bundle'),
39+
loadSource: require('../examples/Basic.js?prismjs')
4040
},
4141
{
4242
label: 'URL Parameters',
4343
slug: 'url-params',
44-
load: require('bundle?lazy!babel!../examples/Params'),
45-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/Params.js')
44+
load: require('../examples/Params?bundle'),
45+
loadSource: require('../examples/Params.js?prismjs')
4646
},
4747
{
4848
label: 'Redirects (Auth)',
4949
slug: 'auth-workflow',
50-
load: require('bundle?lazy!babel!../examples/Auth'),
51-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/Auth.js')
50+
load: require('../examples/Auth?bundle'),
51+
loadSource: require('../examples/Auth.js?prismjs')
5252
},
5353
{
5454
label: 'Custom Link',
5555
slug: 'custom-link',
56-
load: require('bundle?lazy!babel!../examples/CustomLink'),
57-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/CustomLink.js')
56+
load: require('../examples/CustomLink?bundle'),
57+
loadSource: require('../examples/CustomLink.js?prismjs')
5858
},
5959
{
6060
label: 'Preventing Transitions',
6161
slug: 'preventing-transitions',
62-
load: require('bundle?lazy!babel!../examples/PreventingTransitions'),
63-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/PreventingTransitions.js')
62+
load: require('../examples/PreventingTransitions?bundle'),
63+
loadSource: require('../examples/PreventingTransitions.js?prismjs')
6464
},
6565
{
6666
label: 'No Match (404)',
6767
slug: 'no-match',
68-
load: require('bundle?lazy!babel!../examples/NoMatch'),
69-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/NoMatch.js')
68+
load: require('../examples/NoMatch?bundle'),
69+
loadSource: require('../examples/NoMatch.js?prismjs')
7070
},
7171
{
7272
label: 'Recursive Paths',
7373
slug: 'recursive-paths',
74-
load: require('bundle?lazy!babel!../examples/Recursive'),
75-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/Recursive.js')
74+
load: require('../examples/Recursive?bundle'),
75+
loadSource: require('../examples/Recursive.js?prismjs')
7676
},
7777
{
7878
label: 'Sidebar',
7979
slug: 'sidebar',
80-
load: require('bundle?lazy!babel!../examples/Sidebar'),
81-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/Sidebar.js')
80+
load: require('../examples/Sidebar?bundle'),
81+
loadSource: require('../examples/Sidebar.js?prismjs')
8282
},
8383
{
8484
label: 'Animated Transitions',
8585
slug: 'animated-transitions',
86-
load: require('bundle?lazy!babel!../examples/Animation'),
87-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/Animation.js')
86+
load: require('../examples/Animation?bundle'),
87+
loadSource: require('../examples/Animation.js?prismjs')
8888
},
8989
{
9090
label: 'Ambiguous Matches',
9191
slug: 'ambiguous-matches',
92-
load: require('bundle?lazy!babel!../examples/Ambiguous'),
93-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/Ambiguous.js')
92+
load: require('../examples/Ambiguous?bundle'),
93+
loadSource: require('../examples/Ambiguous.js?prismjs')
9494
},
9595
{
9696
label: 'Route Config',
9797
slug: 'route-config',
98-
load: require('bundle?lazy!babel!../examples/RouteConfig'),
99-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/RouteConfig.js')
98+
load: require('../examples/RouteConfig?bundle'),
99+
loadSource: require('../examples/RouteConfig.js?prismjs')
100100
},
101101
{
102102
label: 'Modal Gallery',
103103
slug: 'modal-gallery',
104-
load: require('bundle?lazy!babel!../examples/ModalGallery'),
105-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/ModalGallery.js')
104+
load: require('../examples/ModalGallery?bundle'),
105+
loadSource: require('../examples/ModalGallery.js?prismjs')
106106
},
107107
{
108108
label: 'StaticRouter Context',
109109
slug: 'static-router',
110-
load: require('bundle?lazy!babel!../examples/StaticRouter'),
111-
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/StaticRouter.js')
110+
load: require('../examples/StaticRouter?bundle'),
111+
loadSource: require('../examples/StaticRouter.js?prismjs')
112112
}
113113
]
114114
}

0 commit comments

Comments
 (0)