Skip to content
This repository was archived by the owner on Dec 27, 2023. It is now read-only.

Commit 15d5d11

Browse files
authored
Merge pull request #239 from opencomponents/react
[DX-523] Upgrade react to 16.4.0
2 parents 0e3a409 + 8ba05b5 commit 15d5d11

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

packages/oc-template-react-compiler/__tests__/__snapshots__/compileView.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ Object {
1313
}
1414
`;
1515

16-
exports[`valid component 2`] = `"var oc=oc||{};oc.components=oc.components||{};oc.components['dummyData']=function(model){ var modelHTML = model.__html ? model.__html : ''; var staticPath = model.reactComponent.props._staticPath; var props = JSON.stringify(model.reactComponent.props); return '<div id=\\"oc-reactRoot-react-component\\" class=\\"oc-reactRoot-react-component\\">' + modelHTML + '</div>' + '' + '<script>' + 'window.oc = window.oc || {};' + 'oc.cmd = oc.cmd || [];' + 'oc.cmd.push(function(oc){' + '' + 'oc.requireSeries([{\\"global\\":\\"PropTypes\\",\\"url\\":\\"https://unpkg.com/[email protected]/prop-types.min.js\\",\\"name\\":\\"prop-types\\"},{\\"global\\":\\"React\\",\\"url\\":\\"https://unpkg.com/[email protected]/umd/react.production.min.js\\",\\"name\\":\\"react\\"},{\\"global\\":\\"ReactDOM\\",\\"url\\":\\"https://unpkg.com/[email protected]/umd/react-dom.production.min.js\\",\\"name\\":\\"react-dom\\"}], function(){' + 'oc.require(' + '[\\"oc\\", \\"reactComponents\\", \\"dummyContent\\"],' + '\\"' + staticPath + 'react-component.js\\",' + 'function(ReactComponent){' + 'var targetNode = document.getElementById(\\"oc-reactRoot-react-component\\");' + 'targetNode.setAttribute(\\"id\\",\\"\\");' + 'ReactDOM.render(React.createElement(ReactComponent,' + props + '),targetNode);' + '}' + ');' + '});' + '});' + '</script>' }"`;
16+
exports[`valid component 2`] = `"var oc=oc||{};oc.components=oc.components||{};oc.components['dummyData']=function(model){ var modelHTML = model.__html ? model.__html : ''; var staticPath = model.reactComponent.props._staticPath; var props = JSON.stringify(model.reactComponent.props); return '<div id=\\"oc-reactRoot-react-component\\" class=\\"oc-reactRoot-react-component\\">' + modelHTML + '</div>' + '' + '<script>' + 'window.oc = window.oc || {};' + 'oc.cmd = oc.cmd || [];' + 'oc.cmd.push(function(oc){' + '' + 'oc.requireSeries([{\\"global\\":\\"PropTypes\\",\\"url\\":\\"https://unpkg.com/[email protected]/prop-types.min.js\\",\\"name\\":\\"prop-types\\"},{\\"global\\":\\"React\\",\\"url\\":\\"https://unpkg.com/[email protected]/umd/react.production.min.js\\",\\"name\\":\\"react\\"},{\\"global\\":\\"ReactDOM\\",\\"url\\":\\"https://unpkg.com/[email protected]/umd/react-dom.production.min.js\\",\\"name\\":\\"react-dom\\"}], function(){' + 'oc.require(' + '[\\"oc\\", \\"reactComponents\\", \\"dummyContent\\"],' + '\\"' + staticPath + 'react-component.js\\",' + 'function(ReactComponent){' + 'var targetNode = document.getElementById(\\"oc-reactRoot-react-component\\");' + 'targetNode.setAttribute(\\"id\\",\\"\\");' + 'ReactDOM.render(React.createElement(ReactComponent,' + props + '),targetNode);' + '}' + ');' + '});' + '});' + '</script>' }"`;

packages/oc-template-react-compiler/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"postcss-import": "^11.0.0",
5353
"postcss-loader": "^2.0.9",
5454
"prop-types": "15.6.1",
55-
"react": "16.3.2",
55+
"react": "16.4.0",
5656
"webpack": "^4.8.3"
5757
},
5858
"files": [

packages/oc-template-react/__tests__/__snapshots__/getInfo.js.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ Object {
1111
Object {
1212
"global": "React",
1313
"name": "react",
14-
"url": "https://unpkg.com/react@16.3.2/umd/react.production.min.js",
14+
"url": "https://unpkg.com/react@16.4.0/umd/react.production.min.js",
1515
},
1616
Object {
1717
"global": "ReactDOM",
1818
"name": "react-dom",
19-
"url": "https://unpkg.com/react-dom@16.3.2/umd/react-dom.production.min.js",
19+
"url": "https://unpkg.com/react-dom@16.4.0/umd/react-dom.production.min.js",
2020
},
2121
],
2222
"type": "oc-template-react",

packages/oc-template-react/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
"nice-cache": "0.0.5",
2828
"oc-generic-template-renderer": "2.0.4",
2929
"prop-types": "15.6.1",
30-
"react": "16.3.2",
31-
"react-dom": "16.3.2"
30+
"react": "16.4.0",
31+
"react-dom": "16.4.0"
3232
},
3333
"files": [
3434
"lib",
@@ -43,11 +43,11 @@
4343
},
4444
"react": {
4545
"global": "React",
46-
"url": "https://unpkg.com/react@16.3.2/umd/react.production.min.js"
46+
"url": "https://unpkg.com/react@16.4.0/umd/react.production.min.js"
4747
},
4848
"react-dom": {
4949
"global": "ReactDOM",
50-
"url": "https://unpkg.com/react-dom@16.3.2/umd/react-dom.production.min.js"
50+
"url": "https://unpkg.com/react-dom@16.4.0/umd/react-dom.production.min.js"
5151
}
5252
}
5353
}

0 commit comments

Comments
 (0)