From fa4063455b9d362229d3745b70f189be682bf4c5 Mon Sep 17 00:00:00 2001 From: "Murray M. Moss" Date: Tue, 7 Jul 2015 15:22:49 -0400 Subject: [PATCH 1/2] Concatenate warning message, due to parsing issues The addons module warning is currently causing issues with babel/JSPM due to the warning message getting parsed as a require statement. Adding a break using string concatenation appears to prevent any issues. Example error using JSPM: ``` Error loading "react-addons-{addon}" from... ``` --- packages/react/addons.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react/addons.js b/packages/react/addons.js index d5d95c64df..7de797ab3c 100644 --- a/packages/react/addons.js +++ b/packages/react/addons.js @@ -1,8 +1,8 @@ var warning = require('./lib/warning'); warning( false, - "require('react/addons') is deprecated. " + - "Access using require('react-addons-{addon}') instead." + 'require' + "('react/addons') is deprecated. " + + 'Access using require' + "('react-addons-{addon}') instead." ); module.exports = require('./lib/ReactWithAddons'); From 334372758c27df3a6ef98a4decccef86550fa55f Mon Sep 17 00:00:00 2001 From: "Murray M. Moss" Date: Wed, 8 Jul 2015 13:26:36 -0400 Subject: [PATCH 2/2] Add comment to explain string concatenation --- packages/react/addons.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/react/addons.js b/packages/react/addons.js index 7de797ab3c..d4536f4eb0 100644 --- a/packages/react/addons.js +++ b/packages/react/addons.js @@ -1,6 +1,9 @@ var warning = require('./lib/warning'); warning( false, + // Require examples in this string must be split to prevent React's + // build tools from mistaking them for real requires. + // Otherwise the build tools will attempt to build a 'react-addons-{addon}' module. 'require' + "('react/addons') is deprecated. " + 'Access using require' + "('react-addons-{addon}') instead." );