Merge branch 'joeduncan-develop' into develop

TroyAlford · Jul 1, 2018 · 3c5acd2 · 3c5acd2
2 parents 1593752 + c15cf3c
commit 3c5acd2
Show file tree

Hide file tree

Showing 5 changed files with 1,234 additions and 1,691 deletions.
diff --git a/lib-tests/react-jsx-parser.min.test.js b/lib-tests/react-jsx-parser.min.test.js
@@ -0,0 +1,12 @@
+/**
+ * @jest-environment node
+ */
+
+jest.unmock('../lib/react-jsx-parser.min')
+
+describe('JSXParser', () => {
+  it('should work without window object', () => {
+    const fn = () => require('../lib/react-jsx-parser.min')
+    expect(fn).not.toThrow()
+  })
+})
diff --git a/lib/react-jsx-parser.min.js b/lib/react-jsx-parser.min.js
diff --git a/package.json b/package.json
@@ -18,8 +18,9 @@
     "@babel/plugin-proposal-class-properties": "^7.0.0-beta.49",
     "@babel/preset-env": "^7.0.0-beta.49",
     "@babel/preset-react": "^7.0.0-beta.49",
-    "babel-7-jest": "^21.3.3",
+    "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "^8.2.3",
+    "babel-jest": "^23.2.0",
     "babel-loader": "^8.0.0-beta",
     "cross-env": "^5.1.6",
     "enzyme": "^3.3.0",
@@ -50,7 +51,7 @@
   "jest": {
     "setupTestFrameworkScriptFile": "<rootDir>setupTests.js",
     "transform": {
-      ".js$": "babel-7-jest"
+      ".js$": "babel-jest"
     }
   }
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -42,6 +42,7 @@ module.exports = {
     path: `${__dirname}/lib`,
     libraryTarget: 'umd',
     umdNamedDefine: true,
+    globalObject: 'this'
   },
   plugins,
 }