Skip to content
New issue

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

#

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

Already on GitHub? # to your account

PROOF-OF-CONCEPT: Externalized React, React-DOM to support React Addons #221

Closed
wants to merge 1 commit into from
Closed

PROOF-OF-CONCEPT: Externalized React, React-DOM to support React Addons #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ gulp.task('build-dev-client', ['compile-lib', 'compile-client'], () => {
.pipe(webpack({
quiet: true,
output: { filename: 'next-dev.bundle.js' },
externals: [{
'react': 'var React',
'react-dom': 'var ReactDOM'
}],
module: {
loaders: [
{
Expand Down Expand Up @@ -134,6 +138,10 @@ gulp.task('build-client', ['compile-lib', 'compile-client'], () => {
}),
new webpack.webpack.optimize.UglifyJsPlugin()
],
externals: {
'react': 'var React',
'react-dom': 'var ReactDOM'
},
module: {
loaders: [
{
Expand Down
6 changes: 6 additions & 0 deletions lib/document.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ export default ({ head, css, html, data, dev, staticMarkup, cdn }) => {
</head>
<body>
<div id='__next' dangerouslySetInnerHTML={{ __html: html }} />

{/* XXX: This has to be configured somehow! */}
<script src='https://unpkg.com/react@15/dist/react-with-addons.js' />
<script src='https://unpkg.com/react-dom@15/dist/react-dom.js' />
<script src='https://unpkg.com/react-md@0.3.7/dist/react-md.js' />

{staticMarkup ? null : <script dangerouslySetInnerHTML={{ __html: '__NEXT_DATA__ = ' + htmlescape(data) }} />}
{staticMarkup ? null : createClientScript({ dev, cdn })}
</body>
Expand Down
4 changes: 4 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@
"path-match": "1.2.4",
"react": "15.3.2",
"react-dom": "15.3.2",
"react-addons-css-transition-group": "^15.3.2",
"react-addons-pure-render-mixin": "^15.3.2",
"react-addons-transition-group": "^15.3.2",
"react-md": "0.3.7",
"react-hot-loader": "3.0.0-beta.6",
"send": "0.14.1",
"strip-ansi": "3.0.1",
Expand Down
23 changes: 19 additions & 4 deletions server/build/webpack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,14 @@ export default async function createCompiler (dir, { hotReload = false } = {}) {
{
alias: {
'babel-runtime': babelRuntimePath,
react: require.resolve('react'),
'react': require.resolve('react'),

// XXX: This shouldn't here, but since external Babel config support is missing,
// there is no other way to achieve this. (Even though, `.babelrc` and
// `package.json/babel` sections are merged, I couldn't make them work correctly.)
'react-md': require.resolve('react-md'),
'react-md/lib/Buttons': require.resolve('react-md'),

'next/link': require.resolve('../../lib/link'),
'next/css': require.resolve('../../lib/css'),
'next/head': require.resolve('../../lib/head')
Expand All @@ -139,13 +146,21 @@ export default async function createCompiler (dir, { hotReload = false } = {}) {
publicPath: hotReload ? 'http://localhost:3030/' : null
},
externals: [
'react',
'react-dom',
{
[require.resolve('react')]: 'react',
[require.resolve('react')]: { commonjs: 'react', commonjs2: 'react', amd: 'react', root: 'React' },
[require.resolve('react-dom')]: { commonjs: 'react-dom', commonjs2: 'react-dom', amd: 'react-dom', root: 'ReactDOM' },
[require.resolve('react-addons-css-transition-group')]: 'var React.addons.CSSTransitionGroup',
[require.resolve('react-addons-transition-group')]: 'var React.addons.TransitionGroup',
[require.resolve('react-addons-pure-render-mixin')]: 'var React.addons.PureRenderMixin',
[require.resolve('../../lib/link')]: 'next/link',
[require.resolve('../../lib/css')]: 'next/css',
[require.resolve('../../lib/head')]: 'next/head'
},

// XXX: This also shouldn't be here, but missing external Webpack config support forces me
// to patch it here.
{
[require.resolve('react-md')]: 'var ReactMD'
}
],
resolve: {
Expand Down