add a symbol to toggle whether to use React with or without addons

(fixes #4), prepare for release
eddyson-de · Nov 23, 2016 · bade81b · bade81b
1 parent 1b19f7e
commit bade81b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ respositories {
 }
 
 dependencies {
-  runtime 'de.eddyson:tapestry-react:0.17.0'
+  runtime 'de.eddyson:tapestry-react:0.17.1'
 }
 
 ```

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 description = "Use React together with Tapestry"
 
 group = "de.eddyson"
-version = "0.17.0"
+version = "0.17.1"
 
 apply plugin: 'groovy'
 apply plugin: 'maven'

diff --git a/src/main/java/de/eddyson/tapestry/react/ReactModule.java b/src/main/java/de/eddyson/tapestry/react/ReactModule.java
@@ -52,13 +52,19 @@ public final class ReactModule {
   @Contribute(ModuleManager.class)
   public static void setupJSModules(final MappedConfiguration<String, JavaScriptModuleConfiguration> configuration,
       final AssetSource assetSource, @Symbol(SymbolConstants.PRODUCTION_MODE) final boolean productionMode,
+      @Symbol(ReactSymbols.USE_REACT_WITH_ADDONS) final boolean useReactWithAddons,
       @Symbol(ReactSymbols.REACT_ASSET_PATH) final String reactAssetPath,
       @Symbol(ReactSymbols.REACT_ASSET_PATH_PRODUCTION) final String reactAssetPathProduction,
+      @Symbol(ReactSymbols.REACT_WITH_ADDONS_ASSET_PATH) final String reactWithAddonsAssetPath,
+      @Symbol(ReactSymbols.REACT_WITH_ADDONS_ASSET_PATH_PRODUCTION) final String reactWithAddonsAssetPathProduction,
       @Symbol(ReactSymbols.REACT_DOM_ASSET_PATH) final String reactDomAssetPath,
       @Symbol(ReactSymbols.REACT_DOM_ASSET_PATH_PRODUCTION) final String reactDomAssetPathProduction) {
 
-    configuration.add("react", new JavaScriptModuleConfiguration(
-        assetSource.resourceForPath(productionMode ? reactAssetPathProduction : reactAssetPath)));
+    String reactAssetPathToUse = useReactWithAddons
+        ? (productionMode ? reactWithAddonsAssetPathProduction : reactWithAddonsAssetPath)
+        : (productionMode ? reactAssetPathProduction : reactAssetPath);
+
+    configuration.add("react", new JavaScriptModuleConfiguration(assetSource.resourceForPath(reactAssetPathToUse)));
     configuration.add("react-dom", new JavaScriptModuleConfiguration(
         assetSource.resourceForPath(productionMode ? reactDomAssetPathProduction : reactDomAssetPath)));
   }
@@ -114,8 +120,12 @@ public static void addLibraryMapping(final Configuration<LibraryMapping> configu
   public static void setupDefaultConfiguration(final MappedConfiguration<String, Object> configuration) {
     configuration.add(ReactSymbols.USE_COLORED_BABEL_OUTPUT, true);
     configuration.add(ReactSymbols.USE_NODE_IF_AVAILABLE, true);
+    configuration.add(ReactSymbols.USE_REACT_WITH_ADDONS, false);
     configuration.add(ReactSymbols.REACT_ASSET_PATH, "webjars:react:$version/react.js");
     configuration.add(ReactSymbols.REACT_ASSET_PATH_PRODUCTION, "webjars:react:$version/react.min.js");
+    configuration.add(ReactSymbols.REACT_WITH_ADDONS_ASSET_PATH, "webjars:react:$version/react-with-addons.js");
+    configuration.add(ReactSymbols.REACT_WITH_ADDONS_ASSET_PATH_PRODUCTION,
+        "webjars:react:$version/react-with-addons.min.js");
     configuration.add(ReactSymbols.REACT_DOM_ASSET_PATH, "webjars:react:$version/react-dom.js");
     configuration.add(ReactSymbols.REACT_DOM_ASSET_PATH_PRODUCTION, "webjars:react:$version/react-dom.min.js");
   }

diff --git a/src/main/java/de/eddyson/tapestry/react/ReactSymbols.java b/src/main/java/de/eddyson/tapestry/react/ReactSymbols.java
@@ -10,10 +10,17 @@ public final class ReactSymbols {
 
   public static final String REACT_ASSET_PATH_PRODUCTION = "tapestry.react.react_asset_path_production";
 
+  public static final String REACT_WITH_ADDONS_ASSET_PATH = "tapestry.react.react_with_addons_asset_path";
+
+  public static final String REACT_WITH_ADDONS_ASSET_PATH_PRODUCTION = "tapestry.react.react_with_addons_asset_path_production";
+
   public static final String REACT_DOM_ASSET_PATH = "tapestry.react.react_dom_asset_path";
 
   public static final String REACT_DOM_ASSET_PATH_PRODUCTION = "tapestry.react.react_dom_asset_path_production";
 
+  public static final String USE_REACT_WITH_ADDONS = "tapestry.react.use_react_with_addons";
+
+
   private ReactSymbols() {
   }
 }