From 0e8f6c670fa4658ca127b7ee0c368663c2f46faf Mon Sep 17 00:00:00 2001 From: "Dependencies.io Bot" Date: Mon, 16 Apr 2018 16:14:13 +0000 Subject: [PATCH 1/2] Update react from 16.2.0 to 16.3.2 --- packages/oc-template-react/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/oc-template-react/package.json b/packages/oc-template-react/package.json index 9991690..048fcff 100644 --- a/packages/oc-template-react/package.json +++ b/packages/oc-template-react/package.json @@ -27,7 +27,7 @@ "nice-cache": "0.0.5", "oc-generic-template-renderer": "2.0.4", "prop-types": "15.6.1", - "react": "16.2.0", + "react": "16.3.2", "react-dom": "16.2.0" }, "files": [ @@ -43,7 +43,7 @@ }, "react": { "global": "React", - "url": "https://unpkg.com/react@16.2.0/umd/react.production.min.js" + "url": "https://unpkg.com/react@16.3.2/umd/react.production.min.js" }, "react-dom": { "global": "ReactDOM", From dd7da0345df30862340850a6ae6c978c116f0aa8 Mon Sep 17 00:00:00 2001 From: Nick Balestra Date: Tue, 1 May 2018 16:28:10 +0100 Subject: [PATCH 2/2] update snapshots --- acceptance-setup/__tests__/__snapshots__/acceptance.js.snap | 6 +++--- .../__tests__/__snapshots__/compileView.js.snap | 4 ++-- .../__tests__/__snapshots__/getInfo.js.snap | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/acceptance-setup/__tests__/__snapshots__/acceptance.js.snap b/acceptance-setup/__tests__/__snapshots__/acceptance.js.snap index 9b67582..7611516 100644 --- a/acceptance-setup/__tests__/__snapshots__/acceptance.js.snap +++ b/acceptance-setup/__tests__/__snapshots__/acceptance.js.snap @@ -1,8 +1,8 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Registry should correctly serve rendered and unrendered components 1`] = `"{\\"type\\":\\"oc-component-local\\",\\"version\\":\\"6.6.6\\",\\"requestVersion\\":\\"\\",\\"name\\":\\"react-app\\",\\"renderMode\\":\\"unrendered\\",\\"href\\":\\"http://localhost:3000/react-app?name=SuperMario\\",\\"data\\":{\\"reactComponent\\":{\\"key\\":\\"f7674ec7d64629c1a8a9b18ae01bcecb88be4f2a\\",\\"src\\":\\"http://localhost:3000/react-app/6.6.6/static/react-component.js\\",\\"props\\":{\\"name\\":\\"SuperMario\\",\\"_staticPath\\":\\"http://localhost:3000/react-app/6.6.6/static/\\",\\"_baseUrl\\":\\"http://localhost:3000/\\",\\"_componentName\\":\\"react-app\\",\\"_componentVersion\\":\\"6.6.6\\"}}},\\"template\\":{\\"src\\":\\"http://localhost:3000/react-app/6.6.6/static/template.js\\",\\"type\\":\\"oc-template-react\\",\\"key\\":\\"d823e11beddf40a06473c35cc962ba18b4c20a3f\\"}}"`; +exports[`Registry should correctly serve rendered and unrendered components 1`] = `"{\\"type\\":\\"oc-component-local\\",\\"version\\":\\"6.6.6\\",\\"requestVersion\\":\\"\\",\\"name\\":\\"react-app\\",\\"renderMode\\":\\"unrendered\\",\\"href\\":\\"http://localhost:3000/react-app?name=SuperMario\\",\\"data\\":{\\"reactComponent\\":{\\"key\\":\\"f7674ec7d64629c1a8a9b18ae01bcecb88be4f2a\\",\\"src\\":\\"http://localhost:3000/react-app/6.6.6/static/react-component.js\\",\\"props\\":{\\"name\\":\\"SuperMario\\",\\"_staticPath\\":\\"http://localhost:3000/react-app/6.6.6/static/\\",\\"_baseUrl\\":\\"http://localhost:3000/\\",\\"_componentName\\":\\"react-app\\",\\"_componentVersion\\":\\"6.6.6\\"}}},\\"template\\":{\\"src\\":\\"http://localhost:3000/react-app/6.6.6/static/template.js\\",\\"type\\":\\"oc-template-react\\",\\"key\\":\\"b4980982ea94935713aa1062edc0061b307ce2fa\\"}}"`; -exports[`Registry should correctly serve rendered and unrendered components 2`] = `"{\\"type\\":\\"oc-component-local\\",\\"version\\":\\"6.6.6\\",\\"requestVersion\\":\\"\\",\\"name\\":\\"react-app\\",\\"renderMode\\":\\"rendered\\",\\"href\\":\\"http://localhost:3000/react-app?name=SuperMario\\",\\"html\\":\\"

Hello SuperMario

component name: react-app

component version: 6.6.6

registry baseUrl: http://localhost:3000/

component staticPath: http://localhost:3000/react-app/6.6.6/static/

\\"}"`; +exports[`Registry should correctly serve rendered and unrendered components 2`] = `"{\\"type\\":\\"oc-component-local\\",\\"version\\":\\"6.6.6\\",\\"requestVersion\\":\\"\\",\\"name\\":\\"react-app\\",\\"renderMode\\":\\"rendered\\",\\"href\\":\\"http://localhost:3000/react-app?name=SuperMario\\",\\"html\\":\\"

Hello SuperMario

component name: react-app

component version: 6.6.6

registry baseUrl: http://localhost:3000/

component staticPath: http://localhost:3000/react-app/6.6.6/static/

\\"}"`; exports[`client-side-side rendering 1`] = ` Array [ @@ -37,7 +37,7 @@ exports[`server-side-side rendering 1`] = ` A page -

Hello SuperMario

component name: react-app

component version: 6.6.6

registry baseUrl: http://localhost:3000/

component staticPath: http://localhost:3000/react-app/6.6.6/static/

+

Hello SuperMario

component name: react-app

component version: 6.6.6

registry baseUrl: http://localhost:3000/

component staticPath: http://localhost:3000/react-app/6.6.6/static/

diff --git a/packages/oc-template-react-compiler/__tests__/__snapshots__/compileView.js.snap b/packages/oc-template-react-compiler/__tests__/__snapshots__/compileView.js.snap index 9ecea96..ad0ee05 100644 --- a/packages/oc-template-react-compiler/__tests__/__snapshots__/compileView.js.snap +++ b/packages/oc-template-react-compiler/__tests__/__snapshots__/compileView.js.snap @@ -6,11 +6,11 @@ Object { "hashKey": "940a68df39eb3b2449c6256781f660c857d3890b", }, "template": Object { - "hashKey": "9c35dc381e7665cbb6f0660486d7f713eda432a8", + "hashKey": "04fbf58f543a02fbc09b343fe5bf7e140a7e98ed", "src": "template.js", "type": "oc-template-react", }, } `; -exports[`valid component 2`] = `"var oc=oc||{};oc.components=oc.components||{};oc.components['9c35dc381e7665cbb6f0660486d7f713eda432a8']=function(model){ var modelHTML = model.__html ? model.__html : ''; var staticPath = model.reactComponent.props._staticPath; var props = JSON.stringify(model.reactComponent.props); return '
' + modelHTML + '
' + '' + '' }"`; +exports[`valid component 2`] = `"var oc=oc||{};oc.components=oc.components||{};oc.components['04fbf58f543a02fbc09b343fe5bf7e140a7e98ed']=function(model){ var modelHTML = model.__html ? model.__html : ''; var staticPath = model.reactComponent.props._staticPath; var props = JSON.stringify(model.reactComponent.props); return '
' + modelHTML + '
' + '' + '' }"`; diff --git a/packages/oc-template-react/__tests__/__snapshots__/getInfo.js.snap b/packages/oc-template-react/__tests__/__snapshots__/getInfo.js.snap index 86d0a0b..89cacab 100644 --- a/packages/oc-template-react/__tests__/__snapshots__/getInfo.js.snap +++ b/packages/oc-template-react/__tests__/__snapshots__/getInfo.js.snap @@ -11,7 +11,7 @@ Object { Object { "global": "React", "name": "react", - "url": "https://unpkg.com/react@16.2.0/umd/react.production.min.js", + "url": "https://unpkg.com/react@16.3.2/umd/react.production.min.js", }, Object { "global": "ReactDOM",