Merge pull request #27 from optimizely/haley/1.2.1

haleybash-optimizely · web-flow · commit 848cf13fc54b · 2017-02-01T10:12:39.000-08:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------------------
+1.2.1
+-------------------------------------------------------------------------------
+* Fix webpack build error.
+-------------------------------------------------------------------------------
+
 -------------------------------------------------------------------------------
 1.2.0
 -------------------------------------------------------------------------------
diff --git a/dist/optimizely.min.js b/dist/optimizely.min.js
diff --git a/index.js b/index.js
@@ -7,7 +7,7 @@ var logger = require('optimizely-server-sdk/lib/plugins/logger');
 
 var Optimizely = require('optimizely-server-sdk/lib/optimizely');
 
-var JAVASCRIPT_CLIENT_VERSION = '1.2.0';
+var JAVASCRIPT_CLIENT_VERSION = '1.2.1';
 var MODULE_NAME = 'INDEX';
 
 /**
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "optimizely-client-sdk",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "JavaScript SDK for Optimizely X Full Stack",
   "main": "index.js",
   "scripts": {

-Original file line number
+Diff line change
@@ @@ -1,3 +1,9 @@ @@
 +-------------------------------------------------------------------------------
 +1.2.1
 +-------------------------------------------------------------------------------
 +* Fix webpack build error.
 +-------------------------------------------------------------------------------
++
 -------------------------------------------------------------------------------
 .2.0
 -------------------------------------------------------------------------------
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "optimizely-client-sdk",`
`3`		`- "version": "1.2.0",`
	`3`	`+ "version": "1.2.1",`
`4`	`4`	`"description": "JavaScript SDK for Optimizely X Full Stack",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`