From 9a2a9d37d2d3a32da99de3b3ef6d8db5e60dd3e5 Mon Sep 17 00:00:00 2001 From: wiem Date: Fri, 21 Oct 2022 11:47:54 +0200 Subject: [PATCH 1/8] update with live-connect last change --- modules/liveIntentIdSystem.js | 6 +----- package-lock.json | 16 ++++++++-------- package.json | 2 +- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/modules/liveIntentIdSystem.js b/modules/liveIntentIdSystem.js index 724bf5ece6a..683dab2811d 100644 --- a/modules/liveIntentIdSystem.js +++ b/modules/liveIntentIdSystem.js @@ -10,7 +10,6 @@ import { submodule } from '../src/hook.js'; import { LiveConnect } from 'live-connect-js/esm/initializer.js'; import { gdprDataHandler, uspDataHandler } from '../src/adapterManager.js'; import { getStorageManager } from '../src/storageManager.js'; -import { MinimalLiveConnect } from 'live-connect-js/esm/minimal-live-connect.js'; const MODULE_NAME = 'liveIntentId'; export const storage = getStorageManager({gvlid: null, moduleName: MODULE_NAME}); @@ -113,7 +112,7 @@ function initializeLiveConnect(configParams) { // The second param is the storage object, LS & Cookie manipulation uses PBJS // The third param is the ajax and pixel object, the ajax and pixel use PBJS - liveConnect = liveIntentIdSubmodule.getInitializer()(liveConnectConfig, storage, calls); + liveConnect = LiveConnect(liveConnectConfig, storage, calls); if (configParams.emailHash) { liveConnect.push({ hash: configParams.emailHash }) } @@ -139,9 +138,6 @@ export const liveIntentIdSubmodule = { setModuleMode(mode) { this.moduleMode = mode }, - getInitializer() { - return this.moduleMode === 'minimal' ? MinimalLiveConnect : LiveConnect - }, /** * decode the stored id value for passing to bid requests. Note that lipb object is a wrapper for everything, and diff --git a/package-lock.json b/package-lock.json index ffc179f2914..e0a655fde2a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "prebid.js", - "version": "7.21.0-pre", + "version": "7.23.0-pre", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.16.7", @@ -22,7 +22,7 @@ "express": "^4.15.4", "fun-hooks": "^0.9.9", "just-clone": "^1.0.2", - "live-connect-js": "2.4.0" + "live-connect-js": "3.0.0-alpha.1" }, "devDependencies": { "@babel/eslint-parser": "^7.16.5", @@ -13957,9 +13957,9 @@ "dev": true }, "node_modules/live-connect-js": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-2.4.0.tgz", - "integrity": "sha512-MSBLKfnXoxH+pqwji/Mf8yZu3VZMq4tnNfwMw7NTWN5a+TBM6f0RWgwui1YMA3nHmMhX/nzxxsso0SkyKcF0fA==", + "version": "3.0.0-alpha.1", + "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-3.0.0-alpha.1.tgz", + "integrity": "sha512-Z3V4t/Chk3XUBPogXOLNEall/9rWrQsZL5OA2yl6gxaLQpEKxM+xNJht/G4NXs/NU2bYODfJ5XlVApLmIaC7tQ==", "dependencies": { "tiny-hashes": "1.0.1" }, @@ -32987,9 +32987,9 @@ "dev": true }, "live-connect-js": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-2.4.0.tgz", - "integrity": "sha512-MSBLKfnXoxH+pqwji/Mf8yZu3VZMq4tnNfwMw7NTWN5a+TBM6f0RWgwui1YMA3nHmMhX/nzxxsso0SkyKcF0fA==", + "version": "3.0.0-alpha.1", + "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-3.0.0-alpha.1.tgz", + "integrity": "sha512-Z3V4t/Chk3XUBPogXOLNEall/9rWrQsZL5OA2yl6gxaLQpEKxM+xNJht/G4NXs/NU2bYODfJ5XlVApLmIaC7tQ==", "requires": { "tiny-hashes": "1.0.1" } diff --git a/package.json b/package.json index a463546efa1..95a6baea7fa 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "express": "^4.15.4", "fun-hooks": "^0.9.9", "just-clone": "^1.0.2", - "live-connect-js": "2.4.0" + "live-connect-js": "3.0.0-alpha.1" }, "optionalDependencies": { "fsevents": "^2.3.2" From ba9be4fca1a7dda71174e859dd17b9654f6fd84d Mon Sep 17 00:00:00 2001 From: wiem Date: Wed, 26 Oct 2022 16:27:53 +0200 Subject: [PATCH 2/8] set globalVarName --- modules/liveIntentIdSystem.js | 1 + package-lock.json | 14 +++++++------- package.json | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/liveIntentIdSystem.js b/modules/liveIntentIdSystem.js index 683dab2811d..e7734c60a32 100644 --- a/modules/liveIntentIdSystem.js +++ b/modules/liveIntentIdSystem.js @@ -14,6 +14,7 @@ import { getStorageManager } from '../src/storageManager.js'; const MODULE_NAME = 'liveIntentId'; export const storage = getStorageManager({gvlid: null, moduleName: MODULE_NAME}); const defaultRequestedAttributes = {'nonId': true} +const globalVarName = 'liQ' const calls = { ajaxGet: (url, onSuccess, onError, timeout) => { ajaxBuilder(timeout)( diff --git a/package-lock.json b/package-lock.json index e0a655fde2a..1747236230d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "express": "^4.15.4", "fun-hooks": "^0.9.9", "just-clone": "^1.0.2", - "live-connect-js": "3.0.0-alpha.1" + "live-connect-js": "3.0.0-alpha.2" }, "devDependencies": { "@babel/eslint-parser": "^7.16.5", @@ -13957,9 +13957,9 @@ "dev": true }, "node_modules/live-connect-js": { - "version": "3.0.0-alpha.1", - "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-3.0.0-alpha.1.tgz", - "integrity": "sha512-Z3V4t/Chk3XUBPogXOLNEall/9rWrQsZL5OA2yl6gxaLQpEKxM+xNJht/G4NXs/NU2bYODfJ5XlVApLmIaC7tQ==", + "version": "3.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-3.0.0-alpha.2.tgz", + "integrity": "sha512-/+21Urp+iH5rgmaeFHu/Vev3/yOymR2uEKXCx/UPisPceRBbcNiA/GKzZLwRLlzEGegLh1LKdMlVaL42CikUIQ==", "dependencies": { "tiny-hashes": "1.0.1" }, @@ -32987,9 +32987,9 @@ "dev": true }, "live-connect-js": { - "version": "3.0.0-alpha.1", - "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-3.0.0-alpha.1.tgz", - "integrity": "sha512-Z3V4t/Chk3XUBPogXOLNEall/9rWrQsZL5OA2yl6gxaLQpEKxM+xNJht/G4NXs/NU2bYODfJ5XlVApLmIaC7tQ==", + "version": "3.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-3.0.0-alpha.2.tgz", + "integrity": "sha512-/+21Urp+iH5rgmaeFHu/Vev3/yOymR2uEKXCx/UPisPceRBbcNiA/GKzZLwRLlzEGegLh1LKdMlVaL42CikUIQ==", "requires": { "tiny-hashes": "1.0.1" } diff --git a/package.json b/package.json index 95a6baea7fa..91e8077438b 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "express": "^4.15.4", "fun-hooks": "^0.9.9", "just-clone": "^1.0.2", - "live-connect-js": "3.0.0-alpha.1" + "live-connect-js": "3.0.0-alpha.2" }, "optionalDependencies": { "fsevents": "^2.3.2" From 4355d061d5a907fb84c4b113b9ddb58b422d3eab Mon Sep 17 00:00:00 2001 From: wiem Date: Wed, 26 Oct 2022 17:09:03 +0200 Subject: [PATCH 3/8] not use globalVarName --- modules/liveIntentIdSystem.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/liveIntentIdSystem.js b/modules/liveIntentIdSystem.js index e7734c60a32..683dab2811d 100644 --- a/modules/liveIntentIdSystem.js +++ b/modules/liveIntentIdSystem.js @@ -14,7 +14,6 @@ import { getStorageManager } from '../src/storageManager.js'; const MODULE_NAME = 'liveIntentId'; export const storage = getStorageManager({gvlid: null, moduleName: MODULE_NAME}); const defaultRequestedAttributes = {'nonId': true} -const globalVarName = 'liQ' const calls = { ajaxGet: (url, onSuccess, onError, timeout) => { ajaxBuilder(timeout)( From 6472e86a99d2dea6e85d894c0d071ad07f598ae6 Mon Sep 17 00:00:00 2001 From: wiem Date: Wed, 2 Nov 2022 13:37:50 +0100 Subject: [PATCH 4/8] use live-connect proper version --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9aba01eaa1f..3cc3be9ecf8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "prebid.js", - "version": "7.23.0-pre", + "version": "7.24.0-pre", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.16.7", @@ -22,7 +22,7 @@ "express": "^4.15.4", "fun-hooks": "^0.9.9", "just-clone": "^1.0.2", - "live-connect-js": "3.0.0-alpha.2" + "live-connect-js": "3.0.0" }, "devDependencies": { "@babel/eslint-parser": "^7.16.5", @@ -14003,9 +14003,9 @@ "dev": true }, "node_modules/live-connect-js": { - "version": "3.0.0-alpha.2", - "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-3.0.0-alpha.2.tgz", - "integrity": "sha512-/+21Urp+iH5rgmaeFHu/Vev3/yOymR2uEKXCx/UPisPceRBbcNiA/GKzZLwRLlzEGegLh1LKdMlVaL42CikUIQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-3.0.0.tgz", + "integrity": "sha512-OGDzzQieuM6eZV7lXthFd9hWCmAScFCmS3+YFqGcdy9hB7kMMDqwcFSz/LaRtLlRo21iowRvYJH1xRhigLUFhw==", "dependencies": { "tiny-hashes": "1.0.1" }, @@ -33336,9 +33336,9 @@ "dev": true }, "live-connect-js": { - "version": "3.0.0-alpha.2", - "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-3.0.0-alpha.2.tgz", - "integrity": "sha512-/+21Urp+iH5rgmaeFHu/Vev3/yOymR2uEKXCx/UPisPceRBbcNiA/GKzZLwRLlzEGegLh1LKdMlVaL42CikUIQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-3.0.0.tgz", + "integrity": "sha512-OGDzzQieuM6eZV7lXthFd9hWCmAScFCmS3+YFqGcdy9hB7kMMDqwcFSz/LaRtLlRo21iowRvYJH1xRhigLUFhw==", "requires": { "tiny-hashes": "1.0.1" } diff --git a/package.json b/package.json index 0adc7927c50..985b841ae93 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "express": "^4.15.4", "fun-hooks": "^0.9.9", "just-clone": "^1.0.2", - "live-connect-js": "3.0.0-alpha.2" + "live-connect-js": "3.0.0" }, "optionalDependencies": { "fsevents": "^2.3.2" From 24d0d5916112c002427838662514f28cf6df8a5d Mon Sep 17 00:00:00 2001 From: wiem Date: Fri, 11 Nov 2022 12:25:49 +0100 Subject: [PATCH 5/8] comment --- modules/liveIntentIdSystem.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/liveIntentIdSystem.js b/modules/liveIntentIdSystem.js index 683dab2811d..724bf5ece6a 100644 --- a/modules/liveIntentIdSystem.js +++ b/modules/liveIntentIdSystem.js @@ -10,6 +10,7 @@ import { submodule } from '../src/hook.js'; import { LiveConnect } from 'live-connect-js/esm/initializer.js'; import { gdprDataHandler, uspDataHandler } from '../src/adapterManager.js'; import { getStorageManager } from '../src/storageManager.js'; +import { MinimalLiveConnect } from 'live-connect-js/esm/minimal-live-connect.js'; const MODULE_NAME = 'liveIntentId'; export const storage = getStorageManager({gvlid: null, moduleName: MODULE_NAME}); @@ -112,7 +113,7 @@ function initializeLiveConnect(configParams) { // The second param is the storage object, LS & Cookie manipulation uses PBJS // The third param is the ajax and pixel object, the ajax and pixel use PBJS - liveConnect = LiveConnect(liveConnectConfig, storage, calls); + liveConnect = liveIntentIdSubmodule.getInitializer()(liveConnectConfig, storage, calls); if (configParams.emailHash) { liveConnect.push({ hash: configParams.emailHash }) } @@ -138,6 +139,9 @@ export const liveIntentIdSubmodule = { setModuleMode(mode) { this.moduleMode = mode }, + getInitializer() { + return this.moduleMode === 'minimal' ? MinimalLiveConnect : LiveConnect + }, /** * decode the stored id value for passing to bid requests. Note that lipb object is a wrapper for everything, and From e902634c39f3e5eba497e75050c721bb70b5e14e Mon Sep 17 00:00:00 2001 From: wiem Date: Mon, 14 Nov 2022 09:58:17 +0100 Subject: [PATCH 6/8] use yalc version and adjust the initializer --- modules/liveIntentIdSystem.js | 5 ++--- package-lock.json | 30 ++++++++++++++++-------------- package.json | 2 +- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/modules/liveIntentIdSystem.js b/modules/liveIntentIdSystem.js index 724bf5ece6a..ec2bf30e696 100644 --- a/modules/liveIntentIdSystem.js +++ b/modules/liveIntentIdSystem.js @@ -10,7 +10,6 @@ import { submodule } from '../src/hook.js'; import { LiveConnect } from 'live-connect-js/esm/initializer.js'; import { gdprDataHandler, uspDataHandler } from '../src/adapterManager.js'; import { getStorageManager } from '../src/storageManager.js'; -import { MinimalLiveConnect } from 'live-connect-js/esm/minimal-live-connect.js'; const MODULE_NAME = 'liveIntentId'; export const storage = getStorageManager({gvlid: null, moduleName: MODULE_NAME}); @@ -113,7 +112,7 @@ function initializeLiveConnect(configParams) { // The second param is the storage object, LS & Cookie manipulation uses PBJS // The third param is the ajax and pixel object, the ajax and pixel use PBJS - liveConnect = liveIntentIdSubmodule.getInitializer()(liveConnectConfig, storage, calls); + liveConnect = liveIntentIdSubmodule.getInitializer()(liveConnectConfig, storage, calls, liveIntentIdSubmodule.moduleMode); if (configParams.emailHash) { liveConnect.push({ hash: configParams.emailHash }) } @@ -140,7 +139,7 @@ export const liveIntentIdSubmodule = { this.moduleMode = mode }, getInitializer() { - return this.moduleMode === 'minimal' ? MinimalLiveConnect : LiveConnect + return LiveConnect }, /** diff --git a/package-lock.json b/package-lock.json index f3a92ffc354..38f499b4103 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "prebid.js", - "version": "7.24.0-pre", + "version": "7.26.0-pre", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.16.7", @@ -22,7 +22,7 @@ "express": "^4.15.4", "fun-hooks": "^0.9.9", "just-clone": "^1.0.2", - "live-connect-js": "3.0.0" + "live-connect-js": "file:.yalc/live-connect-js" }, "devDependencies": { "@babel/eslint-parser": "^7.16.5", @@ -114,6 +114,16 @@ "fsevents": "^2.3.2" } }, + ".yalc/live-connect-js": { + "version": "3.0.0", + "license": "Apache-2.0", + "dependencies": { + "tiny-hashes": "1.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/@ampproject/remapping": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", @@ -16229,15 +16239,8 @@ "dev": true }, "node_modules/live-connect-js": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-3.0.0.tgz", - "integrity": "sha512-OGDzzQieuM6eZV7lXthFd9hWCmAScFCmS3+YFqGcdy9hB7kMMDqwcFSz/LaRtLlRo21iowRvYJH1xRhigLUFhw==", - "dependencies": { - "tiny-hashes": "1.0.1" - }, - "engines": { - "node": ">=8" - } + "resolved": ".yalc/live-connect-js", + "link": true }, "node_modules/livereload-js": { "version": "2.4.0", @@ -25260,6 +25263,7 @@ } }, "plugins/eslint": { + "name": "eslint-plugin-prebid", "version": "1.0.0", "dev": true, "license": "Apache-2.0" @@ -37867,9 +37871,7 @@ "dev": true }, "live-connect-js": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-3.0.0.tgz", - "integrity": "sha512-OGDzzQieuM6eZV7lXthFd9hWCmAScFCmS3+YFqGcdy9hB7kMMDqwcFSz/LaRtLlRo21iowRvYJH1xRhigLUFhw==", + "version": "file:.yalc/live-connect-js", "requires": { "tiny-hashes": "1.0.1" } diff --git a/package.json b/package.json index d23acbadb8d..cb143dc3cfa 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "express": "^4.15.4", "fun-hooks": "^0.9.9", "just-clone": "^1.0.2", - "live-connect-js": "3.0.0" + "live-connect-js": "file:.yalc/live-connect-js" }, "optionalDependencies": { "fsevents": "^2.3.2" From e28ed0656dc231ac2696230838fe7ed58b0f1890 Mon Sep 17 00:00:00 2001 From: wiem Date: Mon, 14 Nov 2022 17:45:09 +0100 Subject: [PATCH 7/8] adjust getInitializer --- modules/liveIntentIdSystem.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/liveIntentIdSystem.js b/modules/liveIntentIdSystem.js index ec2bf30e696..de70b0eaccd 100644 --- a/modules/liveIntentIdSystem.js +++ b/modules/liveIntentIdSystem.js @@ -112,7 +112,7 @@ function initializeLiveConnect(configParams) { // The second param is the storage object, LS & Cookie manipulation uses PBJS // The third param is the ajax and pixel object, the ajax and pixel use PBJS - liveConnect = liveIntentIdSubmodule.getInitializer()(liveConnectConfig, storage, calls, liveIntentIdSubmodule.moduleMode); + liveConnect = liveIntentIdSubmodule.getInitializer()(liveConnectConfig, storage, calls); if (configParams.emailHash) { liveConnect.push({ hash: configParams.emailHash }) } @@ -139,7 +139,7 @@ export const liveIntentIdSubmodule = { this.moduleMode = mode }, getInitializer() { - return LiveConnect + return (liveConnectConfig, storage, calls) => LiveConnect(liveConnectConfig, storage, calls, this.moduleMode) }, /** From f65b9abc798169ece29a9d00e571fb1bdea21fb6 Mon Sep 17 00:00:00 2001 From: wiem Date: Thu, 17 Nov 2022 15:13:22 +0100 Subject: [PATCH 8/8] use a proper lc version --- package-lock.json | 27 +++++++++++++-------------- package.json | 2 +- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 38f499b4103..7dcdbaeea16 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "express": "^4.15.4", "fun-hooks": "^0.9.9", "just-clone": "^1.0.2", - "live-connect-js": "file:.yalc/live-connect-js" + "live-connect-js": "3.0.1" }, "devDependencies": { "@babel/eslint-parser": "^7.16.5", @@ -114,16 +114,6 @@ "fsevents": "^2.3.2" } }, - ".yalc/live-connect-js": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "tiny-hashes": "1.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/@ampproject/remapping": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", @@ -16239,8 +16229,15 @@ "dev": true }, "node_modules/live-connect-js": { - "resolved": ".yalc/live-connect-js", - "link": true + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-3.0.1.tgz", + "integrity": "sha512-rwB0IQfuKPJM+I96nLyq8Utr3LkQ7Z/iuq/xKlWDckQRJLYyWkk7F7yaavf/VsjazzLK2dpJeXGijoDkK4Vz8g==", + "dependencies": { + "tiny-hashes": "1.0.1" + }, + "engines": { + "node": ">=8" + } }, "node_modules/livereload-js": { "version": "2.4.0", @@ -37871,7 +37868,9 @@ "dev": true }, "live-connect-js": { - "version": "file:.yalc/live-connect-js", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-3.0.1.tgz", + "integrity": "sha512-rwB0IQfuKPJM+I96nLyq8Utr3LkQ7Z/iuq/xKlWDckQRJLYyWkk7F7yaavf/VsjazzLK2dpJeXGijoDkK4Vz8g==", "requires": { "tiny-hashes": "1.0.1" } diff --git a/package.json b/package.json index cb143dc3cfa..52d6d73e6cb 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "express": "^4.15.4", "fun-hooks": "^0.9.9", "just-clone": "^1.0.2", - "live-connect-js": "file:.yalc/live-connect-js" + "live-connect-js": "3.0.1" }, "optionalDependencies": { "fsevents": "^2.3.2"