Version 1.2.3

ZEFR-INC · Aug 23, 2018 · 1c4181a · 1c4181a
1 parent 0ed7d96
commit 1c4181a
Show file tree

Hide file tree

Showing 6 changed files with 2,340 additions and 1,573 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog for Open Measurement SDK JavaScript clients
 
+## 1.2.3 - 2018-07-17
+### Fixed
+- Fix JS Clients audit errors by upgrading Gulp and Karma
+- Set the adView from the creative measurement, if it's available
+
+## 1.2.2 - 2018-08-02
+### Changed
+- Update LICENSE
+
+## 1.2.1 - 2018-07-18
+- Update version to match JS Service, Android, and iOS SDKs; no changes from 1.2.0.
+
 ## 1.2.0 - 2018-07-03
 ### Fixed
 - Use direct communication instead of post message when verification script is in a friendly iframe.

diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright [2018] [IAB Technology Laboratory, Inc.]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/gulpfile.js b/gulpfile.js
@@ -29,7 +29,7 @@ const SESSION_CLIENT_SRC = [
 ];
 
 gulp.task('build-session-client', () => {
-  closureCompiler(Object.assign({}, commonConfig, {
+  const taskConfig = {
     js: SESSION_CLIENT_SRC,
     js_output_file: 'omid-session-client-v1.js',
     output_wrapper_file: UMD_BOOTSTRAPPER,
@@ -38,7 +38,8 @@ gulp.task('build-session-client', () => {
       './src/externs/omid-exports.js',
       './src/externs/omid-jasmine.js',
     ],
-  }))
+  };
+  return closureCompiler(Object.assign({}, commonConfig, taskConfig))
       .src() // needed to force the plugin to run without gulp.src
       .pipe(gulp.dest('./bin'))
 });
@@ -48,20 +49,20 @@ const SESSION_CLIENT_ZIP_SRC = [
   './LICENSE',
 ];
 
-gulp.task('package-session-client', () => {
-  gulp.src(SESSION_CLIENT_ZIP_SRC)
-      .pipe(gulp.dest(`${PACKAGE_DIR}/Session-Client`));
-  gulp.src(SESSION_CLIENT_SRC)
-      .pipe(gulp.dest(`${PACKAGE_DIR}/Session-Client/Source`));
-});
+gulp.task('package-session-client', gulp.series(
+    () => gulp.src(SESSION_CLIENT_ZIP_SRC)
+              .pipe(gulp.dest(`${PACKAGE_DIR}/Session-Client`)),
+    () => gulp.src(SESSION_CLIENT_SRC)
+              .pipe(gulp.dest(`${PACKAGE_DIR}/Session-Client/Source`)),
+));
 
 const VERIFICATION_CLIENT_SRC = [
   './src/common/**.js',
   './src/verification-client/**.js',
 ];
 
 gulp.task('build-verification-client', () => {
-  closureCompiler(Object.assign({}, commonConfig, {
+  const taskConfig = {
     js: VERIFICATION_CLIENT_SRC,
     js_output_file: 'omid-verification-client-v1.js',
     output_wrapper_file: UMD_BOOTSTRAPPER,
@@ -70,7 +71,8 @@ gulp.task('build-verification-client', () => {
       './src/externs/omid-jasmine.js',
       './src/externs/omid-exports.js',
     ],
-  }))
+  };
+  return closureCompiler(Object.assign({}, commonConfig, taskConfig))
       .src() // needed to force the plugin to run without gulp.src
       .pipe(gulp.dest('./bin'))
 });
@@ -80,19 +82,19 @@ const VERIFICATION_CLIENT_ZIP_SRC = [
   './LICENSE',
 ];
 
-gulp.task('package-verification-client', () => {
-  gulp.src(VERIFICATION_CLIENT_ZIP_SRC)
-      .pipe(gulp.dest(`${PACKAGE_DIR}/Verification-Client`));
-  gulp.src(VERIFICATION_CLIENT_SRC)
-      .pipe(gulp.dest(`${PACKAGE_DIR}/Verification-Client/Source`));
-});
+gulp.task('package-verification-client', gulp.series(
+  () => gulp.src(VERIFICATION_CLIENT_ZIP_SRC)
+            .pipe(gulp.dest(`${PACKAGE_DIR}/Verification-Client`)),
+  () => gulp.src(VERIFICATION_CLIENT_SRC)
+            .pipe(gulp.dest(`${PACKAGE_DIR}/Verification-Client/Source`)),
+));
 
 const VALIDATION_VERIFICATION_SCRIPT_SRC = [
   './src/validation-verification-script/**.js',
 ];
 
 gulp.task('build-validation-verification-script', () => {
-  closureCompiler(Object.assign({}, commonConfig, {
+  const taskConfig = {
     js: VERIFICATION_CLIENT_SRC.concat(VALIDATION_VERIFICATION_SCRIPT_SRC),
     js_output_file: 'omid-validation-verification-script-v1.js',
     output_wrapper_file: UMD_BOOTSTRAPPER,
@@ -101,62 +103,67 @@ gulp.task('build-validation-verification-script', () => {
       './src/externs/omid-jasmine.js',
       './src/externs/omid-exports.js',
     ],
-  }))
-  .src() // needed to force the plugin to run without gulp.src
-  .pipe(gulp.dest('./bin'));
+  };
+  return closureCompiler(Object.assign({}, commonConfig, taskConfig))
+      .src() // needed to force the plugin to run without gulp.src
+      .pipe(gulp.dest('./bin'));
 });
 
 const VALIDATION_VERIFICATION_SCRIPT_ZIP_SRC = [
   './bin/omid-validation-verification-script-v1.js',
   './LICENSE',
 ];
 
-gulp.task('package-validation-verification-script', () => {
-  gulp.src(VALIDATION_VERIFICATION_SCRIPT_ZIP_SRC)
-      .pipe(gulp.dest(`${PACKAGE_DIR}/Validation-Script`));
-  gulp.src(VALIDATION_VERIFICATION_SCRIPT_SRC)
-      .pipe(gulp.dest(`${PACKAGE_DIR}/Validation-Script/Source`));
+gulp.task('package-validation-verification-script', gulp.series(
+  () => gulp.src(VALIDATION_VERIFICATION_SCRIPT_ZIP_SRC)
+            .pipe(gulp.dest(`${PACKAGE_DIR}/Validation-Script`)),
+  () => gulp.src(VALIDATION_VERIFICATION_SCRIPT_SRC)
+            .pipe(gulp.dest(`${PACKAGE_DIR}/Validation-Script/Source`)),
+));
+
+gulp.task('build-unit-tests', () => {
+  const taskConfig = {
+    js: [
+      './test/unit/**.js',
+      // exclude externs in the binary test code
+      '!./src/externs/*.js',
+      './src/**.js',
+      '!./src/validation-verification-script/main.js',
+    ],
+    externs: [
+      ...commonConfig.externs,
+      './node_modules/google-closure-compiler/contrib/externs/jasmine-2.0.js',
+      './src/externs/omid-exports.js',
+    ],
+    js_output_file: 'Omid-Unit-Tests.js',
+    create_source_map: '%outname%.map',
+    dependency_mode: 'NONE',
+  };
+  return closureCompiler(Object.assign({}, commonConfig, taskConfig))
+      .src() // needed to force the plugin to run without gulp.src
+      .pipe(gulp.dest('./bin'))
 });
 
-gulp.task('build-unit-tests', () =>
-    closureCompiler(Object.assign({}, commonConfig, {
-      js: [
-        './test/unit/**.js',
-        // exclude externs in the binary test code
-        '!./src/externs/*.js',
-        './src/**.js',
-        '!./src/validation-verification-script/main.js',
-      ],
-      externs: [
-        ...commonConfig.externs,
-        './node_modules/google-closure-compiler/contrib/externs/jasmine-2.0.js',
-        './src/externs/omid-exports.js',
-      ],
-      js_output_file: 'Omid-Unit-Tests.js',
-      create_source_map: '%outname%.map',
-      dependency_mode: 'NONE',
-    }))
-        .src() // needed to force the plugin to run without gulp.src
-        .pipe(gulp.dest('./bin')));
-
-gulp.task('build-validation-verification-script-tests', () =>
-    closureCompiler(Object.assign({}, commonConfig, {
-        js: [
-            './test/unit/typing-utils.js',
-            './test/validation-verification-script/**.js',
-            // exclude externs in the binary test code
-            '!./src/externs/*.js',
-            './src/**.js',
-            '!./src/validation-verification-script/main.js',
-        ],
-        externs: [
-            ...commonConfig.externs,
-            './node_modules/google-closure-compiler/contrib/externs/jasmine-2.0.js',
-            './src/externs/omid-exports.js',
-        ],
-        js_output_file: 'Omid-Validation-Verification-Script-Tests.js',
-        create_source_map: '%outname%.map',
-        dependency_mode: 'NONE',
-    }))
-        .src() // needed to force the plugin to run without gulp.src
-        .pipe(gulp.dest('./bin')));
+gulp.task('build-validation-verification-script-tests', () => {
+  const taskConfig = {
+    js: [
+      './test/unit/typing-utils.js',
+      './test/validation-verification-script/**.js',
+      // exclude externs in the binary test code
+      '!./src/externs/*.js',
+      './src/**.js',
+      '!./src/validation-verification-script/main.js',
+    ],
+    externs: [
+      ...commonConfig.externs,
+      './node_modules/google-closure-compiler/contrib/externs/jasmine-2.0.js',
+      './src/externs/omid-exports.js',
+    ],
+    js_output_file: 'Omid-Validation-Verification-Script-Tests.js',
+    create_source_map: '%outname%.map',
+    dependency_mode: 'NONE',
+  };
+  return closureCompiler(Object.assign({}, commonConfig, taskConfig))
+      .src() // needed to force the plugin to run without gulp.src
+      .pipe(gulp.dest('./bin'))
+});