Skip to content

Update website to Webpack v3 #5725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 5, 2018
Merged

Update website to Webpack v3 #5725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f68acb0
Update website to Webpack v3
pshrmn Nov 13, 2017
4fe25d0
Move bundle loaders to Webpack config
pshrmn Nov 14, 2017
a0204d9
Add prismjs devDep
pshrmn Nov 14, 2017
739a316
+resolve.modules, -dot-dots
pshrmn Nov 14, 2017
31a65e2
Latest deps
pshrmn Dec 13, 2017
8f88d3a
Add prismjs-loader license
pshrmn Dec 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions website/modules/components/Environment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import Loading from './Loading'
import { Redirect } from 'react-router-dom'

const envData = {
web: require('bundle?lazy!../docs/Web'),
native: require('bundle?lazy!../docs/Native'),
core: require('bundle?lazy!../docs/Core')
web: require('bundle-loader?lazy!../docs/Web'),
native: require('bundle-loader?lazy!../docs/Native'),
core: require('bundle-loader?lazy!../docs/Core')
}

class Environment extends Component {
Expand Down
36 changes: 18 additions & 18 deletions website/modules/docs/Core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
export default {
api: [
require('../../../packages/react-router/docs/api/MemoryRouter.md'),
require('../../../packages/react-router/docs/api/Prompt.md'),
require('../../../packages/react-router/docs/api/Redirect.md'),
require('../../../packages/react-router/docs/api/Route.md'),
require('../../../packages/react-router/docs/api/Router.md'),
require('../../../packages/react-router/docs/api/StaticRouter.md'),
require('../../../packages/react-router/docs/api/Switch.md'),
require('../../../packages/react-router/docs/api/context.router.md'),
require('../../../packages/react-router/docs/api/history.md'),
require('../../../packages/react-router/docs/api/location.md'),
require('../../../packages/react-router/docs/api/match.md'),
require('../../../packages/react-router/docs/api/withRouter.md')
require('packages/react-router/docs/api/MemoryRouter.md'),
require('packages/react-router/docs/api/Prompt.md'),
require('packages/react-router/docs/api/Redirect.md'),
require('packages/react-router/docs/api/Route.md'),
require('packages/react-router/docs/api/Router.md'),
require('packages/react-router/docs/api/StaticRouter.md'),
require('packages/react-router/docs/api/Switch.md'),
require('packages/react-router/docs/api/context.router.md'),
require('packages/react-router/docs/api/history.md'),
require('packages/react-router/docs/api/location.md'),
require('packages/react-router/docs/api/match.md'),
require('packages/react-router/docs/api/withRouter.md')
],
examples: [],
guides: [
require('../../../packages/react-router/docs/guides/philosophy.md'),
require('../../../packages/react-router/docs/guides/quick-start.md'),
require('../../../packages/react-router/docs/guides/testing.md'),
require('../../../packages/react-router/docs/guides/redux.md'),
require('../../../packages/react-router/docs/guides/static-routes.md'),
require('../../../packages/react-router/docs/guides/blocked-updates.md')
require('packages/react-router/docs/guides/philosophy.md'),
require('packages/react-router/docs/guides/quick-start.md'),
require('packages/react-router/docs/guides/testing.md'),
require('packages/react-router/docs/guides/redux.md'),
require('packages/react-router/docs/guides/static-routes.md'),
require('packages/react-router/docs/guides/blocked-updates.md')
]
}
62 changes: 31 additions & 31 deletions website/modules/docs/Native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,89 +1,89 @@
export default {
api: [
require('../../../packages/react-router-native/docs/api/BackButton.md'),
require('../../../packages/react-router-native/docs/api/DeepLinking.md'),
require('../../../packages/react-router-native/docs/api/Link.md'),
require('../../../packages/react-router-native/docs/api/NativeRouter.md'),
require('../../../packages/react-router/docs/api/MemoryRouter.md?native'),
require('../../../packages/react-router/docs/api/Redirect.md?native'),
require('../../../packages/react-router/docs/api/Route.md?native'),
require('../../../packages/react-router/docs/api/Router.md?native'),
require('../../../packages/react-router/docs/api/StaticRouter.md?native'),
require('../../../packages/react-router/docs/api/Switch.md?native'),
require('../../../packages/react-router/docs/api/history.md?native'),
require('../../../packages/react-router/docs/api/location.md?native'),
require('../../../packages/react-router/docs/api/match.md?native'),
require('../../../packages/react-router/docs/api/matchPath.md?native'),
require('../../../packages/react-router/docs/api/withRouter.md?native')
require('packages/react-router-native/docs/api/BackButton.md'),
require('packages/react-router-native/docs/api/DeepLinking.md'),
require('packages/react-router-native/docs/api/Link.md'),
require('packages/react-router-native/docs/api/NativeRouter.md'),
require('packages/react-router/docs/api/MemoryRouter.md?native'),
require('packages/react-router/docs/api/Redirect.md?native'),
require('packages/react-router/docs/api/Route.md?native'),
require('packages/react-router/docs/api/Router.md?native'),
require('packages/react-router/docs/api/StaticRouter.md?native'),
require('packages/react-router/docs/api/Switch.md?native'),
require('packages/react-router/docs/api/history.md?native'),
require('packages/react-router/docs/api/location.md?native'),
require('packages/react-router/docs/api/match.md?native'),
require('packages/react-router/docs/api/matchPath.md?native'),
require('packages/react-router/docs/api/withRouter.md?native')
],
examples: [
{
label: 'Basic',
slug: 'Basic',
appetizeURL: 'https://appetize.io/embed/kq15zzzz6u328rvg49bdu75vum',
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/BasicExample.js')
loadSource: require('packages/react-router-native/examples/BasicExample.js?prismjs')
},
{
label: 'URL Parameters',
slug: 'url-params',
appetizeURL: 'https://appetize.io/embed/gudt9n7654nawc85ufn4fa78uw',
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/Params.js')
loadSource: require('packages/react-router-native/examples/Params.js?prismjs')
},
{
label: 'Redirects (Auth)',
slug: 'auth-workflow',
appetizeURL: 'https://appetize.io/embed/77urbu5w9g111yeauhe59cac6w',
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/Auth.js')
loadSource: require('packages/react-router-native/examples/Auth.js?prismjs')
},
{
label: 'Custom Link',
slug: 'custom-link',
appetizeURL: 'https://appetize.io/embed/0tyewzy1w3d47n8bqvfwfw7k88',
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/CustomLink.js')
loadSource: require('packages/react-router-native/examples/CustomLink.js?prismjs')
},
{
label: 'Preventing Transitions',
slug: 'preventing-transitions',
appetizeURL: 'https://appetize.io/embed/vdudnenr9rzv323tty60th51ag',
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/PreventingTransitions.js')
loadSource: require('packages/react-router-native/examples/PreventingTransitions.js?prismjs')
},
{
label: 'No Match',
slug: 'no-match',
appetizeURL: 'https://appetize.io/embed/cbp7d494t1g9jvb7fvgjt4fun4',
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/NoMatch.js')
loadSource: require('packages/react-router-native/examples/NoMatch.js?prismjs')
},
{
label: 'Recursive Paths',
slug: 'recursive-paths',
appetizeURL: 'https://appetize.io/embed/7jtxzvxhrqgg48ffy6nj5n5gmc',
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/Recursive.js')
loadSource: require('packages/react-router-native/examples/Recursive.js?prismjs')
},
{
label: 'Sidebar',
slug: 'sidebar',
appetizeURL: 'https://appetize.io/embed/t91v5044ay0vktbvbwhw580ax0',
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/Sidebar.js')
loadSource: require('packages/react-router-native/examples/Sidebar.js?prismjs')
},
{
label: 'Ambiguous Matches',
slug: 'ambiguous-matches',
appetizeURL: 'https://appetize.io/embed/0xzpxy9vxb9z64zd3auyz1c3h0',
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/Ambiguous.js')
loadSource: require('packages/react-router-native/examples/Ambiguous.js?prismjs')
},
{
label: 'Route Config',
slug: 'route-config',
appetizeURL: 'https://appetize.io/embed/kb15rx5ngmuf78hh3hefg7kh5g',
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../../../packages/react-router-native/examples/RouteConfig.js')
loadSource: require('packages/react-router-native/examples/RouteConfig.js?prismjs')
}
],
guides: [
require('../../../packages/react-router/docs/guides/philosophy.md'),
require('../../../packages/react-router-native/docs/guides/quick-start.md'),
require('../../../packages/react-router-native/docs/guides/deep-linking.md'),
require('../../../packages/react-router-native/docs/guides/animation.md'),
require('../../../packages/react-router/docs/guides/redux.md'),
require('../../../packages/react-router/docs/guides/blocked-updates.md')
require('packages/react-router/docs/guides/philosophy.md'),
require('packages/react-router-native/docs/guides/quick-start.md'),
require('packages/react-router-native/docs/guides/deep-linking.md'),
require('packages/react-router-native/docs/guides/animation.md'),
require('packages/react-router/docs/guides/redux.md'),
require('packages/react-router/docs/guides/blocked-updates.md')
]
}
104 changes: 52 additions & 52 deletions website/modules/docs/Web.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,114 +1,114 @@
export default {
api: [
require('../../../packages/react-router-dom/docs/api/BrowserRouter.md'),
require('../../../packages/react-router-dom/docs/api/HashRouter.md'),
require('../../../packages/react-router-dom/docs/api/Link.md'),
require('../../../packages/react-router-dom/docs/api/NavLink.md'),
require('../../../packages/react-router-dom/docs/api/Prompt.md'),
require('../../../packages/react-router/docs/api/MemoryRouter.md?web'),
require('../../../packages/react-router/docs/api/Redirect.md?web'),
require('../../../packages/react-router/docs/api/Route.md?web'),
require('../../../packages/react-router/docs/api/Router.md?web'),
require('../../../packages/react-router/docs/api/StaticRouter.md?web'),
require('../../../packages/react-router/docs/api/Switch.md?web'),
require('../../../packages/react-router/docs/api/history.md?web'),
require('../../../packages/react-router/docs/api/location.md?web'),
require('../../../packages/react-router/docs/api/match.md?web'),
require('../../../packages/react-router/docs/api/matchPath.md?web'),
require('../../../packages/react-router/docs/api/withRouter.md?web')
require('packages/react-router-dom/docs/api/BrowserRouter.md'),
require('packages/react-router-dom/docs/api/HashRouter.md'),
require('packages/react-router-dom/docs/api/Link.md'),
require('packages/react-router-dom/docs/api/NavLink.md'),
require('packages/react-router-dom/docs/api/Prompt.md'),
require('packages/react-router/docs/api/MemoryRouter.md?web'),
require('packages/react-router/docs/api/Redirect.md?web'),
require('packages/react-router/docs/api/Route.md?web'),
require('packages/react-router/docs/api/Router.md?web'),
require('packages/react-router/docs/api/StaticRouter.md?web'),
require('packages/react-router/docs/api/Switch.md?web'),
require('packages/react-router/docs/api/history.md?web'),
require('packages/react-router/docs/api/location.md?web'),
require('packages/react-router/docs/api/match.md?web'),
require('packages/react-router/docs/api/matchPath.md?web'),
require('packages/react-router/docs/api/withRouter.md?web')
],

guides: [
require('../../../packages/react-router/docs/guides/philosophy.md'),
require('../../../packages/react-router-dom/docs/guides/basic-components.md'),
require('../../../packages/react-router-dom/docs/guides/quick-start.md'),
require('../../../packages/react-router-dom/docs/guides/server-rendering.md'),
require('../../../packages/react-router-dom/docs/guides/code-splitting.md'),
require('../../../packages/react-router-dom/docs/guides/scroll-restoration.md'),
require('../../../packages/react-router/docs/guides/testing.md?web'),
require('../../../packages/react-router/docs/guides/redux.md'),
require('../../../packages/react-router/docs/guides/static-routes.md'),
require('../../../packages/react-router/docs/guides/blocked-updates.md')
require('packages/react-router/docs/guides/philosophy.md'),
require('packages/react-router-dom/docs/guides/basic-components.md'),
require('packages/react-router-dom/docs/guides/quick-start.md'),
require('packages/react-router-dom/docs/guides/server-rendering.md'),
require('packages/react-router-dom/docs/guides/code-splitting.md'),
require('packages/react-router-dom/docs/guides/scroll-restoration.md'),
require('packages/react-router/docs/guides/testing.md?web'),
require('packages/react-router/docs/guides/redux.md'),
require('packages/react-router/docs/guides/static-routes.md'),
require('packages/react-router/docs/guides/blocked-updates.md')
],

examples: [
{
label: 'Basic',
slug: 'basic',
load: require('bundle?lazy!babel!../examples/Basic'),
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/Basic.js')
load: require('../examples/Basic?bundle'),
loadSource: require('../examples/Basic.js?prismjs')
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This configuration has been moved to the Webpack config. Because we are loading one file two different ways, we need to use a resource query to differentiate between when to read it as JavaScript and when to read it as a string to markup.

},
{
label: 'URL Parameters',
slug: 'url-params',
load: require('bundle?lazy!babel!../examples/Params'),
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/Params.js')
load: require('../examples/Params?bundle'),
loadSource: require('../examples/Params.js?prismjs')
},
{
label: 'Redirects (Auth)',
slug: 'auth-workflow',
load: require('bundle?lazy!babel!../examples/Auth'),
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/Auth.js')
load: require('../examples/Auth?bundle'),
loadSource: require('../examples/Auth.js?prismjs')
},
{
label: 'Custom Link',
slug: 'custom-link',
load: require('bundle?lazy!babel!../examples/CustomLink'),
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/CustomLink.js')
load: require('../examples/CustomLink?bundle'),
loadSource: require('../examples/CustomLink.js?prismjs')
},
{
label: 'Preventing Transitions',
slug: 'preventing-transitions',
load: require('bundle?lazy!babel!../examples/PreventingTransitions'),
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/PreventingTransitions.js')
load: require('../examples/PreventingTransitions?bundle'),
loadSource: require('../examples/PreventingTransitions.js?prismjs')
},
{
label: 'No Match (404)',
slug: 'no-match',
load: require('bundle?lazy!babel!../examples/NoMatch'),
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/NoMatch.js')
load: require('../examples/NoMatch?bundle'),
loadSource: require('../examples/NoMatch.js?prismjs')
},
{
label: 'Recursive Paths',
slug: 'recursive-paths',
load: require('bundle?lazy!babel!../examples/Recursive'),
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/Recursive.js')
load: require('../examples/Recursive?bundle'),
loadSource: require('../examples/Recursive.js?prismjs')
},
{
label: 'Sidebar',
slug: 'sidebar',
load: require('bundle?lazy!babel!../examples/Sidebar'),
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/Sidebar.js')
load: require('../examples/Sidebar?bundle'),
loadSource: require('../examples/Sidebar.js?prismjs')
},
{
label: 'Animated Transitions',
slug: 'animated-transitions',
load: require('bundle?lazy!babel!../examples/Animation'),
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/Animation.js')
load: require('../examples/Animation?bundle'),
loadSource: require('../examples/Animation.js?prismjs')
},
{
label: 'Ambiguous Matches',
slug: 'ambiguous-matches',
load: require('bundle?lazy!babel!../examples/Ambiguous'),
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/Ambiguous.js')
load: require('../examples/Ambiguous?bundle'),
loadSource: require('../examples/Ambiguous.js?prismjs')
},
{
label: 'Route Config',
slug: 'route-config',
load: require('bundle?lazy!babel!../examples/RouteConfig'),
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/RouteConfig.js')
load: require('../examples/RouteConfig?bundle'),
loadSource: require('../examples/RouteConfig.js?prismjs')
},
{
label: 'Modal Gallery',
slug: 'modal-gallery',
load: require('bundle?lazy!babel!../examples/ModalGallery'),
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/ModalGallery.js')
load: require('../examples/ModalGallery?bundle'),
loadSource: require('../examples/ModalGallery.js?prismjs')
},
{
label: 'StaticRouter Context',
slug: 'static-router',
load: require('bundle?lazy!babel!../examples/StaticRouter'),
loadSource: require('bundle?lazy!!prismjs?lang=jsx!../examples/StaticRouter.js')
load: require('../examples/StaticRouter?bundle'),
loadSource: require('../examples/StaticRouter.js?prismjs')
}
]
}
Loading