From 27936285eaac6213d78c1abe06708b41429278f6 Mon Sep 17 00:00:00 2001 From: Luigi Pinca Date: Sat, 13 Nov 2021 06:33:06 +0100 Subject: [PATCH 1/5] chore: make postcompile.sh script work on macOS (#681) On macOS the script was interpreted as the value of the `-i` option. It will now use an empty extension for the `-i` option and the `-e` option to specify the script. --- postcompile.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/postcompile.sh b/postcompile.sh index b9e0eebcd..224e293b6 100755 --- a/postcompile.sh +++ b/postcompile.sh @@ -1,8 +1,12 @@ -#!/bin/bash +#!/usr/bin/env bash cp ./support/package.cjs.json ./build/cjs/package.json cp ./support/package.esm.json ./build/esm/package.json cp -r ./build/esm/ ./build/esm-debug/ -sed -i '/debug(/d' ./build/esm/*.js ./build/esm/**/*.js +if [ "${OSTYPE:0:6}" = darwin ]; then + sed -i '' -e '/debug(/d' ./build/esm/*.js ./build/esm/**/*.js +else + sed -i -e '/debug(/d' ./build/esm/*.js ./build/esm/**/*.js +fi From 8de51c3e37e01ca963fb53dc37a1dd1b2552e8c1 Mon Sep 17 00:00:00 2001 From: Sten Feldman Date: Sun, 14 Nov 2021 08:56:31 +0200 Subject: [PATCH 2/5] chore: add bundle files as exportable asset (#682) This restores the possibility to import the bundle directly, without getting the following error: > [ERR_PACKAGE_PATH_NOT_EXPORTED]: Package subpath './dist/engine.io.min.js' is not defined by "exports" --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index d49ede2f6..7c6c9d165 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,9 @@ "module": "./build/esm/index.js", "exports": { "./package.json": "./package.json", + "./dist/engine.io.esm.min.js": "./dist/engine.io.esm.min.js", + "./dist/engine.io.js": "./dist/engine.io.js", + "./dist/engine.io.min.js": "./dist/engine.io.min.js", ".": { "import": { "node": "./build/esm-debug/index.js", From c557707fb694bd10397b4cd8b4ec2fbe59128faa Mon Sep 17 00:00:00 2001 From: Damien Arrachequesne Date: Sun, 14 Nov 2021 07:51:52 +0100 Subject: [PATCH 3/5] fix: fix vite build for CommonJS users Related: https://github.com/socketio/socket.io-client/issues/1504 --- package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 7c6c9d165..f119f2956 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,10 @@ "./test/node.js": false, "./build/esm/transports/xmlhttprequest.js": "./build/esm/transports/xmlhttprequest.browser.js", "./build/esm/transports/websocket-constructor.js": "./build/esm/transports/websocket-constructor.browser.js", - "./build/esm/globalThis.js": "./build/esm/globalThis.browser.js" + "./build/esm/globalThis.js": "./build/esm/globalThis.browser.js", + "./build/cjs/transports/xmlhttprequest.js": "./build/cjs/transports/xmlhttprequest.browser.js", + "./build/cjs/transports/websocket-constructor.js": "./build/cjs/transports/websocket-constructor.browser.js", + "./build/cjs/globalThis.js": "./build/cjs/globalThis.browser.js" }, "repository": { "type": "git", From 6e798fbb5b11a1cfec03ece3dfce03213b5f9a12 Mon Sep 17 00:00:00 2001 From: Damien Arrachequesne Date: Sun, 14 Nov 2021 07:53:14 +0100 Subject: [PATCH 4/5] fix: add package name in nested package.json Related: https://github.com/socketio/socket.io-client/issues/1513 --- support/package.cjs.json | 1 + support/package.esm.json | 1 + 2 files changed, 2 insertions(+) diff --git a/support/package.cjs.json b/support/package.cjs.json index 65b52aa11..9cf26e4dd 100644 --- a/support/package.cjs.json +++ b/support/package.cjs.json @@ -1,4 +1,5 @@ { + "name": "engine.io-client", "type": "commonjs", "browser": { "ws": false, diff --git a/support/package.esm.json b/support/package.esm.json index 5c5493883..89498b3d4 100644 --- a/support/package.esm.json +++ b/support/package.esm.json @@ -1,4 +1,5 @@ { + "name": "engine.io-client", "type": "module", "browser": { "ws": false, From 3c40aa91b05a13d7ebfc76ceedb8c13fd4e20f05 Mon Sep 17 00:00:00 2001 From: Damien Arrachequesne Date: Sun, 14 Nov 2021 08:03:50 +0100 Subject: [PATCH 5/5] chore(release): 6.1.1 Diff: https://github.com/socketio/engine.io-client/compare/6.1.0...6.1.1 --- CHANGELOG.md | 10 ++++++++++ dist/engine.io.esm.min.js | 2 +- dist/engine.io.js | 2 +- dist/engine.io.min.js | 2 +- package-lock.json | 2 +- package.json | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f73b54fc5..2e4c5cc7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## [6.1.1](https://github.com/socketio/engine.io-client/compare/6.1.0...6.1.1) (2021-11-14) + + +### Bug Fixes + +* add package name in nested package.json ([6e798fb](https://github.com/socketio/engine.io-client/commit/6e798fbb5b11a1cfec03ece3dfce03213b5f9a12)) +* fix vite build for CommonJS users ([c557707](https://github.com/socketio/engine.io-client/commit/c557707fb694bd10397b4cd8b4ec2fbe59128faa)) + + + # [6.1.0](https://github.com/socketio/engine.io-client/compare/6.0.2...6.1.0) (2021-11-08) The minor bump is due to changes on the server side. diff --git a/dist/engine.io.esm.min.js b/dist/engine.io.esm.min.js index 0a8b6ed64..a463b2ea7 100644 --- a/dist/engine.io.esm.min.js +++ b/dist/engine.io.esm.min.js @@ -1,5 +1,5 @@ /*! - * Engine.IO v6.1.0 + * Engine.IO v6.1.1 * (c) 2014-2021 Guillermo Rauch * Released under the MIT License. */ diff --git a/dist/engine.io.js b/dist/engine.io.js index 438a7e0f8..203ab2921 100644 --- a/dist/engine.io.js +++ b/dist/engine.io.js @@ -1,5 +1,5 @@ /*! - * Engine.IO v6.1.0 + * Engine.IO v6.1.1 * (c) 2014-2021 Guillermo Rauch * Released under the MIT License. */ diff --git a/dist/engine.io.min.js b/dist/engine.io.min.js index b47550f48..87abce1b5 100644 --- a/dist/engine.io.min.js +++ b/dist/engine.io.min.js @@ -1,5 +1,5 @@ /*! - * Engine.IO v6.1.0 + * Engine.IO v6.1.1 * (c) 2014-2021 Guillermo Rauch * Released under the MIT License. */ diff --git a/package-lock.json b/package-lock.json index 5b7176fee..1fabf3de0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "engine.io-client", - "version": "6.1.0", + "version": "6.1.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f119f2956..c394a9470 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "engine.io-client", "description": "Client for the realtime Engine", "license": "MIT", - "version": "6.1.0", + "version": "6.1.1", "main": "./build/cjs/index.js", "module": "./build/esm/index.js", "exports": {