From 3863072cab3ad64b01ef886d9c48a12424fc0285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Baudisch?= Date: Thu, 19 Sep 2024 15:10:05 +0200 Subject: [PATCH] rename eslint-plugin-prebid to eslint-plugin-prebidjs (to separate this local module from the vulnerable npm clone) --- .eslintrc.js | 8 ++++---- creative/constants.js | 2 +- creative/renderers/display/constants.js | 2 +- creative/renderers/native/constants.js | 2 +- modules/adlooxAdServerVideo.js | 2 +- modules/adlooxRtdProvider.js | 2 +- modules/akamaiDapRtdProvider.js | 2 +- modules/automatadAnalyticsAdapter.js | 2 +- modules/big-richmediaBidAdapter.js | 2 +- modules/cwireBidAdapter.js | 4 ++-- modules/debugging/debugging.js | 6 +++--- modules/dgkeywordRtdProvider.js | 2 +- modules/euidIdSystem.js | 2 +- modules/liveIntentIdSystem.js | 2 +- modules/pubxaiRtdProvider.js | 2 +- modules/saambaaBidAdapter.js | 2 +- modules/sirdataRtdProvider.js | 2 +- modules/sonobiBidAdapter.js | 4 ++-- modules/uid2IdSystem.js | 2 +- package-lock.json | 20 ++++++++++---------- package.json | 2 +- plugins/eslint/package.json | 2 +- src/ajax.js | 2 +- src/debugging.js | 2 +- src/storageManager.js | 6 +++--- src/utils.js | 2 +- test/spec/modules/luceadBidAdapter_spec.js | 2 +- 27 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 5b69afa019f..42f58377c57 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -27,7 +27,7 @@ module.exports = { 'plugin:jsdoc/recommended' ], plugins: [ - 'prebid', + 'prebidjs', 'import', 'jsdoc' ], @@ -83,7 +83,7 @@ module.exports = { overrides: Object.keys(allowedModules).map((key) => ({ files: key + '/**/*.js', rules: { - 'prebid/validate-imports': ['error', allowedModules[key]], + 'prebidjs/validate-imports': ['error', allowedModules[key]], 'no-restricted-globals': [ 'error', { @@ -91,7 +91,7 @@ module.exports = { message: 'use import instead' } ], - 'prebid/no-global': [ + 'prebidjs/no-global': [ 'error', ...['localStorage', 'sessionStorage'].map(name => ({name, message: 'use storageManager instead'})), { @@ -99,7 +99,7 @@ module.exports = { message: 'use ajax.js instead' }, ], - 'prebid/no-member': [ + 'prebidjs/no-member': [ 'error', { name: 'cookie', diff --git a/creative/constants.js b/creative/constants.js index 5f807c69f87..ab9f68d0273 100644 --- a/creative/constants.js +++ b/creative/constants.js @@ -1,4 +1,4 @@ -// eslint-disable-next-line prebid/validate-imports +// eslint-disable-next-line prebidjs/validate-imports import {AD_RENDER_FAILED_REASON, EVENTS, MESSAGES} from '../src/constants.js'; export {PB_LOCATOR} from '../src/constants.js'; diff --git a/creative/renderers/display/constants.js b/creative/renderers/display/constants.js index 2493fb2d163..4739156a9cc 100644 --- a/creative/renderers/display/constants.js +++ b/creative/renderers/display/constants.js @@ -1,4 +1,4 @@ -// eslint-disable-next-line prebid/validate-imports +// eslint-disable-next-line prebidjs/validate-imports import { AD_RENDER_FAILED_REASON } from '../../../src/constants.js'; export const ERROR_NO_AD = AD_RENDER_FAILED_REASON.NO_AD; diff --git a/creative/renderers/native/constants.js b/creative/renderers/native/constants.js index b82e2d1d54e..586ed4065c0 100644 --- a/creative/renderers/native/constants.js +++ b/creative/renderers/native/constants.js @@ -1,4 +1,4 @@ -// eslint-disable-next-line prebid/validate-imports +// eslint-disable-next-line prebidjs/validate-imports import { MESSAGES } from '../../../src/constants.js'; export const MESSAGE_NATIVE = MESSAGES.NATIVE; diff --git a/modules/adlooxAdServerVideo.js b/modules/adlooxAdServerVideo.js index 199fecafd13..816bcde8689 100644 --- a/modules/adlooxAdServerVideo.js +++ b/modules/adlooxAdServerVideo.js @@ -4,7 +4,7 @@ * @requires module:modules/adlooxAnalyticsAdapter */ -/* eslint prebid/validate-imports: "off" */ +/* eslint prebidjs/validate-imports: "off" */ import { registerVideoSupport } from '../src/adServerManager.js'; import { command as analyticsCommand, COMMAND } from './adlooxAnalyticsAdapter.js'; diff --git a/modules/adlooxRtdProvider.js b/modules/adlooxRtdProvider.js index 1545588676d..f138d1290e5 100644 --- a/modules/adlooxRtdProvider.js +++ b/modules/adlooxRtdProvider.js @@ -10,7 +10,7 @@ */ /* eslint standard/no-callback-literal: "off" */ -/* eslint prebid/validate-imports: "off" */ +/* eslint prebidjs/validate-imports: "off" */ import {auctionManager} from '../src/auctionManager.js'; import {command as analyticsCommand, COMMAND} from './adlooxAnalyticsAdapter.js'; diff --git a/modules/akamaiDapRtdProvider.js b/modules/akamaiDapRtdProvider.js index e5a647a90ef..9bbc5b94856 100644 --- a/modules/akamaiDapRtdProvider.js +++ b/modules/akamaiDapRtdProvider.js @@ -8,7 +8,7 @@ import { createRtdProvider -} from './symitriDapRtdProvider.js'/* eslint prebid/validate-imports: "off" */ +} from './symitriDapRtdProvider.js'/* eslint prebidjs/validate-imports: "off" */ export const { addRealTimeData, diff --git a/modules/automatadAnalyticsAdapter.js b/modules/automatadAnalyticsAdapter.js index 7ed109ab705..0565adda2b6 100644 --- a/modules/automatadAnalyticsAdapter.js +++ b/modules/automatadAnalyticsAdapter.js @@ -19,7 +19,7 @@ var isLoggingEnabled; var queuePointer = 0; var retryCount = 0; var timer = null const prettyLog = (level, text, isGroup = false, cb = () => {}) => { if (self.isLoggingEnabled === undefined) { // TODO FIX THIS RULES VIOLATION - // eslint-disable-next-line prebid/no-global + // eslint-disable-next-line prebidjs/no-global if (window.localStorage.getItem('__aggLoggingEnabled')) { self.isLoggingEnabled = true } else { diff --git a/modules/big-richmediaBidAdapter.js b/modules/big-richmediaBidAdapter.js index 858dad2ffde..fd8aa7f9102 100644 --- a/modules/big-richmediaBidAdapter.js +++ b/modules/big-richmediaBidAdapter.js @@ -1,7 +1,7 @@ import {BANNER, VIDEO} from '../src/mediaTypes.js'; import {config} from '../src/config.js'; import {registerBidder} from '../src/adapters/bidderFactory.js'; -import {spec as baseAdapter} from './appnexusBidAdapter.js'; // eslint-disable-line prebid/validate-imports +import {spec as baseAdapter} from './appnexusBidAdapter.js'; // eslint-disable-line prebidjs/validate-imports /** * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest diff --git a/modules/cwireBidAdapter.js b/modules/cwireBidAdapter.js index 6fbe401bfde..4aebc130cd3 100644 --- a/modules/cwireBidAdapter.js +++ b/modules/cwireBidAdapter.js @@ -229,7 +229,7 @@ export const spec = { } } // TODO FIX THIS RULES VIOLATION - // eslint-disable-next-line prebid/no-member + // eslint-disable-next-line prebidjs/no-member navigator.sendBeacon(EVENT_ENDPOINT, JSON.stringify(event)) }, @@ -243,7 +243,7 @@ export const spec = { } } // TODO FIX THIS RULES VIOLATION - // eslint-disable-next-line prebid/no-member + // eslint-disable-next-line prebidjs/no-member navigator.sendBeacon(EVENT_ENDPOINT, JSON.stringify(event)) }, diff --git a/modules/debugging/debugging.js b/modules/debugging/debugging.js index 803d7ee5cd7..123da9ad202 100644 --- a/modules/debugging/debugging.js +++ b/modules/debugging/debugging.js @@ -31,7 +31,7 @@ export function disableDebugging({hook, logger}) { } } -// eslint-disable-next-line prebid/no-global +// eslint-disable-next-line prebidjs/no-global function saveDebuggingConfig(debugConfig, {sessionStorage = window.sessionStorage, DEBUG_KEY} = {}) { if (!debugConfig.enabled) { try { @@ -50,7 +50,7 @@ function saveDebuggingConfig(debugConfig, {sessionStorage = window.sessionStorag } } -// eslint-disable-next-line prebid/no-global +// eslint-disable-next-line prebidjs/no-global export function getConfig(debugging, {getStorage = () => window.sessionStorage, DEBUG_KEY, config, hook, logger} = {}) { if (debugging == null) return; let sessionStorage; @@ -72,7 +72,7 @@ export function getConfig(debugging, {getStorage = () => window.sessionStorage, export function sessionLoader({DEBUG_KEY, storage, config, hook, logger}) { let overrides; try { - // eslint-disable-next-line prebid/no-global + // eslint-disable-next-line prebidjs/no-global storage = storage || window.sessionStorage; overrides = JSON.parse(storage.getItem(DEBUG_KEY)); } catch (e) { diff --git a/modules/dgkeywordRtdProvider.js b/modules/dgkeywordRtdProvider.js index c97296f6982..3a3d741334a 100644 --- a/modules/dgkeywordRtdProvider.js +++ b/modules/dgkeywordRtdProvider.js @@ -102,7 +102,7 @@ export function getProfileApiUrl(customeUrl, enableReadFpid) { export function readFpidFromLocalStrage() { try { // TODO: use storageManager - // eslint-disable-next-line prebid/no-global + // eslint-disable-next-line prebidjs/no-global const fpid = window.localStorage.getItem('ope_fpid'); if (fpid) { return fpid; diff --git a/modules/euidIdSystem.js b/modules/euidIdSystem.js index 281fa04a12a..d9628c9a9e7 100644 --- a/modules/euidIdSystem.js +++ b/modules/euidIdSystem.js @@ -11,7 +11,7 @@ import {getStorageManager} from '../src/storageManager.js'; import {MODULE_TYPE_UID} from '../src/activities/modules.js'; // RE below lint exception: UID2 and EUID are separate modules, but the protocol is the same and shared code makes sense here. -// eslint-disable-next-line prebid/validate-imports +// eslint-disable-next-line prebidjs/validate-imports import { Uid2GetId, Uid2CodeVersion, extractIdentityFromParams } from './uid2IdSystem_shared.js'; /** diff --git a/modules/liveIntentIdSystem.js b/modules/liveIntentIdSystem.js index 50a8dc2aa1d..81d35b78b0b 100644 --- a/modules/liveIntentIdSystem.js +++ b/modules/liveIntentIdSystem.js @@ -7,7 +7,7 @@ import { triggerPixel, logError } from '../src/utils.js'; import { ajaxBuilder } from '../src/ajax.js'; import { submodule } from '../src/hook.js'; -import { LiveConnect } from 'live-connect-js/prebid'; // eslint-disable-line prebid/validate-imports +import { LiveConnect } from 'live-connect-js/prebid'; // eslint-disable-line prebidjs/validate-imports import { gdprDataHandler, uspDataHandler, gppDataHandler, coppaDataHandler } from '../src/adapterManager.js'; import { getStorageManager } from '../src/storageManager.js'; import { MODULE_TYPE_UID } from '../src/activities/modules.js'; diff --git a/modules/pubxaiRtdProvider.js b/modules/pubxaiRtdProvider.js index 4528b29cf11..1ce42a9ac88 100644 --- a/modules/pubxaiRtdProvider.js +++ b/modules/pubxaiRtdProvider.js @@ -8,7 +8,7 @@ import { getStorageManager } from '../src/storageManager.js'; * This RTD module has a dependency on the priceFloors module. * We utilize the createFloorsDataForAuction function from the priceFloors module to incorporate price floors data into the current auction. */ -import { createFloorsDataForAuction } from './priceFloors.js'; // eslint-disable-line prebid/validate-imports +import { createFloorsDataForAuction } from './priceFloors.js'; // eslint-disable-line prebidjs/validate-imports const MODULE_NAME = 'realTimeData'; const SUBMODULE_NAME = 'pubxai'; diff --git a/modules/saambaaBidAdapter.js b/modules/saambaaBidAdapter.js index 3e33496b7d9..6526cfb09a4 100644 --- a/modules/saambaaBidAdapter.js +++ b/modules/saambaaBidAdapter.js @@ -1,3 +1,3 @@ -import { spec } from './advangelistsBidAdapter.js'; // eslint-disable-line prebid/validate-imports +import { spec } from './advangelistsBidAdapter.js'; // eslint-disable-line prebidjs/validate-imports import { registerBidder } from '../src/adapters/bidderFactory.js'; registerBidder(spec); diff --git a/modules/sirdataRtdProvider.js b/modules/sirdataRtdProvider.js index 507d8d982f2..943b851d470 100644 --- a/modules/sirdataRtdProvider.js +++ b/modules/sirdataRtdProvider.js @@ -220,7 +220,7 @@ export function postContentForSemanticAnalysis(postContentToken, actualUrl) { // Use the Beacon API if supported to send the payload if ('sendBeacon' in navigator) { // TODO FIX RULES VIOLATION - // eslint-disable-next-line prebid/no-member + // eslint-disable-next-line prebidjs/no-member navigator.sendBeacon(url, payload); } else { // Fallback to using AJAX if Beacon API is not supported diff --git a/modules/sonobiBidAdapter.js b/modules/sonobiBidAdapter.js index 720ce8ee269..fcc6bb5fc66 100644 --- a/modules/sonobiBidAdapter.js +++ b/modules/sonobiBidAdapter.js @@ -425,7 +425,7 @@ function loadOrCreateFirstPartyData() { var readData = function (key) { if (hasLocalStorage()) { // TODO FIX RULES VIOLATION - // eslint-disable-next-line prebid/no-global + // eslint-disable-next-line prebidjs/no-global return window.localStorage.getItem(key); } return null; @@ -446,7 +446,7 @@ function loadOrCreateFirstPartyData() { try { if (hasLocalStorage()) { // TODO FIX RULES VIOLATION - // eslint-disable-next-line prebid/no-global + // eslint-disable-next-line prebidjs/no-global window.localStorage.setItem(key, value); } } catch (error) { diff --git a/modules/uid2IdSystem.js b/modules/uid2IdSystem.js index afdde5f0a7f..f9e4c28bd73 100644 --- a/modules/uid2IdSystem.js +++ b/modules/uid2IdSystem.js @@ -11,7 +11,7 @@ import {getStorageManager} from '../src/storageManager.js'; import {MODULE_TYPE_UID} from '../src/activities/modules.js'; // RE below lint exception: UID2 and EUID are separate modules, but the protocol is the same and shared code makes sense here. -// eslint-disable-next-line prebid/validate-imports +// eslint-disable-next-line prebidjs/validate-imports import { Uid2GetId, Uid2CodeVersion, extractIdentityFromParams } from './uid2IdSystem_shared.js'; import {UID2_EIDS} from '../libraries/uid2Eids/uid2Eids.js'; diff --git a/package-lock.json b/package-lock.json index b1dbe33501e..0d6811c68e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -48,7 +48,7 @@ "eslint-plugin-import": "^2.30.0", "eslint-plugin-jsdoc": "^48.5.0", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prebid": "file:./plugins/eslint", + "eslint-plugin-prebidjs": "file:./plugins/eslint", "eslint-plugin-promise": "^5.1.0", "eslint-plugin-standard": "^3.0.1", "execa": "^1.0.0", @@ -10734,7 +10734,7 @@ "node": ">= 4" } }, - "node_modules/eslint-plugin-prebid": { + "node_modules/eslint-plugin-prebidjs": { "resolved": "plugins/eslint", "link": true }, @@ -17427,9 +17427,9 @@ "dev": true }, "node_modules/karma": { - "version": "6.4.3", - "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.3.tgz", - "integrity": "sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==", + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.4.tgz", + "integrity": "sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==", "dev": true, "dependencies": { "@colors/colors": "1.5.0", @@ -28040,7 +28040,7 @@ } }, "plugins/eslint": { - "name": "eslint-plugin-prebid", + "name": "eslint-plugin-prebidjs", "version": "1.0.0", "dev": true, "license": "Apache-2.0" @@ -36059,7 +36059,7 @@ } } }, - "eslint-plugin-prebid": { + "eslint-plugin-prebidjs": { "version": "file:plugins/eslint" }, "eslint-plugin-promise": { @@ -41111,9 +41111,9 @@ "dev": true }, "karma": { - "version": "6.4.3", - "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.3.tgz", - "integrity": "sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==", + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.4.tgz", + "integrity": "sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==", "dev": true, "requires": { "@colors/colors": "1.5.0", diff --git a/package.json b/package.json index 54a68be1c45..6102b8864e1 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "eslint-plugin-import": "^2.30.0", "eslint-plugin-jsdoc": "^48.5.0", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prebid": "file:./plugins/eslint", + "eslint-plugin-prebidjs": "file:./plugins/eslint", "eslint-plugin-promise": "^5.1.0", "eslint-plugin-standard": "^3.0.1", "execa": "^1.0.0", diff --git a/plugins/eslint/package.json b/plugins/eslint/package.json index 446f63945fa..f16558cca8b 100644 --- a/plugins/eslint/package.json +++ b/plugins/eslint/package.json @@ -1,5 +1,5 @@ { - "name": "eslint-plugin-prebid", + "name": "eslint-plugin-prebidjs", "version": "1.0.0", "description": "validates module imports can be found without custom webpack resolvers, are in module whitelist, and not module entry points", "main": "index.js", diff --git a/src/ajax.js b/src/ajax.js index 7f9857ad18d..22b00dc18a3 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -104,7 +104,7 @@ function toXHR({status, statusText = '', headers, url}, responseText) { return xml; } return { - // eslint-disable-next-line prebid/no-global + // eslint-disable-next-line prebidjs/no-global readyState: XMLHttpRequest.DONE, status, statusText, diff --git a/src/debugging.js b/src/debugging.js index 045855ccb28..3d6f8823db7 100644 --- a/src/debugging.js +++ b/src/debugging.js @@ -73,7 +73,7 @@ export const reset = ctl.reset; export function loadSession() { let storage = null; try { - // eslint-disable-next-line prebid/no-global + // eslint-disable-next-line prebidjs/no-global storage = window.sessionStorage; } catch (e) {} diff --git a/src/storageManager.js b/src/storageManager.js index 0c0d29dbee4..7385c4ad560 100644 --- a/src/storageManager.js +++ b/src/storageManager.js @@ -18,7 +18,7 @@ export const STORAGE_TYPE_COOKIES = 'cookie'; export let storageCallbacks = []; -/* eslint-disable prebid/no-global */ +/* eslint-disable prebidjs/no-global */ /* * Storage manager constructor. Consumers should prefer one of `getStorageManager` or `getCoreStorageManager`. @@ -67,7 +67,7 @@ export function newStorageManager({moduleName, moduleType} = {}, {isAllowed = is const expiresPortion = (expires && expires !== '') ? ` ;expires=${expires}` : ''; const isNone = (sameSite != null && sameSite.toLowerCase() == 'none') const secure = (isNone) ? '; Secure' : ''; - // eslint-disable-next-line prebid/no-member + // eslint-disable-next-line prebidjs/no-member document.cookie = `${key}=${encodeURIComponent(value)}${expiresPortion}; path=/${domainPortion}${sameSite ? `; SameSite=${sameSite}` : ''}${secure}`; } } @@ -181,7 +181,7 @@ export function newStorageManager({moduleName, moduleType} = {}, {isAllowed = is if (result && result.valid) { const all = []; if (hasDeviceAccess()) { - // eslint-disable-next-line prebid/no-member + // eslint-disable-next-line prebidjs/no-member const cookies = document.cookie.split(';'); while (cookies.length) { const cookie = cookies.pop(); diff --git a/src/utils.js b/src/utils.js index 64880b4a462..4e69ebeb490 100644 --- a/src/utils.js +++ b/src/utils.js @@ -748,7 +748,7 @@ export function hasDeviceAccess() { * @returns {(boolean|undefined)} */ export function checkCookieSupport() { - // eslint-disable-next-line prebid/no-member + // eslint-disable-next-line prebidjs/no-member if (window.navigator.cookieEnabled || !!document.cookie.length) { return true; } diff --git a/test/spec/modules/luceadBidAdapter_spec.js b/test/spec/modules/luceadBidAdapter_spec.js index 6f61071b653..75dc86167cd 100755 --- a/test/spec/modules/luceadBidAdapter_spec.js +++ b/test/spec/modules/luceadBidAdapter_spec.js @@ -1,4 +1,4 @@ -/* eslint-disable prebid/validate-imports,no-undef */ +/* eslint-disable prebidjs/validate-imports,no-undef */ import { expect } from 'chai'; import { spec } from 'modules/luceadBidAdapter.js'; import sinon from 'sinon';