Updated to use typeof DefinePlugin check.

photonstorm · photonstorm · commit 62990198380f · 2018-04-20T00:23:24.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@
 
 ### Updates
 
+* We've swapped use of the Webpack DefinePlugin so instead of setting a global flag for the compilation of the Canvas and WebGL renderers, we now use a typeof check instead. This means you should now be able to ingest the Phaser source more easily outside of Webpack without having to define any global vars first (thanks @tgrajewski)
+
 ### Bug Fixes
 
 
diff --git a/src/boot/CreateRenderer.js b/src/boot/CreateRenderer.js
@@ -91,7 +91,7 @@ var CreateRenderer = function (game)
     var CanvasRenderer;
     var WebGLRenderer;
 
-    if (WEBGL_RENDERER && CANVAS_RENDERER)
+    if (typeof WEBGL_RENDERER && typeof CANVAS_RENDERER)
     {
         CanvasRenderer = require('../renderer/canvas/CanvasRenderer');
         WebGLRenderer = require('../renderer/webgl/WebGLRenderer');
@@ -109,7 +109,7 @@ var CreateRenderer = function (game)
         }
     }
 
-    if (WEBGL_RENDERER && !CANVAS_RENDERER)
+    if (typeof WEBGL_RENDERER && !typeof CANVAS_RENDERER)
     {
         WebGLRenderer = require('../renderer/webgl/WebGLRenderer');
 
@@ -119,7 +119,7 @@ var CreateRenderer = function (game)
         game.context = null;
     }
 
-    if (!WEBGL_RENDERER && CANVAS_RENDERER)
+    if (!typeof WEBGL_RENDERER && typeof CANVAS_RENDERER)
     {
         CanvasRenderer = require('../renderer/canvas/CanvasRenderer');
 
diff --git a/src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextRender.js b/src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextRender.js
@@ -7,12 +7,12 @@
 var renderWebGL = require('../../../utils/NOOP');
 var renderCanvas = require('../../../utils/NOOP');
 
-if (WEBGL_RENDERER)
+if (typeof WEBGL_RENDERER)
 {
     renderWebGL = require('./DynamicBitmapTextWebGLRenderer');
 }
 
-if (CANVAS_RENDERER)
+if (typeof CANVAS_RENDERER)
 {
     renderCanvas = require('./DynamicBitmapTextCanvasRenderer');
 }
diff --git a/src/gameobjects/bitmaptext/static/BitmapTextRender.js b/src/gameobjects/bitmaptext/static/BitmapTextRender.js
@@ -7,12 +7,12 @@
 var renderWebGL = require('../../../utils/NOOP');
 var renderCanvas = require('../../../utils/NOOP');
 
-if (WEBGL_RENDERER)
+if (typeof WEBGL_RENDERER)
 {
     renderWebGL = require('./BitmapTextWebGLRenderer');
 }
 
-if (CANVAS_RENDERER)
+if (typeof CANVAS_RENDERER)
 {
     renderCanvas = require('./BitmapTextCanvasRenderer');
 }
diff --git a/src/gameobjects/blitter/BlitterRender.js b/src/gameobjects/blitter/BlitterRender.js
@@ -7,12 +7,12 @@
 var renderWebGL = require('../../utils/NOOP');
 var renderCanvas = require('../../utils/NOOP');
 
-if (WEBGL_RENDERER)
+if (typeof WEBGL_RENDERER)
 {
     renderWebGL = require('./BlitterWebGLRenderer');
 }
 
-if (CANVAS_RENDERER)
+if (typeof CANVAS_RENDERER)
 {
     renderCanvas = require('./BlitterCanvasRenderer');
 }
diff --git a/src/gameobjects/container/ContainerRender.js b/src/gameobjects/container/ContainerRender.js
@@ -8,12 +8,12 @@
 var renderWebGL = require('../../utils/NOOP');
 var renderCanvas = require('../../utils/NOOP');
 
-if (WEBGL_RENDERER)
+if (typeof WEBGL_RENDERER)
 {
     renderWebGL = require('./ContainerWebGLRenderer');
 }
 
-if (CANVAS_RENDERER)
+if (typeof CANVAS_RENDERER)
 {
     renderCanvas = require('./ContainerCanvasRenderer');
 }
diff --git a/src/gameobjects/graphics/GraphicsRender.js b/src/gameobjects/graphics/GraphicsRender.js
@@ -7,15 +7,15 @@
 var renderWebGL = require('../../utils/NOOP');
 var renderCanvas = require('../../utils/NOOP');
 
-if (WEBGL_RENDERER)
+if (typeof WEBGL_RENDERER)
 {
     renderWebGL = require('./GraphicsWebGLRenderer');
 
     //  Needed for Graphics.generateTexture
     renderCanvas = require('./GraphicsCanvasRenderer');
 }
 
-if (CANVAS_RENDERER)
+if (typeof CANVAS_RENDERER)
 {
     renderCanvas = require('./GraphicsCanvasRenderer');
 }
diff --git a/src/gameobjects/image/ImageRender.js b/src/gameobjects/image/ImageRender.js
@@ -7,12 +7,12 @@
 var renderWebGL = require('../../utils/NOOP');
 var renderCanvas = require('../../utils/NOOP');
 
-if (WEBGL_RENDERER)
+if (typeof WEBGL_RENDERER)
 {
     renderWebGL = require('./ImageWebGLRenderer');
 }
 
-if (CANVAS_RENDERER)
+if (typeof CANVAS_RENDERER)
 {
     renderCanvas = require('./ImageCanvasRenderer');
 }
diff --git a/src/gameobjects/index.js b/src/gameobjects/index.js
@@ -76,7 +76,7 @@ var GameObjects = {
 
 };
 
-if (WEBGL_RENDERER)
+if (typeof WEBGL_RENDERER)
 {
     //  WebGL only Game Objects
     GameObjects.Mesh = require('./mesh/Mesh');
diff --git a/src/gameobjects/mesh/MeshFactory.js b/src/gameobjects/mesh/MeshFactory.js
@@ -27,7 +27,7 @@ var GameObjectFactory = require('../GameObjectFactory');
  *
  * @return {Phaser.GameObjects.Mesh} The Game Object that was created.
  */
-if (WEBGL_RENDERER)
+if (typeof WEBGL_RENDERER)
 {
     GameObjectFactory.register('mesh', function (x, y, vertices, uv, colors, alphas, texture, frame)
     {
diff --git a/src/gameobjects/mesh/MeshRender.js b/src/gameobjects/mesh/MeshRender.js
@@ -7,12 +7,12 @@
 var renderWebGL = require('../../utils/NOOP');
 var renderCanvas = require('../../utils/NOOP');
 
-if (WEBGL_RENDERER)
+if (typeof WEBGL_RENDERER)
 {
     renderWebGL = require('./MeshWebGLRenderer');
 }
 
-if (CANVAS_RENDERER)
+if (typeof CANVAS_RENDERER)
 {
     renderCanvas = require('./MeshCanvasRenderer');
 }
diff --git a/src/gameobjects/particles/ParticleManagerRender.js b/src/gameobjects/particles/ParticleManagerRender.js
@@ -7,12 +7,12 @@
 var renderWebGL = require('../../utils/NOOP');
 var renderCanvas = require('../../utils/NOOP');
 
-if (WEBGL_RENDERER)
+if (typeof WEBGL_RENDERER)
 {
     renderWebGL = require('./ParticleManagerWebGLRenderer');
 }
 
-if (CANVAS_RENDERER)
+if (typeof CANVAS_RENDERER)
 {
     renderCanvas = require('./ParticleManagerCanvasRenderer');
 }
diff --git a/src/gameobjects/quad/QuadFactory.js b/src/gameobjects/quad/QuadFactory.js
@@ -23,7 +23,7 @@ var GameObjectFactory = require('../GameObjectFactory');
  * 
  * @return {Phaser.GameObjects.Quad} The Game Object that was created.
  */
-if (WEBGL_RENDERER)
+if (typeof WEBGL_RENDERER)
 {
     GameObjectFactory.register('quad', function (x, y, key, frame)
     {
diff --git a/src/gameobjects/rendertexture/RenderTextureRender.js b/src/gameobjects/rendertexture/RenderTextureRender.js
@@ -7,12 +7,12 @@
 var renderWebGL = require('../../utils/NOOP');
 var renderCanvas = require('../../utils/NOOP');
 
-if (WEBGL_RENDERER)
+if (typeof WEBGL_RENDERER)
 {
     renderWebGL = require('./RenderTextureWebGLRenderer');
 }
 
-if (CANVAS_RENDERER)
+if (typeof CANVAS_RENDERER)
 {
     renderCanvas = require('./RenderTextureCanvasRenderer');
 }
diff --git a/src/gameobjects/sprite/SpriteRender.js b/src/gameobjects/sprite/SpriteRender.js
@@ -7,12 +7,12 @@
 var renderWebGL = require('../../utils/NOOP');
 var renderCanvas = require('../../utils/NOOP');
 
-if (WEBGL_RENDERER)
+if (typeof WEBGL_RENDERER)
 {
     renderWebGL = require('./SpriteWebGLRenderer');
 }
 
-if (CANVAS_RENDERER)
+if (typeof CANVAS_RENDERER)
 {
     renderCanvas = require('./SpriteCanvasRenderer');
 }
diff --git a/src/gameobjects/text/static/TextRender.js b/src/gameobjects/text/static/TextRender.js
@@ -7,12 +7,12 @@
 var renderWebGL = require('../../../utils/NOOP');
 var renderCanvas = require('../../../utils/NOOP');
 
-if (WEBGL_RENDERER)
+if (typeof WEBGL_RENDERER)
 {
     renderWebGL = require('./TextWebGLRenderer');
 }
 
-if (CANVAS_RENDERER)
+if (typeof CANVAS_RENDERER)
 {
     renderCanvas = require('./TextCanvasRenderer');
 }
diff --git a/src/gameobjects/tilesprite/TileSpriteRender.js b/src/gameobjects/tilesprite/TileSpriteRender.js
@@ -7,12 +7,12 @@
 var renderWebGL = require('../../utils/NOOP');
 var renderCanvas = require('../../utils/NOOP');
 
-if (WEBGL_RENDERER)
+if (typeof WEBGL_RENDERER)
 {
     renderWebGL = require('./TileSpriteWebGLRenderer');
 }
 
-if (CANVAS_RENDERER)
+if (typeof CANVAS_RENDERER)
 {
     renderCanvas = require('./TileSpriteCanvasRenderer');
 }
diff --git a/src/tilemaps/dynamiclayer/DynamicTilemapLayerRender.js b/src/tilemaps/dynamiclayer/DynamicTilemapLayerRender.js
@@ -7,12 +7,12 @@
 var renderWebGL = require('../../utils/NOOP');
 var renderCanvas = require('../../utils/NOOP');
 
-if (WEBGL_RENDERER)
+if (typeof WEBGL_RENDERER)
 {
     renderWebGL = require('./DynamicTilemapLayerWebGLRenderer');
 }
 
-if (CANVAS_RENDERER)
+if (typeof CANVAS_RENDERER)
 {
     renderCanvas = require('./DynamicTilemapLayerCanvasRenderer');
 }
diff --git a/src/tilemaps/staticlayer/StaticTilemapLayerRender.js b/src/tilemaps/staticlayer/StaticTilemapLayerRender.js
@@ -7,12 +7,12 @@
 var renderWebGL = require('../../utils/NOOP');
 var renderCanvas = require('../../utils/NOOP');
 
-if (WEBGL_RENDERER)
+if (typeof WEBGL_RENDERER)
 {
     renderWebGL = require('./StaticTilemapLayerWebGLRenderer');
 }
 
-if (CANVAS_RENDERER)
+if (typeof CANVAS_RENDERER)
 {
     renderCanvas = require('./StaticTilemapLayerCanvasRenderer');
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -35,8 +35,8 @@ module.exports = {
 
     plugins: [
         new webpack.DefinePlugin({
-            CANVAS_RENDERER: JSON.stringify(true),
-            WEBGL_RENDERER: JSON.stringify(true)
+            "typeof CANVAS_RENDERER": JSON.stringify(true),
+            "typeof WEBGL_RENDERER": JSON.stringify(true)
         }),
 
         new WebpackShellPlugin({onBuildExit: 'node copy-to-examples.js'})

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ var CreateRenderer = function (game)`
`91`	`91`	`var CanvasRenderer;`
`92`	`92`	`var WebGLRenderer;`
`93`	`93`
`94`		`- if (WEBGL_RENDERER && CANVAS_RENDERER)`
	`94`	`+ if (typeof WEBGL_RENDERER && typeof CANVAS_RENDERER)`
`95`	`95`	`{`
`96`	`96`	`CanvasRenderer = require('../renderer/canvas/CanvasRenderer');`
`97`	`97`	`WebGLRenderer = require('../renderer/webgl/WebGLRenderer');`
`@@ -109,7 +109,7 @@ var CreateRenderer = function (game)`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`
`112`		`- if (WEBGL_RENDERER && !CANVAS_RENDERER)`
	`112`	`+ if (typeof WEBGL_RENDERER && !typeof CANVAS_RENDERER)`
`113`	`113`	`{`
`114`	`114`	`WebGLRenderer = require('../renderer/webgl/WebGLRenderer');`
`115`	`115`
`@@ -119,7 +119,7 @@ var CreateRenderer = function (game)`
`119`	`119`	`game.context = null;`
`120`	`120`	`}`
`121`	`121`
`122`		`- if (!WEBGL_RENDERER && CANVAS_RENDERER)`
	`122`	`+ if (!typeof WEBGL_RENDERER && typeof CANVAS_RENDERER)`
`123`	`123`	`{`
`124`	`124`	`CanvasRenderer = require('../renderer/canvas/CanvasRenderer');`
`125`	`125`
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@`
`7`	`7`	`var renderWebGL = require('../../../utils/NOOP');`
`8`	`8`	`var renderCanvas = require('../../../utils/NOOP');`
`9`	`9`
`10`		`-if (WEBGL_RENDERER)`
	`10`	`+if (typeof WEBGL_RENDERER)`
`11`	`11`	`{`
`12`	`12`	`renderWebGL = require('./DynamicBitmapTextWebGLRenderer');`
`13`	`13`	`}`
`14`	`14`
`15`		`-if (CANVAS_RENDERER)`
	`15`	`+if (typeof CANVAS_RENDERER)`
`16`	`16`	`{`
`17`	`17`	`renderCanvas = require('./DynamicBitmapTextCanvasRenderer');`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@`
`7`	`7`	`var renderWebGL = require('../../utils/NOOP');`
`8`	`8`	`var renderCanvas = require('../../utils/NOOP');`
`9`	`9`
`10`		`-if (WEBGL_RENDERER)`
	`10`	`+if (typeof WEBGL_RENDERER)`
`11`	`11`	`{`
`12`	`12`	`renderWebGL = require('./BlitterWebGLRenderer');`
`13`	`13`	`}`
`14`	`14`
`15`		`-if (CANVAS_RENDERER)`
	`15`	`+if (typeof CANVAS_RENDERER)`
`16`	`16`	`{`
`17`	`17`	`renderCanvas = require('./BlitterCanvasRenderer');`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,12 @@`
`8`	`8`	`var renderWebGL = require('../../utils/NOOP');`
`9`	`9`	`var renderCanvas = require('../../utils/NOOP');`
`10`	`10`
`11`		`-if (WEBGL_RENDERER)`
	`11`	`+if (typeof WEBGL_RENDERER)`
`12`	`12`	`{`
`13`	`13`	`renderWebGL = require('./ContainerWebGLRenderer');`
`14`	`14`	`}`
`15`	`15`
`16`		`-if (CANVAS_RENDERER)`
	`16`	`+if (typeof CANVAS_RENDERER)`
`17`	`17`	`{`
`18`	`18`	`renderCanvas = require('./ContainerCanvasRenderer');`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,15 @@`
`7`	`7`	`var renderWebGL = require('../../utils/NOOP');`
`8`	`8`	`var renderCanvas = require('../../utils/NOOP');`
`9`	`9`
`10`		`-if (WEBGL_RENDERER)`
	`10`	`+if (typeof WEBGL_RENDERER)`
`11`	`11`	`{`
`12`	`12`	`renderWebGL = require('./GraphicsWebGLRenderer');`
`13`	`13`
`14`	`14`	`// Needed for Graphics.generateTexture`
`15`	`15`	`renderCanvas = require('./GraphicsCanvasRenderer');`
`16`	`16`	`}`
`17`	`17`
`18`		`-if (CANVAS_RENDERER)`
	`18`	`+if (typeof CANVAS_RENDERER)`
`19`	`19`	`{`
`20`	`20`	`renderCanvas = require('./GraphicsCanvasRenderer');`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ var GameObjects = {`
`76`	`76`
`77`	`77`	`};`
`78`	`78`
`79`		`-if (WEBGL_RENDERER)`
	`79`	`+if (typeof WEBGL_RENDERER)`
`80`	`80`	`{`
`81`	`81`	`// WebGL only Game Objects`
`82`	`82`	`GameObjects.Mesh = require('./mesh/Mesh');`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ var GameObjectFactory = require('../GameObjectFactory');`
`27`	`27`	`*`
`28`	`28`	`* @return {Phaser.GameObjects.Mesh} The Game Object that was created.`
`29`	`29`	`*/`
`30`		`-if (WEBGL_RENDERER)`
	`30`	`+if (typeof WEBGL_RENDERER)`
`31`	`31`	`{`
`32`	`32`	`GameObjectFactory.register('mesh', function (x, y, vertices, uv, colors, alphas, texture, frame)`
`33`	`33`	`{`