Production Release 5.0.0 #97 from washingtonpost/v5.0.0_rc1

.eslintrc.js

@@ -8,6 +8,7 @@ module.exports = {
   extends: 'airbnb-base',
   parserOptions: {
     sourceType: 'module',
+    ecmaVersion: '2018',
     ecmaFeatures: {
       jsx: true
     }
@@ -41,4 +42,4 @@ module.exports = {
     "no-use-before-define": 0,
     "radix": 0
   }
-};
+};

jestPreprocess.js

@@ -1,6 +1,6 @@
 const babelOptions = {
-  presets: ['env', 'stage-2'],
-  plugins: ['transform-decorators-legacy', 'babel-plugin-root-import'],
+  presets: ['@babel/preset-env'],
+  plugins: ['babel-plugin-root-import'],
 };
 
-module.exports = require('babel-jest').createTransformer(babelOptions)
+module.exports = require('babel-jest').default.createTransformer(babelOptions);

package.json

@@ -1,12 +1,12 @@
 {
   "name": "arcads",
-  "version": "4.0.1",
+  "version": "5.0.0",
   "description": "ArcAds is a GPT wrapper created by Arc Publishing with publishers in mind.",
   "main": "dist/arcads.js",
   "scripts": {
     "test": "jest --config jest.config.js --no-cache --coverage",
-    "build": "rm -rf dist && webpack --env.production",
-    "dev": "rm -rf dist && webpack --env.development --watch",
+    "build": "rm -rf dist && webpack --env production --mode development",
+    "dev": "rm -rf dist && webpack --env development --mode development --watch",
     "docs": "rm -rf docs && ./node_modules/.bin/esdoc && open docs/index.html",
     "debug": "node debugging.js",
     "mock": "webpack-dev-server --progress --hot --inline && npm run test"
@@ -31,30 +31,27 @@
     "url": "https://github.com/washingtonpost/arcads/issues"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0-beta.37",
-    "babel-core": "^6.26.0",
-    "babel-loader": "^7.1.2",
+    "@babel/core": "^7.15.0",
+    "@babel/preset-env": "^7.15.0",
+    "babel-loader": "^8.2.2",
     "babel-plugin-root-import": "^5.1.0",
-    "babel-plugin-transform-decorators-legacy": "^1.3.4",
-    "babel-preset-env": "^1.6.1",
-    "babel-preset-stage-2": "^6.24.1",
-    "eslint": "^4.15.0",
+    "esdoc": "^1.1.0",
+    "esdoc-standard-plugin": "^1.0.0",
+    "eslint": "^7.32.0",
     "eslint-config-airbnb": "^16.1.0",
-    "eslint-config-standard": "^11.0.0-beta.0",
+    "eslint-config-standard": "^16.0.3",
     "eslint-import-resolver-webpack": "^0.8.4",
-    "eslint-loader": "^1.9.0",
     "eslint-plugin-import": "^2.8.0",
-    "jest": "^22.0.4",
-    "uglifyjs-webpack-plugin": "^1.1.6",
-    "webpack": "^3.10.0",
-    "webpack-cli": "^3.0.8"
+    "eslint-webpack-plugin": "^3.0.1",
+    "jest": "^27.1.0",
+    "terser-webpack-plugin": "^5.1.4",
+    "webpack": "^5.51.1",
+    "webpack-cli": "^4.8.0"
   },
   "dependencies": {
-    "anylogger": "^1.0.10",
+    "anylogger": "^1.0.11",
     "anylogger-console": "^1.0.0",
-    "esdoc": "^1.0.4",
-    "esdoc-standard-plugin": "^1.0.0",
-    "promise-polyfill": "^8.0.0"
+    "promise-polyfill": "^8.2.0"
   },
   "homepage": "https://github.com/washingtonpost/arcads#readme"
 }

src/__tests__/amazon.test.js

@@ -1,3 +1,7 @@
+/**
+ * @jest-environment jsdom
+ */
+
 import {
   fetchAmazonBids,
   queueAmazonCommand,
@@ -39,4 +43,4 @@ describe('amazon service', () => {
     queueAmazonCommand(global.amazonTest.cmd);
     expect(spy).toHaveBeenCalled();
   });
-});
+});

src/__tests__/arcads.test.js

@@ -1,3 +1,7 @@
+/**
+ * @jest-environment jsdom
+ */
+
 import { ArcAds } from '../index';
 import  * as gptService from '../services/gpt.js';
 import  * as prebidService from '../services/prebid.js';

src/__tests__/displayAd.test.js

@@ -1,3 +1,7 @@
+/**
+ * @jest-environment jsdom
+ */
+
 import { ArcAds } from '../index';
 import  * as gptService from '../services/gpt.js';
 import * as sizemappingService from '../services/sizemapping.js'
@@ -228,4 +232,4 @@ describe('displayAd ', () => {
 
     });
 
-});
+});

src/__tests__/gpt.test.js

@@ -1,3 +1,7 @@
+/**
+ * @jest-environment jsdom
+ */
+
 import { ArcAds } from '../index';
 import * as gpt from '../services/gpt';
 import * as headerbidding from '../services/headerbidding';

src/__tests__/headerbidding.test.js

@@ -1,3 +1,7 @@
+/**
+ * @jest-environment jsdom
+ */
+
 import {
     initializeBiddingServices
   } from '../services/headerbidding';
@@ -115,4 +119,4 @@ import {
         expect(window.arcBiddingReady).toEqual(false);
       }, 2000);
     });
-  });
+  });

src/__tests__/mobile.test.js

@@ -1,3 +1,6 @@
+/**
+ * @jest-environment jsdom
+ */
 
 import {MobileDetection} from '../util/mobile.js';
 

src/__tests__/prebid.test.js

@@ -1,3 +1,7 @@
+/**
+ * @jest-environment jsdom
+ */
+
 import {
   queuePrebidCommand,
   fetchPrebidBids,
@@ -81,4 +85,4 @@ describe('pbjs', () => {
     addUnit('', '', {}, { sizeConfig: { sample: 'test' } }, {});
     expect(spy).toHaveBeenCalled();
   });
-});
+});

src/__tests__/query.test.js

@@ -1,5 +1,8 @@
-import { expandQueryString } from '../util/query.js';
+/**
+ * @jest-environment jsdom
+ */
 
+import { expandQueryString } from '../util/query.js';
 
 describe('expandQueryString', () => {
 
@@ -31,4 +34,4 @@ describe('expandQueryString', () => {
       const result = expandQueryString('adslot');
       expect(result).toEqual('');
     });
-  });
+  });

src/__tests__/registerAds.test.js

@@ -1,9 +1,12 @@
+/**
+ * @jest-environment jsdom
+ */
+
 import { ArcAds } from '../index';
 import  * as gptService from '../services/gpt.js';
 import  * as prebidService from '../services/prebid.js';
 import * as  mobileDetection from '../util/mobile.js';
 
-
 describe('registerAds dimensions branches', () => {
 
     global.pbjs = {
@@ -348,4 +351,4 @@ describe('registerAds dimensions branches', () => {
         expect(errorMock.mock.calls[0][0]).toEqual('ads error');
     });
 
-});
+});

src/__tests__/resources.test.js

@@ -1,3 +1,7 @@
+/**
+ * @jest-environment jsdom
+ */
+
 import {appendResource} from '../util/resources.js';
 
 describe('appendResource', () => {

src/__tests__/sizemapping.test.js

@@ -1,3 +1,7 @@
+/**
+ * @jest-environment jsdom
+ */
+
 import {
     prepareSizeMaps,
     parseSizeMappings,
@@ -84,4 +88,4 @@ import {
       const resultFn = result();
       expect(sizemapListeners.abc.correlators[0]).toEqual(true);
     });
-  });
+  });

src/__tests__/util.test.js

@@ -1,3 +1,7 @@
+/**
+ * @jest-environment jsdom
+ */
+
 import anylogger from 'anylogger';
 import 'anylogger-console';
 import { renamePositionKey } from '../util/customTargeting';

webpack.config.js

@@ -1,12 +1,33 @@
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+const ESLintPlugin = require('eslint-webpack-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
+
 const path = require('path');
 
-const generatePlugins = function (env) {
-  const plugins = [];
+const generateOptimizations = (env) => {
+  let optimizations = {
+    minimize: false
+  };
+  if (env.production) {
+    optimizations.minimize = true;
+    optimizations.minimizer = [
+      new TerserPlugin({
+        terserOptions: {
+          format: {
+            comments: false,
+          },
+        },
+        extractComments: false,
+      }),
+    ]
+  }
+  return optimizations;
+};
+
+const generatePlugins = (env) => {
+  let plugins = [];
+
   if (env.production) {
-    plugins.push(new UglifyJsPlugin({
-      sourceMap: true,
-    }));
+    plugins.push(new ESLintPlugin())
   }
   return plugins;
 };
@@ -17,30 +38,24 @@ module.exports = env => ({
     path: path.resolve(__dirname, 'dist'),
     filename: 'arcads.js',
     libraryTarget: 'umd',
+    globalObject: 'typeof self !== \'undefined\' ? self : this',
   },
   devtool: env.development ? 'inline-source-map' : false,
   resolve: { extensions: ['.js', '.json'] },
   module: {
     rules: [
-      {
-        loader: 'eslint-loader',
-        enforce: 'pre',
-        test: /\.js$/,
-        exclude: /node_modules/,
-        options: { configFile: '.eslintrc.js' },
-      },
       {
         test: /\.js$/,
         exclude: /node_modules/,
         use: {
           loader: 'babel-loader',
           options: {
-            presets: ['env'],
-            plugins: ['transform-decorators-legacy', 'transform-object-rest-spread'],
+            presets: ['@babel/preset-env'],
           },
         },
       },
     ],
   },
+  optimization: generateOptimizations(env),
   plugins: generatePlugins(env),
-});
+});