From 3c87687f98e86188d678614c02f1f9db1191b4b4 Mon Sep 17 00:00:00 2001 From: matteofigus Date: Thu, 7 Jun 2018 12:18:43 +0100 Subject: [PATCH 1/2] Upgrade react --- .../__tests__/__snapshots__/acceptance.js.snap | 6 +++--- package.json | 4 ++++ .../__tests__/__snapshots__/compileView.js.snap | 4 ++-- packages/oc-template-react-compiler/package.json | 2 +- .../__tests__/__snapshots__/getInfo.js.snap | 4 ++-- packages/oc-template-react/package.json | 8 ++++---- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/acceptance-setup/__tests__/__snapshots__/acceptance.js.snap b/acceptance-setup/__tests__/__snapshots__/acceptance.js.snap index 0087e15..2928d81 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\\":\\"15a63d37a08b7907b35797e51a4a7afcbd906cc6\\",\\"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\\":\\"c15a620a8a2b52af785b7ae276e1f4e89781e6b2\\"}}"`; +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\\":\\"15a63d37a08b7907b35797e51a4a7afcbd906cc6\\",\\"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\\":\\"d9dc3134a182f36543f3fd15e62dcdb2ef52b3bf\\"}}"`; -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/package.json b/package.json index 35ac856..fd3134e 100644 --- a/package.json +++ b/package.json @@ -40,5 +40,9 @@ "!packages/**/scaffold/**/*", "!packages/**/utils/**/*" ] + }, + "dependencies": { + "normalize.css": "^7.0.0", + "oc-template-react-compiler": "^5.1.2" } } 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 0a9746c..14f8548 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": "c246e2c2247889e20b39dbdf1f1bce65b2aebf24", }, "template": Object { - "hashKey": "c4c177969e57c4a49daa3134368ff715fb189560", + "hashKey": "e97759d7e09bdc330b6cea4c708417e00d1dbb12", "src": "template.js", "type": "oc-template-react", }, } `; -exports[`valid component 2`] = `"var oc=oc||{};oc.components=oc.components||{};oc.components['c4c177969e57c4a49daa3134368ff715fb189560']=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['e97759d7e09bdc330b6cea4c708417e00d1dbb12']=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-compiler/package.json b/packages/oc-template-react-compiler/package.json index d6bd765..84ba942 100644 --- a/packages/oc-template-react-compiler/package.json +++ b/packages/oc-template-react-compiler/package.json @@ -52,7 +52,7 @@ "postcss-import": "^11.0.0", "postcss-loader": "^2.0.9", "prop-types": "15.6.1", - "react": "16.3.2", + "react": "16.4.0", "webpack": "^4.8.3" }, "files": [ diff --git a/packages/oc-template-react/__tests__/__snapshots__/getInfo.js.snap b/packages/oc-template-react/__tests__/__snapshots__/getInfo.js.snap index 977d58d..2dfe96f 100644 --- a/packages/oc-template-react/__tests__/__snapshots__/getInfo.js.snap +++ b/packages/oc-template-react/__tests__/__snapshots__/getInfo.js.snap @@ -11,12 +11,12 @@ Object { Object { "global": "React", "name": "react", - "url": "https://unpkg.com/react@16.3.2/umd/react.production.min.js", + "url": "https://unpkg.com/react@16.4.0/umd/react.production.min.js", }, Object { "global": "ReactDOM", "name": "react-dom", - "url": "https://unpkg.com/react-dom@16.3.2/umd/react-dom.production.min.js", + "url": "https://unpkg.com/react-dom@16.4.0/umd/react-dom.production.min.js", }, ], "type": "oc-template-react", diff --git a/packages/oc-template-react/package.json b/packages/oc-template-react/package.json index 4998c2e..f28b16c 100644 --- a/packages/oc-template-react/package.json +++ b/packages/oc-template-react/package.json @@ -27,8 +27,8 @@ "nice-cache": "0.0.5", "oc-generic-template-renderer": "2.0.4", "prop-types": "15.6.1", - "react": "16.3.2", - "react-dom": "16.3.2" + "react": "16.4.0", + "react-dom": "16.4.0" }, "files": [ "lib", @@ -43,11 +43,11 @@ }, "react": { "global": "React", - "url": "https://unpkg.com/react@16.3.2/umd/react.production.min.js" + "url": "https://unpkg.com/react@16.4.0/umd/react.production.min.js" }, "react-dom": { "global": "ReactDOM", - "url": "https://unpkg.com/react-dom@16.3.2/umd/react-dom.production.min.js" + "url": "https://unpkg.com/react-dom@16.4.0/umd/react-dom.production.min.js" } } } From 8ba05b56cec7f495ca83e8c52fbd56ce8be36a62 Mon Sep 17 00:00:00 2001 From: matteofigus Date: Thu, 7 Jun 2018 12:21:55 +0100 Subject: [PATCH 2/2] Clean package.json --- package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package.json b/package.json index 0ceb024..6441813 100644 --- a/package.json +++ b/package.json @@ -40,9 +40,5 @@ "!packages/**/scaffold/**/*", "!packages/**/utils/**/*" ] - }, - "dependencies": { - "normalize.css": "^7.0.0", - "oc-template-react-compiler": "^5.1.2" } }