mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-02-04 14:24:53 +08:00
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
This commit is contained in:
commit
f3005a4b52
@ -30,7 +30,7 @@
|
||||
declare global {
|
||||
var require: any;
|
||||
}
|
||||
if (window.Phaser) {
|
||||
if (typeof window !== 'undefined' && window.Phaser) {
|
||||
let prevRequire = window.require;
|
||||
window.require = (x: string) => {
|
||||
if (prevRequire) return prevRequire(x);
|
||||
|
||||
@ -32,7 +32,7 @@ declare global {
|
||||
var PIXI: any;
|
||||
}
|
||||
|
||||
if (window.PIXI) {
|
||||
if (typeof window !== 'undefined' && window.PIXI) {
|
||||
let prevRequire = window.require;
|
||||
window.require = (x: string) => {
|
||||
if (prevRequire) return prevRequire(x);
|
||||
|
||||
@ -31,7 +31,7 @@ declare global {
|
||||
var require: any;
|
||||
}
|
||||
|
||||
if (window.THREE) {
|
||||
if (typeof window !== 'undefined' && window.THREE) {
|
||||
let prevRequire = window.require;
|
||||
window.require = (x: string) => {
|
||||
if (prevRequire) return prevRequire(x);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user