v2.4.1 Fix Webpack 4 globalObject; add <script> test

annexare · Jan 2, 2019 · a387ddd · a387ddd
1 parent 622084e
commit a387ddd
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 11 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,5 +1,6 @@
 {
   "env": {
+    "browser": true,
     "jest": true,
     "node": true
   },

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "Countries",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "homepage": "http://annexare.github.io/Countries/",
   "author": {
     "name": "Dmytro",

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "annexare/countries-list",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Continents & countries: ISO 3166-1 alpha-2 code, name, ISO 639-1 languages, capital, currency, native name, phone. JSON, CSV and SQL.",
   "type": "library",
   "keywords": [

diff --git a/dist/index.es5.min.js b/dist/index.es5.min.js
diff --git a/dist/index.es5.min.test.js b/dist/index.es5.min.test.js
@@ -1,3 +1,4 @@
+const fs = require('fs');
 const es5 = require('./index.es5.min.js');
 const lib = require('./index.js');
 
@@ -9,3 +10,15 @@ test('has proper ES5 export', () => {
     expect(es5.hasOwnProperty(prop)).toBeTruthy();
   });
 });
+
+test('loads ES5 <script> properly', () => {
+  const scriptEl = document.createElement('script');
+  scriptEl.text = fs.readFileSync(__dirname + '/index.es5.min.js');
+  document.body.appendChild(scriptEl);
+
+  expect(window.Countries).toBeDefined();
+
+  Object.keys(lib).forEach(prop => {
+    expect(window.Countries.hasOwnProperty(prop)).toBeTruthy();
+  });
+});
diff --git a/gulpfile.js b/gulpfile.js
@@ -152,13 +152,14 @@ exports[DO_MIN_ES5] = function min_es5(callback) {
 
   const webpackConfig = {
     entry: `${DIST}index.js`,
-      output: {
-        filename: `index.${DO_MIN_ES5}.${JS_EXT}`,
-        libraryTarget: 'umd',
-        library: NAME,
+    output: {
+      globalObject: 'this',
+      filename: `index.${DO_MIN_ES5}.${JS_EXT}`,
+      libraryTarget: 'umd',
+      library: NAME,
       path: require('path').resolve(__dirname, DIST),
-        umdNamedDefine: true,
-      },
+      umdNamedDefine: true,
+    },
     module: {
       rules: [
         {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "countries-list",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Continents & countries: ISO 3166-1 alpha-2 code, name, ISO 639-1 languages, capital, currency, native name, phone. JSON, CSV and SQL.",
   "main": "./dist/index.es5.min.js",
   "repository": {
@@ -55,6 +55,7 @@
       "/node_modules/",
       ".*\\.min\\.js"
     ],
+    "testEnvironment": "jsdom",
     "verbose": true
   },
   "license": "MIT",