Merge branch 'master' into viewable-impression-2s

rambler-digital-solutions · Apr 6, 2021 · 60497df · 60497df
2 parents ef30ea5 + a08a70e
commit 60497df
Show file tree

Hide file tree

Showing 11 changed files with 3,663 additions and 1,726 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,7 +1,7 @@
 {
   "presets": [
     [
-      "env",
+      "@babel/preset-env",
       {
         "debug": false,
         "modules": false,
@@ -13,50 +13,34 @@
             "ie > 9",
             "not ie < 10"
           ]
-        },
-        "useBuiltIns": true
+        }
       }
-    ],
-    "stage-3"
+    ]
   ],
   "plugins": [
-    [
-      "transform-runtime",
-      {
-        "helpers": false,
-        "polyfill": false,
-        "regenerator": true
-      }
-    ],
-    "transform-class-properties"
+    "@babel/plugin-transform-runtime",
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-proposal-object-rest-spread"
   ],
   "env": {
     "test": {
       "presets": [
         [
-          "env",
+          "@babel/preset-env",
           {
             "debug": false,
             "modules": "commonjs",
             "targets": {
               "node": "current"
-            },
-            "useBuiltIns": true
+            }
           }
-        ],
-        "stage-3"
+        ]
       ],
       "plugins": [
-        [
-          "transform-runtime",
-          {
-            "helpers": false,
-            "polyfill": false,
-            "regenerator": true
-          }
-        ],
-        "transform-class-properties"
+        "@babel/plugin-transform-runtime",
+        "@babel/plugin-proposal-class-properties",
+        "@babel/plugin-proposal-object-rest-spread"
       ]
     }
   }
-}
+}
diff --git a/.size-snapshot.json b/.size-snapshot.json
@@ -0,0 +1,26 @@
+{
+  "main.umd.js": {
+    "bundled": 266881,
+    "minified": 80033,
+    "gzipped": 21424
+  },
+  "main.esm.js": {
+    "bundled": 213996,
+    "minified": 87526,
+    "gzipped": 20616,
+    "treeshaked": {
+      "rollup": {
+        "code": 8773,
+        "import_statements": 347
+      },
+      "webpack": {
+        "code": 10943
+      }
+    }
+  },
+  "main.cjs.js": {
+    "bundled": 217172,
+    "minified": 90137,
+    "gzipped": 20838
+  }
+}
diff --git a/jest.config.js b/jest.config.js
@@ -18,8 +18,5 @@ module.exports = {
   testPathIgnorePatterns: ['<rootDir>/node_modules/'],
   testRegex: '__tests__/.*\\.spec\\.(jsx?|tsx?)$',
   testURL: 'http://localhost',
-  transform: {
-    '.+\\.jsx?$': 'babel-jest'
-  },
   transformIgnorePatterns: ['node_modules']
 };
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
   "author": "MailOnline <[email protected]>",
   "main": "dist/main.cjs.js",
   "module": "dist/main.esm.js",
-  "browser": "dist/main.umd.js",
+  "unpkg": "dist/main.umd.js",
   "license": "MIT",
   "scripts": {
     "build": "cross-env NODE_ENV=production rollup -c",
@@ -60,23 +60,23 @@
     ]
   },
   "dependencies": {
-    "babel-runtime": "^6.26.0",
+    "@babel/runtime": "^7.13.10",
     "lodash.debounce": "^4.0.8",
     "sane-domparser-error": "^0.2.0"
   },
   "devDependencies": {
+    "@babel/core": "^7.13.14",
+    "@babel/plugin-proposal-class-properties": "^7.13.0",
+    "@babel/plugin-proposal-object-rest-spread": "^7.13.8",
+    "@babel/plugin-transform-runtime": "^7.13.10",
+    "@babel/preset-env": "^7.13.12",
     "@commitlint/cli": "^7.0.0",
     "@commitlint/travis-cli": "^7.0.0",
-    "babel-core": "^6.25.0",
-    "babel-jest": "^23.4.2",
-    "babel-loader": "^7.1.5",
-    "babel-plugin-external-helpers": "^6.22.0",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-polyfill": "^6.23.0",
-    "babel-preset-env": "^1.6.1",
-    "babel-preset-stage-3": "^6.24.1",
-    "babel-register": "^6.24.1",
+    "@rollup/plugin-babel": "^5.3.0",
+    "@rollup/plugin-commonjs": "^18.0.0",
+    "@rollup/plugin-node-resolve": "^11.2.1",
+    "babel-jest": "^26.6.3",
+    "babel-loader": "^8.2.2",
     "braintree-jsdoc-template": "^3.3.0",
     "codecov": "^3.1.0",
     "cross-env": "^5.2.0",
@@ -85,8 +85,8 @@
     "eslint-config-mailonline": "^9.0.0",
     "html-webpack-plugin": "^3.2.0",
     "husky": "^1.1.2",
-    "jest": "^23.4.2",
-    "jest-environment-jsdom": "^23.4.0",
+    "jest": "^26.6.3",
+    "jest-environment-jsdom": "^26.6.2",
     "jsdoc": "^3.5.5",
     "lint-staged": "^10.5.4",
     "mini-css-extract-plugin": "^0.4.5",
@@ -96,12 +96,10 @@
     "optimize-css-assets-webpack-plugin": "^5.0.1",
     "prettier": "^2.2.1",
     "rimraf": "^2.6.2",
-    "rollup": "^0.63.5",
-    "rollup-plugin-babel": "^3.0.7",
-    "rollup-plugin-commonjs": "^9.1.4",
-    "rollup-plugin-node-resolve": "^3.3.0",
-    "rollup-plugin-sourcemaps": "^0.4.2",
-    "rollup-plugin-terser": "^1.0.1",
+    "rollup": "^2.44.0",
+    "rollup-plugin-size-snapshot": "^0.12.0",
+    "rollup-plugin-sourcemaps": "^0.6.3",
+    "rollup-plugin-terser": "^7.0.2",
     "semantic-release": "^15.12.1",
     "terser-webpack-plugin": "^1.1.0",
     "webpack": "^4.16.5",

diff --git a/rollup.config.js b/rollup.config.js
@@ -1,9 +1,10 @@
 /* eslint-disable filenames/match-exported, sort-keys */
 import path from 'path';
-import resolve from 'rollup-plugin-node-resolve';
-import commonjs from 'rollup-plugin-commonjs';
-import babel from 'rollup-plugin-babel';
+import resolve from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import babel from '@rollup/plugin-babel';
 import {terser} from 'rollup-plugin-terser';
+import {sizeSnapshot} from 'rollup-plugin-size-snapshot';
 import sourcemaps from 'rollup-plugin-sourcemaps';
 import pkg from './package.json';
 
@@ -13,10 +14,11 @@ const production = process.env.NODE_ENV === 'production';
 const plugins = [
   sourcemaps(),
   babel({
-    exclude: ['../../node_modules/**', 'node_modules/**'],
-    plugins: ['external-helpers']
+    babelHelpers: 'runtime',
+    exclude: ['../../node_modules/**', 'node_modules/**']
   }),
-  commonjs()
+  commonjs(),
+  sizeSnapshot()
 ];
 
 // NOTE: don't include external dependencies into esm/cjm bundles
@@ -37,18 +39,10 @@ const config = [
     output: {
       sourcemap: true,
       name: pkg.name,
-      file: pkg.browser,
+      file: pkg.unpkg,
       format: 'umd'
     },
-    plugins: [
-      ...plugins,
-      resolve({
-        customResolveOptions: {
-          moduleDirectory: ['node_modules', '../../node_modules']
-        }
-      }),
-      production && terser()
-    ]
+    plugins: [resolve(), ...plugins, production && terser()]
   },
   {
     input: './src/index.js',

diff --git a/src/adUnit/__tests__/VideoAdUnit.spec.js b/src/adUnit/__tests__/VideoAdUnit.spec.js
@@ -27,7 +27,7 @@ jest.mock('../helpers/dom/elementObservers', () => ({
   onElementVisibilityChange: jest.fn()
 }));
 jest.mock('../../vastSelectors', () => ({
-  ...require.requireActual('../../vastSelectors'),
+  ...jest.requireActual('../../vastSelectors'),
   getViewable: jest.fn()
 }));