From 1a0ea5d59ac9a44ebb073815f9fda14af68893e9 Mon Sep 17 00:00:00 2001 From: Garethp Date: Fri, 17 Aug 2018 12:51:46 +0100 Subject: [PATCH 1/6] Adding a forced generator option --- node_package/src/ComponentRegistry.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/node_package/src/ComponentRegistry.js b/node_package/src/ComponentRegistry.js index 4426d5691..67ce93ab4 100644 --- a/node_package/src/ComponentRegistry.js +++ b/node_package/src/ComponentRegistry.js @@ -7,8 +7,9 @@ const registeredComponents = new Map(); export default { /** * @param components { component1: component1, component2: component2, etc. } + * @param isGeneratorFunction boolean */ - register(components) { + register(components, isGeneratorFunction) { Object.keys(components).forEach(name => { if (registeredComponents.has(name)) { console.warn('Called register for component that is already registered', name); @@ -19,7 +20,7 @@ export default { throw new Error(`Called register with null component named ${name}`); } - const isGeneratorFunction = generatorFunction(component); + const isGeneratorFunction = isGeneratorFunction || generatorFunction(component); const isRenderer = isGeneratorFunction && component.length === 3; registeredComponents.set(name, { From 8924594679ac684678071aa713e78963fbdd1b8e Mon Sep 17 00:00:00 2001 From: Garethp Date: Fri, 17 Aug 2018 13:53:42 +0100 Subject: [PATCH 2/6] Updating var name --- node_package/src/ComponentRegistry.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/node_package/src/ComponentRegistry.js b/node_package/src/ComponentRegistry.js index 67ce93ab4..baed4d000 100644 --- a/node_package/src/ComponentRegistry.js +++ b/node_package/src/ComponentRegistry.js @@ -7,9 +7,9 @@ const registeredComponents = new Map(); export default { /** * @param components { component1: component1, component2: component2, etc. } - * @param isGeneratorFunction boolean + * @param componentsAreGeneratorFunctions boolean */ - register(components, isGeneratorFunction) { + register(components, componentsAreGeneratorFunctions) { Object.keys(components).forEach(name => { if (registeredComponents.has(name)) { console.warn('Called register for component that is already registered', name); @@ -20,7 +20,7 @@ export default { throw new Error(`Called register with null component named ${name}`); } - const isGeneratorFunction = isGeneratorFunction || generatorFunction(component); + const isGeneratorFunction = componentsAreGeneratorFunctions || generatorFunction(component); const isRenderer = isGeneratorFunction && component.length === 3; registeredComponents.set(name, { From 520109e66a11526ed4ba4594ba7ad13548a72a24 Mon Sep 17 00:00:00 2001 From: Gareth Parker Date: Mon, 20 Aug 2018 17:18:55 +0100 Subject: [PATCH 3/6] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fb56715a3..4eb25c793 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "scripts": { "test": "babel-tape-runner -r node_package/tests/helpers/test_helper.js node_package/tests/*.js | tap-spec", "clean": "rm -rf node_package/lib", - "prepare": "yarn run build", + "prepare": "npm run build", "prepublish": "npm run prepare", "babel": "babel --out-dir node_package/lib node_package/src", "build": "yarn run clean && yarn run babel", From bf698c9e479a672e4046e5cf64f19b5a0074638b Mon Sep 17 00:00:00 2001 From: Gareth Parker Date: Mon, 20 Aug 2018 17:26:08 +0100 Subject: [PATCH 4/6] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4eb25c793..670c7ea91 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "scripts": { "test": "babel-tape-runner -r node_package/tests/helpers/test_helper.js node_package/tests/*.js | tap-spec", "clean": "rm -rf node_package/lib", - "prepare": "npm run build", + "prepare": "npm run babel", "prepublish": "npm run prepare", "babel": "babel --out-dir node_package/lib node_package/src", "build": "yarn run clean && yarn run babel", From 9e7ec6c64cde278e12991339e41d74fe7ae16aee Mon Sep 17 00:00:00 2001 From: Gareth Parker Date: Tue, 21 Aug 2018 12:35:04 +0100 Subject: [PATCH 5/6] Update ReactOnRails.js --- node_package/src/ReactOnRails.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node_package/src/ReactOnRails.js b/node_package/src/ReactOnRails.js index 0dda76e91..6559b2e19 100644 --- a/node_package/src/ReactOnRails.js +++ b/node_package/src/ReactOnRails.js @@ -22,8 +22,8 @@ ctx.ReactOnRails = { * find you components for rendering. * @param components (key is component name, value is component) */ - register(components) { - ComponentRegistry.register(components); + register(components, componentsAreGeneratorFunctions) { + ComponentRegistry.register(components, componentsAreGeneratorFunctions); }, /** From 1e23d4f8c4f46735a60f3483ec5f5a675d1420be Mon Sep 17 00:00:00 2001 From: Gareth Parker Date: Tue, 21 Aug 2018 12:36:07 +0100 Subject: [PATCH 6/6] Update ReactOnRails.js --- node_package/src/ReactOnRails.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node_package/src/ReactOnRails.js b/node_package/src/ReactOnRails.js index 0dda76e91..6559b2e19 100644 --- a/node_package/src/ReactOnRails.js +++ b/node_package/src/ReactOnRails.js @@ -22,8 +22,8 @@ ctx.ReactOnRails = { * find you components for rendering. * @param components (key is component name, value is component) */ - register(components) { - ComponentRegistry.register(components); + register(components, componentsAreGeneratorFunctions) { + ComponentRegistry.register(components, componentsAreGeneratorFunctions); }, /**