Merge branch 'release/1.3.0'

Author: pycnvr

.babelrc

@@ -0,0 +1,6 @@
+chrome >= 61
+safari >=8
+edge >= 14
+ff >= 57
+ie >= 10
+ios >= 9

.browserslistrc

@@ -1,4 +1,4 @@
-const webpackConfig = require('./webpack.config')();
+const webpackConfig = require('./webpack.config')(undefined, {mode: 'development'});
 webpackConfig.mode = 'development';
 
 module.exports = (config) => {
@@ -13,7 +13,7 @@ module.exports = (config) => {
             'test/**/*.spec.js': ['webpack', 'sourcemap']
         },
 
-        webpack: webpackConfig,
+        webpack: webpackConfig[0],
 
         reporters: ['mocha', 'bamboo'],
 

karma.conf.js

@@ -1,4 +1,4 @@
-const webpackConfig = require('./webpack.config')();
+const webpackConfig = require('./webpack.config')(undefined, {mode: 'development'});
 const browsers = require('./browsers.json');
 const pkg = require('./package.json');
 
@@ -15,7 +15,7 @@ module.exports = function(config) {
             'test/**/*.spec.js': ['webpack', 'sourcemap']
         },
 
-        webpack: webpackConfig,
+        webpack: webpackConfig[0],
 
         reporters: ['mocha', 'saucelabs', 'bamboo'],
 

karma.saucelabs.js

@@ -1,14 +1,15 @@
 {
   "name": "pubcid",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Publisher Common ID",
   "scripts": {
     "lint": "eslint src/**/*.js",
     "start": "webpack-dev-server --mode=development",
     "build": "webpack --mode=production",
     "test": "npm run lint && karma start --single-run",
     "test-bamboo": "npm run lint && npm run sauce",
-    "sauce": "karma start karma.saucelabs.js"
+    "sauce": "karma start karma.saucelabs.js",
+    "bundle-report": "webpack-bundle-analyzer --port 4200 dist/stats.json"
   },
   "repository": {
     "type": "git",
@@ -18,32 +19,32 @@
   "author": "Paul Yang <[email protected]>",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@babel/core": "^7.2.2",
-    "@babel/plugin-transform-object-assign": "^7.2.0",
-    "@babel/preset-env": "^7.3.1",
-    "babel-loader": "^8.0.5",
+    "@babel/core": "^7.9.0",
+    "@babel/plugin-transform-object-assign": "^7.8.3",
+    "@babel/preset-env": "^7.9.5",
+    "babel-loader": "^8.1.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "clean-webpack-plugin": "^3.0.0",
-    "core-js": "^3.5.0",
+    "core-js": "^3.6.5",
     "eslint": "^5.16.0",
     "html-webpack-exclude-assets-plugin": "0.0.7",
     "html-webpack-plugin": "^3.2.0",
-    "karma": "^4.0.0",
+    "karma": "^4.4.1",
     "karma-bamboo-reporter": "^0.1.2",
     "karma-chrome-launcher": "^2.2.0",
     "karma-mocha": "^1.3.0",
     "karma-mocha-reporter": "^2.2.5",
     "karma-sauce-launcher": "^2.0.2",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^4.0.2",
-    "mocha": "^6.2.2",
+    "mocha": "^6.2.3",
     "sinon": "^7.5.0",
-    "sinon-chai": "^3.3.0",
-    "terser-webpack-plugin": "^2.0.1",
-    "webpack": "^4.29.0",
+    "sinon-chai": "^3.5.0",
+    "webpack": "^4.42.1",
+    "webpack-bundle-analyzer": "^3.7.0",
     "webpack-cli": "^3.3.5",
-    "webpack-dev-server": "^3.1.14"
+    "webpack-dev-server": "^3.10.3"
   },
   "dependencies": {},
   "main": "dist/index.js",

package-lock.json

@@ -95,7 +95,6 @@ describe("Local Proxy test", ()=> {
 
         it("create Proxy", () => {
             const fCmp = function(cmd, args, callback) {
-                console.log('cmd: ' + cmd);
                 if (sampleData[cmd])
                     callback(sampleData[cmd], true);
                 else

package.json

@@ -397,15 +397,15 @@ describe('PubcidHandler', ()=> {
     });
 
     describe('pixels and extend', ()=>{
-        let pixelSpy, cookieSpy;
+        let pixelStub, cookieSpy;
         before(()=>{
-            pixelSpy = sinon.spy(utils, 'firePixel');
+            pixelStub = sinon.stub(utils, 'firePixel');
             cookieSpy = sinon.spy(cookieUtils, 'setCookie');
             clearAll();
         });
 
         beforeEach(() => {
-            pixelSpy.resetHistory();
+            pixelStub.resetHistory();
             cookieSpy.resetHistory();
         });
 
@@ -423,7 +423,7 @@ describe('PubcidHandler', ()=> {
             cookieSpy.resetHistory();
             handler.fetchPubcid();
             sinon.assert.callCount(cookieSpy, 1);
-            sinon.assert.callCount(pixelSpy, 0);
+            sinon.assert.callCount(pixelStub, 0);
         });
 
         it('extend is disabled', () => {
@@ -436,7 +436,7 @@ describe('PubcidHandler', ()=> {
             cookieSpy.resetHistory();
             handler.fetchPubcid();
             sinon.assert.callCount(cookieSpy, 0);
-            sinon.assert.callCount(pixelSpy, 0);
+            sinon.assert.callCount(pixelStub, 0);
         });
 
         it('fire pixel once', () => {
@@ -446,14 +446,14 @@ describe('PubcidHandler', ()=> {
             let pubcid = handler.fetchPubcid();
             expect(pubcid).to.match(uuidPattern);
             sinon.assert.callCount(cookieSpy, 1);
-            sinon.assert.callCount(pixelSpy, 1);
+            sinon.assert.callCount(pixelStub, 1);
 
-            expect(pixelSpy.getCall(0).args[0]).to.equal('/any/url/?id=' + encodeURIComponent('pubcid:' + pubcid));
+            expect(pixelStub.getCall(0).args[0]).to.equal('/any/url/?id=' + encodeURIComponent('pubcid:' + pubcid));
 
             // There should be no increment in counts after the 2nd call
             handler.fetchPubcid();
             sinon.assert.callCount(cookieSpy, 1);
-            sinon.assert.callCount(pixelSpy, 1);
+            sinon.assert.callCount(pixelStub, 1);
         });
 
         it('fire pixel every time', () => {
@@ -463,15 +463,15 @@ describe('PubcidHandler', ()=> {
             let pubcid = handler.fetchPubcid();
             expect(pubcid).to.match(uuidPattern);
             sinon.assert.callCount(cookieSpy, 1);
-            sinon.assert.callCount(pixelSpy, 1);
+            sinon.assert.callCount(pixelStub, 1);
 
-            expect(pixelSpy.getCall(0).args[0]).to.equal('/any/url/?id=' + encodeURIComponent('pubcid:' + pubcid));
+            expect(pixelStub.getCall(0).args[0]).to.equal('/any/url/?id=' + encodeURIComponent('pubcid:' + pubcid));
 
             // There should be an increment in firePixel count only
             let pubcid2 = handler.fetchPubcid();
             sinon.assert.callCount(cookieSpy, 1);
-            sinon.assert.callCount(pixelSpy, 2);
-            expect(pixelSpy.getCall(1).args[0]).to.equal('/any/url/?id=' + encodeURIComponent('pubcid:' + pubcid2));
+            sinon.assert.callCount(pixelStub, 2);
+            expect(pixelStub.getCall(1).args[0]).to.equal('/any/url/?id=' + encodeURIComponent('pubcid:' + pubcid2));
         });
     });
 });

test/lib/consenthandler/localProxy.spec.js

@@ -1,60 +1,104 @@
 'use strict';
 
-const webpack = require('webpack');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const HtmlWebpackExcludeAssetsPlugin = require('html-webpack-exclude-assets-plugin');
-const TerserPlugin = require('terser-webpack-plugin');
 const {CleanWebpackPlugin} = require('clean-webpack-plugin');
+const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 
 module.exports = (env = {}, args = {}) => {
-    console.log('Mode is ' + args.mode);
+    const mode = args.mode;
+    const mapType = (mode === 'production') ? 'hidden-source-map' : 'inline-source-map';
 
-    const isProd = args.mode === 'production';
+    console.log('Mode: ' + mode);
+    console.log('Map:  ' + mapType);
 
-    let config = {
+    // Return 2 configs in an array.  First one is a minimized script that is placed in CDN,
+    // and the second one as a library used by other projects.
+
+    const scriptConfig = {
+        mode: mode,
         entry: {
-            'pubcid.min': './src/pubcid.js',
-            'index':'./src/index.js'
+            'pubcid.min': './src/pubcid.js'
         },
         output: {
             filename: '[name].js',
-            path: __dirname + '/dist',
-            libraryTarget: 'umd'
+            path: __dirname + '/dist'
         }
         ,
         module: {
             rules: [
                 {
                     test: /\.js$/,
-                    exclude: /(node_modules|bower_components)/,
+                    exclude: /node_modules/,
                     use: {
-                        loader: 'babel-loader'
+                        loader: 'babel-loader',
+                        options: {
+                            // Turn on polyfill with core-js
+                            presets: [['@babel/preset-env', {
+                                // debug: true,
+                                useBuiltIns: "usage",
+                                corejs: 3,}]],
+
+                            // Transform to commonjs modules so sinon spies can work in unit tests
+                            plugins: ['@babel/plugin-transform-modules-commonjs'],
+                        },
                     }
                 }
             ]
         },
         plugins: [
-            new CleanWebpackPlugin()
+            new CleanWebpackPlugin(
+                // Only clean up files related to scripts before build
+                {cleanOnceBeforeBuildPatterns: ['pubcid.*', 'stats.json']}
+            )
         ]
         ,
         devServer: {
             host: 'mockpub'
         },
-        optimization: {
-            minimize: true,
-            minimizer: [
-                new TerserPlugin({
-                    include: /\.min\.js$/
-                }),
-            ]
+        devtool: mapType
+    };
+
+    const libConfig = {
+        mode: mode,
+        entry: {
+            'index':'./src/index.js'
+        },
+        output: {
+            filename: 'index.js',
+            path: __dirname + '/dist',
+            libraryTarget: 'umd'
         },
-        devtool: 'hidden-source-map'
+        module: {
+            rules: [
+                {
+                    test: /\.(js)$/,
+                    exclude: /node_modules/,
+                    use: {
+                        loader: 'babel-loader',
+                        options: {
+                            // No polyfill
+                            // Transform to commonjs module so that clients can call exported functions
+                            plugins: ['@babel/plugin-transform-modules-commonjs'],
+                        },
+                    }
+                },
+            ],
+        },
+        plugins: [
+            new CleanWebpackPlugin(
+                // Only clean up files related to library before build
+                {cleanOnceBeforeBuildPatterns: ['index.*']}
+            )
+        ],
+        devtool: mapType
     };
 
     // Generate the test page if in dev mode
 
-    if (!isProd) {
-        config.plugins.push(
+    if (mode !== 'production') {
+        scriptConfig.plugins = scriptConfig.plugins || [];
+        scriptConfig.plugins.push(
             new HtmlWebpackPlugin({
                 filename: 'pubcid.html',
                 template: 'src/pubcid.html',
@@ -63,6 +107,15 @@ module.exports = (env = {}, args = {}) => {
             new HtmlWebpackExcludeAssetsPlugin()
         );
     }
+    else {
+        scriptConfig.plugins.push(
+            new BundleAnalyzerPlugin({
+                analyzerMode: 'disabled',
+                generateStatsFile: true,
+                statsOptions: { source: false }
+            })
+        )
+    }
 
-    return config;
+    return [scriptConfig, libConfig];
 };