From e4c2b34104a13eae35bcc1e11aa0870bc2a4d5d2 Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Wed, 26 Jun 2019 14:14:40 -0700
Subject: [PATCH] Browser compatibility

This allows downstream consumers to use GPU.js with requirejs,
d3-require, unpkg, jsdelivr, and probably some other systems. The main
changes:

- Set { standalone: 'UMD' } in browserify configuration. This makes it
  publish a UMD build that exposes a 'UMD' export or global for
  CommonJS, require, and AMD.
- Move bin/ to dist/, because these are properly distribution files
  rather than binaries.
- Update tests to point to the dist/ version.
- Simplify browser.js to always export, because it is not the
  recommended entry point for any browser.
- Add unpkg and jsdelivr fields to package.json so that those CDNs
  automatically pick up on the right file when someone tries to include
  from them.
---
 {bin => dist}/gpu-browser-core.js     | 18 ++++++------------
 {bin => dist}/gpu-browser-core.min.js | 20 +++++++-------------
 {bin => dist}/gpu-browser.js          | 18 ++++++------------
 {bin => dist}/gpu-browser.min.js      | 20 +++++++-------------
 gulpfile.js                           | 16 ++++++++--------
 package.json                          |  4 +++-
 src/browser.js                        | 10 +---------
 test/all.html                         |  2 +-
 8 files changed, 39 insertions(+), 69 deletions(-)
 rename {bin => dist}/gpu-browser-core.js (99%)
 rename {bin => dist}/gpu-browser-core.min.js (99%)
 rename {bin => dist}/gpu-browser.js (99%)
 rename {bin => dist}/gpu-browser.min.js (99%)

diff --git a/bin/gpu-browser-core.js b/dist/gpu-browser-core.js
similarity index 99%
rename from bin/gpu-browser-core.js
rename to dist/gpu-browser-core.js
index 3a212a56..d6935399 100644
--- a/bin/gpu-browser-core.js
+++ b/dist/gpu-browser-core.js
@@ -5,13 +5,13 @@
  * GPU Accelerated JavaScript
  *
  * @version 2.0.0-rc.17
- * @date Mon Jun 24 2019 21:10:10 GMT-0400 (Eastern Daylight Time)
+ * @date Wed Jun 26 2019 14:12:44 GMT-0700 (Pacific Daylight Time)
  *
  * @license MIT
  * The MIT License
  *
  * Copyright (c) 2019 gpu.js Team
- */(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+ */(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.GPU = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 
 },{}],2:[function(require,module,exports){
 function glWiretap(gl, options = {}) {
@@ -11159,15 +11159,8 @@ for (const p in lib) {
   if (p === 'GPU') continue; 
   GPU[p] = lib[p];
 }
-if (typeof module !== 'undefined') {
-  module.exports = GPU;
-}
-if (typeof window !== 'undefined') {
-  window.GPU = GPU;
-}
-if (typeof self !== 'undefined') {
-  self.GPU = GPU;
-}
+module.exports = GPU;
+
 },{"./index":84}],83:[function(require,module,exports){
 const gpuMock = require('gpu-mock.js');
 const { utils } = require('./utils');
@@ -12452,4 +12445,5 @@ const _systemEndianness = utils.getSystemEndianness();
 module.exports = {
   utils
 };
-},{"./input":85,"./texture":88,"acorn":1}]},{},[82]);
+},{"./input":85,"./texture":88,"acorn":1}]},{},[82])(82)
+});
diff --git a/bin/gpu-browser-core.min.js b/dist/gpu-browser-core.min.js
similarity index 99%
rename from bin/gpu-browser-core.min.js
rename to dist/gpu-browser-core.min.js
index e9c9c602..6fca3213 100644
--- a/bin/gpu-browser-core.min.js
+++ b/dist/gpu-browser-core.min.js
@@ -5,7 +5,7 @@
  * GPU Accelerated JavaScript
  *
  * @version 2.0.0-rc.17
- * @date Mon Jun 24 2019 21:10:12 GMT-0400 (Eastern Daylight Time)
+ * @date Wed Jun 26 2019 14:12:46 GMT-0700 (Pacific Daylight Time)
  *
  * @license MIT
  * The MIT License
@@ -18,13 +18,13 @@
  * GPU Accelerated JavaScript
  *
  * @version 2.0.0-rc.17
- * @date Mon Jun 24 2019 21:10:10 GMT-0400 (Eastern Daylight Time)
+ * @date Wed Jun 26 2019 14:12:44 GMT-0700 (Pacific Daylight Time)
  *
  * @license MIT
  * The MIT License
  *
  * Copyright (c) 2019 gpu.js Team
- */(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+ */(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.GPU = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 
 },{}],2:[function(require,module,exports){
 function glWiretap(gl, options = {}) {
@@ -11172,15 +11172,8 @@ for (const p in lib) {
   if (p === 'GPU') continue; 
   GPU[p] = lib[p];
 }
-if (typeof module !== 'undefined') {
-  module.exports = GPU;
-}
-if (typeof window !== 'undefined') {
-  window.GPU = GPU;
-}
-if (typeof self !== 'undefined') {
-  self.GPU = GPU;
-}
+module.exports = GPU;
+
 },{"./index":84}],83:[function(require,module,exports){
 const gpuMock = require('gpu-mock.js');
 const { utils } = require('./utils');
@@ -12465,4 +12458,5 @@ const _systemEndianness = utils.getSystemEndianness();
 module.exports = {
   utils
 };
-},{"./input":85,"./texture":88,"acorn":1}]},{},[82]);
+},{"./input":85,"./texture":88,"acorn":1}]},{},[82])(82)
+});
diff --git a/bin/gpu-browser.js b/dist/gpu-browser.js
similarity index 99%
rename from bin/gpu-browser.js
rename to dist/gpu-browser.js
index 853fba17..fee31b75 100644
--- a/bin/gpu-browser.js
+++ b/dist/gpu-browser.js
@@ -5,13 +5,13 @@
  * GPU Accelerated JavaScript
  *
  * @version 2.0.0-rc.17
- * @date Mon Jun 24 2019 21:10:10 GMT-0400 (Eastern Daylight Time)
+ * @date Wed Jun 26 2019 14:12:45 GMT-0700 (Pacific Daylight Time)
  *
  * @license MIT
  * The MIT License
  *
  * Copyright (c) 2019 gpu.js Team
- */(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+ */(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.GPU = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
@@ -15923,15 +15923,8 @@ for (const p in lib) {
   if (p === 'GPU') continue; 
   GPU[p] = lib[p];
 }
-if (typeof module !== 'undefined') {
-  module.exports = GPU;
-}
-if (typeof window !== 'undefined') {
-  window.GPU = GPU;
-}
-if (typeof self !== 'undefined') {
-  self.GPU = GPU;
-}
+module.exports = GPU;
+
 },{"./index":85}],84:[function(require,module,exports){
 const gpuMock = require('gpu-mock.js');
 const { utils } = require('./utils');
@@ -17216,4 +17209,5 @@ const _systemEndianness = utils.getSystemEndianness();
 module.exports = {
   utils
 };
-},{"./input":86,"./texture":89,"acorn":1}]},{},[83]);
+},{"./input":86,"./texture":89,"acorn":1}]},{},[83])(83)
+});
diff --git a/bin/gpu-browser.min.js b/dist/gpu-browser.min.js
similarity index 99%
rename from bin/gpu-browser.min.js
rename to dist/gpu-browser.min.js
index 38503e71..83e3761c 100644
--- a/bin/gpu-browser.min.js
+++ b/dist/gpu-browser.min.js
@@ -5,7 +5,7 @@
  * GPU Accelerated JavaScript
  *
  * @version 2.0.0-rc.17
- * @date Mon Jun 24 2019 21:10:12 GMT-0400 (Eastern Daylight Time)
+ * @date Wed Jun 26 2019 14:12:46 GMT-0700 (Pacific Daylight Time)
  *
  * @license MIT
  * The MIT License
@@ -18,13 +18,13 @@
  * GPU Accelerated JavaScript
  *
  * @version 2.0.0-rc.17
- * @date Mon Jun 24 2019 21:10:10 GMT-0400 (Eastern Daylight Time)
+ * @date Wed Jun 26 2019 14:12:45 GMT-0700 (Pacific Daylight Time)
  *
  * @license MIT
  * The MIT License
  *
  * Copyright (c) 2019 gpu.js Team
- */(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+ */(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.GPU = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
@@ -15936,15 +15936,8 @@ for (const p in lib) {
   if (p === 'GPU') continue; 
   GPU[p] = lib[p];
 }
-if (typeof module !== 'undefined') {
-  module.exports = GPU;
-}
-if (typeof window !== 'undefined') {
-  window.GPU = GPU;
-}
-if (typeof self !== 'undefined') {
-  self.GPU = GPU;
-}
+module.exports = GPU;
+
 },{"./index":85}],84:[function(require,module,exports){
 const gpuMock = require('gpu-mock.js');
 const { utils } = require('./utils');
@@ -17229,4 +17222,5 @@ const _systemEndianness = utils.getSystemEndianness();
 module.exports = {
   utils
 };
-},{"./input":86,"./texture":89,"acorn":1}]},{},[83]);
+},{"./input":86,"./texture":89,"acorn":1}]},{},[83])(83)
+});
diff --git a/gulpfile.js b/gulpfile.js
index 46d574ae..a7e4ff21 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -12,17 +12,17 @@ const stripComments = require('gulp-strip-comments');
 const merge = require('merge-stream');
 
 gulp.task('build', function() {
-  const gpu = browserify('./src/browser.js')
+  const gpu = browserify('./src/browser.js', {standalone: 'GPU'})
     .ignore('gl')
     .bundle()
     .pipe(source('gpu-browser.js'))
     .pipe(buffer())
     .pipe(stripComments())
     .pipe(header(fs.readFileSync('./src/browser-header.txt', 'utf8'), { pkg : pkg }))
-    .pipe(gulp.dest('bin'))
+    .pipe(gulp.dest('dist'))
     .on('error', console.error);
 
-  const gpuCore = browserify('./src/browser.js')
+  const gpuCore = browserify('./src/browser.js', {standalone: 'GPU'})
     .ignore('gl')
     .ignore('acorn')
     .bundle()
@@ -30,7 +30,7 @@ gulp.task('build', function() {
     .pipe(buffer())
     .pipe(stripComments())
     .pipe(header(fs.readFileSync('./src/browser-header.txt', 'utf8'), { pkg : pkg }))
-    .pipe(gulp.dest('bin'))
+    .pipe(gulp.dest('dist'))
     .on('error', console.error);
 
   return merge(gpu, gpuCore);
@@ -38,16 +38,16 @@ gulp.task('build', function() {
 
 /// Minify the build script, after building it
 gulp.task('minify', function() {
-  const gpu = gulp.src('bin/gpu-browser.js')
+  const gpu = gulp.src('dist/gpu-browser.js')
     .pipe(rename('gpu-browser.min.js'))
     .pipe(header(fs.readFileSync('./src/browser-header.txt', 'utf8'), { pkg : pkg }))
-    .pipe(gulp.dest('bin'))
+    .pipe(gulp.dest('dist'))
     .on('error', console.error);
 
-  const gpuCore = gulp.src('bin/gpu-browser-core.js')
+  const gpuCore = gulp.src('dist/gpu-browser-core.js')
     .pipe(rename('gpu-browser-core.min.js'))
     .pipe(header(fs.readFileSync('./src/browser-header.txt', 'utf8'), { pkg : pkg }))
-    .pipe(gulp.dest('bin'))
+    .pipe(gulp.dest('dist'))
     .on('error', console.error);
 
   return merge(gpu, gpuCore);
diff --git a/package.json b/package.json
index fbe0e802..8d6f9e4f 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,10 @@
   },
   "main": "./src/index.js",
   "files": [
-    "src"
+    "src", "dist"
   ],
+  "unpkg": "./dist/gpu-browser.min.js",
+  "jsdelivr": "./dist/gpu-browser.min.js",
   "directories": {
     "doc": "doc",
     "test": "test"
diff --git a/src/browser.js b/src/browser.js
index 372c7ba2..ffea4a6f 100644
--- a/src/browser.js
+++ b/src/browser.js
@@ -5,12 +5,4 @@ for (const p in lib) {
   if (p === 'GPU') continue; //prevent recursive reference
   GPU[p] = lib[p];
 }
-if (typeof module !== 'undefined') {
-  module.exports = GPU;
-}
-if (typeof window !== 'undefined') {
-  window.GPU = GPU;
-}
-if (typeof self !== 'undefined') {
-  self.GPU = GPU;
-}
\ No newline at end of file
+module.exports = GPU;
\ No newline at end of file
diff --git a/test/all.html b/test/all.html
index 798e5c93..f0505aab 100644
--- a/test/all.html
+++ b/test/all.html
@@ -6,7 +6,7 @@
   <link rel="stylesheet" href="../node_modules/qunit/qunit/qunit.css">
 
   <!-- gpu.js scripts -->
-  <script src="../bin/gpu-browser.js"></script>
+  <script src="../dist/gpu-browser.js"></script>
 </head>
 <body>
 <div id="qunit"></div>