use 'fetch' by default on browser env. force XHR for Cocos Creator. b…

…ump 0.15.10
colyseus · Jul 6, 2023 · 5f39ab6 · 5f39ab6
1 parent 732eb07
commit 5f39ab6
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 25 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "colyseus.js",
-  "version": "0.15.9",
+  "version": "0.15.10",
   "description": "Colyseus Multiplayer SDK for JavaScript/TypeScript",
   "author": "Endel Dreyer",
   "license": "MIT",
@@ -12,7 +12,7 @@
     "build-zip-dist": "zip --junk-paths colyseus-js-client dist/colyseus.*",
     "build-all": "tsc && npm run build && npm run build-dist-dts && npm run copy-cocos-creator-files && npm run copy-construct3-files",
     "copy-construct3-files": "cp dist/colyseus.js ../colyseus-construct3/plugin/colyseus.js",
-    "copy-cocos-creator-files": "cp dist/colyseus.js cocos-creator-3-extension/colyseus-sdk/runtime && cp dist/colyseus.d.ts cocos-creator-3-extension/colyseus-sdk/runtime",
+    "copy-cocos-creator-files": "cp dist/colyseus-cocos-creator.js cocos-creator-3-extension/colyseus-sdk/runtime/colyseus.js && cp dist/colyseus.d.ts cocos-creator-3-extension/colyseus-sdk/runtime",
     "watch": "tsc -w",
     "tslint": "tslint --project .",
     "prepublishOnly": "tsc && npm run build"
@@ -36,8 +36,7 @@
       "require": "./build/cjs/index.js",
       "types": "./lib/index.d.ts"
     },
-    "./package.json": "./package.json",
-    "./decentraland": "./dist/colyseus-decentraland.js"
+    "./package.json": "./package.json"
   },
   "decentralandLibrary": {
     "main": "./dist/colyseus-decentraland.js",

diff --git a/rollup.config.js b/rollup.config.js
@@ -53,8 +53,8 @@ export default [
             typescript({ tsconfig: './tsconfig/tsconfig.cjs.json' }),
             alias({
                 entries: [
-                    // httpie: force XHR implementation on browser/UMD environment
-                    { find: 'httpie', replacement: './node_modules/httpie/xhr/index.js' },
+                    // httpie: force `fetch` for web environments
+                    { find: 'httpie', replacement: './node_modules/httpie/fetch/index.js' },
 
                     // ws: force browser.js version.
                     { find: 'ws', replacement: './node_modules/ws/browser.js' },
@@ -66,20 +66,19 @@ export default [
             commonjs(),
             nodeResolve({ browser: true }), // "browser" seems to have no effect here. (why??)
         ],
-
     },
 
-    // Decentraland SDK (same as browser/embedded, but use FETCH instead of XHR)
+    // Cocos Creator SDK (same as browser/embedded, but use XHR instead of fetch)
     {
         preserveModules: false,
         input: ['src/index.ts'],
         output: [
             {
-                banner: bannerStatic,
+                banner: `// THIS VERSION USES "XMLHttpRequest" INSTEAD OF "fetch" FOR COMPATIBILITY WITH COCOS CREATOR\n${bannerStatic}`,
                 dir: 'dist',
                 name: "Colyseus",
                 format: 'umd',
-                entryFileNames: 'colyseus-decentraland.js',
+                entryFileNames: 'colyseus-cocos-creator.js',
                 sourcemap: true,
                 amd: { id: pkg.name }
             },
@@ -89,7 +88,7 @@ export default [
             alias({
                 entries: [
                     // httpie: force XHR implementation on browser/UMD environment
-                    { find: 'httpie', replacement: './node_modules/httpie/fetch/index.js' },
+                    { find: 'httpie', replacement: './node_modules/httpie/xhr/index.js' },
 
                     // ws: force browser.js version.
                     { find: 'ws', replacement: './node_modules/ws/browser.js' },