Submodule system using hooks (prebid#3924)

* prebid-core only contains src and a few node_modules * add back removed neverBundle to webpack build * add module and submodule hooks * allow vargs for submodules for flexibility * fix jsdoc type syntax * updated id5 userid submodule for submodule bundle size duplication fix * add id5 userid submodule to .submodules * fix opt out logic * spelling fix to comment * update to automatically include 'pubcommon' and 'unifiedid' (uncomment to optional submodule for prebid3.0) * additional update to automatically include 'pubcommon' and 'unifiedid' * additional update to automatically include 'pubcommon' and 'unifiedid' * merged differences from master * adpod changes to support submodules * fix --modules argument with .json to work correctly with submodules * fix to remove included and duplicated submodules
VideoReach · Aug 2, 2019 · ea6e2a8 · ea6e2a8
1 parent 6884b1f
commit ea6e2a8
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 108 deletions.
diff --git a/gulpHelpers.js b/gulpHelpers.js
@@ -13,6 +13,7 @@ const BUILD_PATH = './build/dist';
 const DEV_PATH = './build/dev';
 const ANALYTICS_PATH = '../analytics';
 
+
 // get only subdirectories that contain package.json with 'main' property
 function isModuleDirectory(filePath) {
   try {

diff --git a/modules/pubCommonIdSystem.js b/modules/pubCommonIdSystem.js
diff --git a/modules/unifiedIdSystem.js b/modules/unifiedIdSystem.js
diff --git a/modules/userId/index.js b/modules/userId/index.js
@@ -160,22 +160,13 @@ function getStoredValue(storage) {
   return storedValue;
 }
 
-/**
- * test if consent module is present, and if GDPR applies
- * @param {ConsentData} consentData
- * @returns {boolean}
- */
-export function isGDPRApplicable(consentData) {
-  return consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies;
-}
-
 /**
  * test if consent module is present, applies, and is valid for local storage or cookies (purpose 1)
  * @param {ConsentData} consentData
  * @returns {boolean}
  */
-export function hasGDPRConsent(consentData) {
-  if (isGDPRApplicable(consentData)) {
+function hasGDPRConsent(consentData) {
+  if (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) {
     if (!consentData.consentString) {
       return false;
     }