Explorar o código

Merge branch '4.1' into 4.2-beta

# Conflicts:
#	spine-ts/package-lock.json
#	spine-ts/package.json
#	spine-ts/spine-canvas/package.json
#	spine-ts/spine-core/package.json
#	spine-ts/spine-phaser/package.json
#	spine-ts/spine-pixi/package.json
#	spine-ts/spine-player/package.json
#	spine-ts/spine-threejs/package.json
#	spine-ts/spine-webgl/package.json
Mario Zechner hai 1 ano
pai
achega
f3005a4b52

+ 1 - 1
spine-ts/spine-phaser/src/require-shim.ts

@@ -30,7 +30,7 @@
 declare global {
 declare global {
 	var require: any;
 	var require: any;
 }
 }
-if (window.Phaser) {
+if (typeof window !== 'undefined' && window.Phaser) {
 	let prevRequire = window.require;
 	let prevRequire = window.require;
 	window.require = (x: string) => {
 	window.require = (x: string) => {
 		if (prevRequire) return prevRequire(x);
 		if (prevRequire) return prevRequire(x);

+ 1 - 1
spine-ts/spine-pixi/src/require-shim.ts

@@ -32,7 +32,7 @@ declare global {
 	var PIXI: any;
 	var PIXI: any;
 }
 }
 
 
-if (window.PIXI) {
+if (typeof window !== 'undefined' && window.PIXI) {
 	let prevRequire = window.require;
 	let prevRequire = window.require;
 	window.require = (x: string) => {
 	window.require = (x: string) => {
 		if (prevRequire) return prevRequire(x);
 		if (prevRequire) return prevRequire(x);

+ 1 - 1
spine-ts/spine-threejs/src/require-shim.ts

@@ -31,7 +31,7 @@ declare global {
 	var require: any;
 	var require: any;
 }
 }
 
 
-if (window.THREE) {
+if (typeof window !== 'undefined' && window.THREE) {
 	let prevRequire = window.require;
 	let prevRequire = window.require;
 	window.require = (x: string) => {
 	window.require = (x: string) => {
 		if (prevRequire) return prevRequire(x);
 		if (prevRequire) return prevRequire(x);