Skip to content

Bump React to v16 alpha #445

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
aduth merged 6 commits into from
Apr 18, 2017
Merged

Bump React to v16 alpha #445

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
29358af
Bump React to v16 alpha
aduth Apr 18, 2017
65566e4
Reference ReactDOMServer as external from CDN
aduth Apr 18, 2017
8fd86c9
Bump package dependency to 16 alpha
aduth Apr 18, 2017
e25e732
Add production suffix for React CDN resource
aduth Apr 18, 2017
0a8bc8e
Mock requestAnimationFrame in test bootstrap
aduth Apr 18, 2017
421a4cd
Use react-autosize-textarea instead of react-textarea-autosize
aduth Apr 18, 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
1 change: 1 addition & 0 deletions bootstrap-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ global.document = require( 'jsdom' ).jsdom( '', {
}
} );
global.window = document.defaultView;
global.requestAnimationFrame = setTimeout;
global.navigator = window.navigator;
3 changes: 1 addition & 2 deletions editor/modes/text-editor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* External dependencies
*/
import { connect } from 'react-redux';
import Textarea from 'react-textarea-autosize';
import Textarea from 'react-autosize-textarea';

/**
* Internal dependencies
Expand Down Expand Up @@ -32,7 +32,6 @@ function TextEditor( { blocks, onChange } ) {
defaultValue={ wp.blocks.serialize( blocks ) }
onBlur={ ( event ) => onChange( event.target.value ) }
className="editor-text-editor"
useCacheForDOMMeasurements
/>
</div>
);
Expand Down
8 changes: 5 additions & 3 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,15 @@ function gutenberg_register_scripts() {
$suffix = SCRIPT_DEBUG ? '' : '.min';

// Vendor
wp_register_script( 'react', 'https://unpkg.com/react@15/dist/react' . $suffix . '.js' );
wp_register_script( 'react-dom', 'https://unpkg.com/react-dom@15/dist/react-dom' . $suffix . '.js', array( 'react' ) );
$react_suffix = ( SCRIPT_DEBUG ? '.development' : '.production' ) . $suffix;
wp_register_script( 'react', 'https://unpkg.com/react@next/umd/react' . $react_suffix . '.js' );
wp_register_script( 'react-dom', 'https://unpkg.com/react-dom@next/umd/react-dom' . $react_suffix . '.js', array( 'react' ) );
wp_register_script( 'react-dom-server', 'https://unpkg.com/react-dom@next/umd/react-dom-server' . $react_suffix . '.js', array( 'react' ) );

// Editor
wp_register_script( 'tinymce-nightly', 'https://fiddle.azurewebsites.net/tinymce/nightly/tinymce.min.js' );
wp_register_script( 'wp-i18n', plugins_url( 'i18n/build/index.js', __FILE__ ) );
wp_register_script( 'wp-element', plugins_url( 'element/build/index.js', __FILE__ ), array( 'react', 'react-dom' ) );
wp_register_script( 'wp-element', plugins_url( 'element/build/index.js', __FILE__ ), array( 'react', 'react-dom', 'react-dom-server' ) );
wp_register_script( 'wp-blocks', plugins_url( 'blocks/build/index.js', __FILE__ ), array( 'wp-element', 'tinymce-nightly' ) );
wp_register_style( 'wp-blocks', plugins_url( 'blocks/build/style.css', __FILE__ ) );
}
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@
"pegjs-loader": "^0.5.1",
"postcss-loader": "^1.3.3",
"raw-loader": "^0.5.1",
"react": "^15.4.2",
"react-dom": "^15.4.2",
"resolve-entry-modules-webpack-plugin": "^1.0.0",
"sass-loader": "^6.0.3",
"sinon": "^2.1.0",
Expand All @@ -61,8 +59,10 @@
"hpq": "^1.2.0",
"jed": "^1.1.1",
"lodash": "^4.17.4",
"react": "^15.5.4",
"react-autosize-textarea": "^0.4.2",
"react-dom": "^15.5.4",
"react-redux": "^5.0.4",
"react-textarea-autosize": "^4.0.5",
"redux": "^3.6.0",
"uuid": "^3.0.1"
}
Expand Down
3 changes: 2 additions & 1 deletion webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ const config = {
},
externals: {
react: 'React',
'react-dom': 'ReactDOM'
'react-dom': 'ReactDOM',
'react-dom/server': 'ReactDOMServer'
},
module: {
rules: [
Expand Down