From cddc7b5866b722dfa651135bee2f3b52d368a50d Mon Sep 17 00:00:00 2001 From: owenpearson Date: Tue, 19 Dec 2023 16:08:20 +0000 Subject: [PATCH 1/3] build: use `Ably` as UMD lib name --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index fc544006dc..425e90e9e9 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -119,7 +119,7 @@ module.exports = function (grunt) { sourcemap: true, format: 'umd', banner: { js: '/*' + banner + '*/' }, - plugins: [umdWrapper.default()], + plugins: [umdWrapper.default({ libraryName: 'Ably' })], target: 'es6', }; } From b9d468cb93891cda4fc1383bc24bdbd1c5af793d Mon Sep 17 00:00:00 2001 From: Andrew Bulat Date: Thu, 1 Feb 2024 23:37:00 +0000 Subject: [PATCH 2/3] Changes "esbuild-plugin-umd-wrapper" dependency to use ably's fork --- package-lock.json | 15 +++++++-------- package.json | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 77aadfbf46..2f5f5c2f02 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "cli-table": "^0.3.11", "cors": "^2.8.5", "esbuild": "^0.18.10", - "esbuild-plugin-umd-wrapper": "^1.0.7", + "esbuild-plugin-umd-wrapper": "ably-forks/esbuild-plugin-umd-wrapper#1.0.7-optional-amd-named-module", "esbuild-runner": "^2.2.2", "eslint": "^7.13.0", "eslint-plugin-import": "^2.28.0", @@ -5370,9 +5370,9 @@ }, "node_modules/esbuild-plugin-umd-wrapper": { "version": "1.0.7", - "resolved": "https://registry.npmjs.org/esbuild-plugin-umd-wrapper/-/esbuild-plugin-umd-wrapper-1.0.7.tgz", - "integrity": "sha512-Jo1S3rczXupUzPGt4eXF643FF/J7nDkwwwHH2PS6ic1l0ye7kTS0plAJQoD9u349ybLyt4wyG9fFa/RCuI2dXw==", - "dev": true + "resolved": "git+ssh://git@github.com/ably-forks/esbuild-plugin-umd-wrapper.git#6eef42a607a9192960706d31e444a2c79a2daeb0", + "dev": true, + "license": "MIT" }, "node_modules/esbuild-runner": { "version": "2.2.2", @@ -16350,10 +16350,9 @@ "optional": true }, "esbuild-plugin-umd-wrapper": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/esbuild-plugin-umd-wrapper/-/esbuild-plugin-umd-wrapper-1.0.7.tgz", - "integrity": "sha512-Jo1S3rczXupUzPGt4eXF643FF/J7nDkwwwHH2PS6ic1l0ye7kTS0plAJQoD9u349ybLyt4wyG9fFa/RCuI2dXw==", - "dev": true + "version": "git+ssh://git@github.com/ably-forks/esbuild-plugin-umd-wrapper.git#6eef42a607a9192960706d31e444a2c79a2daeb0", + "dev": true, + "from": "esbuild-plugin-umd-wrapper@ably-forks/esbuild-plugin-umd-wrapper#1.0.7-optional-amd-named-module" }, "esbuild-runner": { "version": "2.2.2", diff --git a/package.json b/package.json index 097711b2e8..ae57d86b04 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "cli-table": "^0.3.11", "cors": "^2.8.5", "esbuild": "^0.18.10", - "esbuild-plugin-umd-wrapper": "^1.0.7", + "esbuild-plugin-umd-wrapper": "ably-forks/esbuild-plugin-umd-wrapper#1.0.7-optional-amd-named-module", "esbuild-runner": "^2.2.2", "eslint": "^7.13.0", "eslint-plugin-import": "^2.28.0", From 41686c0668169bc017ed97b72346c4a197860a0f Mon Sep 17 00:00:00 2001 From: Andrew Bulat Date: Thu, 1 Feb 2024 23:37:53 +0000 Subject: [PATCH 3/3] Changes UMD wrapper to use anonymous bundles for AMD resolution Resolves #1607 --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 425e90e9e9..9ee91b1382 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -119,7 +119,7 @@ module.exports = function (grunt) { sourcemap: true, format: 'umd', banner: { js: '/*' + banner + '*/' }, - plugins: [umdWrapper.default({ libraryName: 'Ably' })], + plugins: [umdWrapper.default({ libraryName: 'Ably', amdNamedModule: false })], target: 'es6', }; }