Merge 052db52 into e58258c

eBay · Jul 9, 2019 · a2fc1a6 · a2fc1a6
2 parents e58258c + 052db52
commit a2fc1a6
Show file tree

Hide file tree

Showing 33 changed files with 1,100 additions and 833 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,5 +1,4 @@
 {
     "presets": ["env"],
-    "plugins": ["transform-object-assign"],
     "retainLines": true
 }
diff --git a/marko-cli.js b/marko-cli.js
@@ -25,41 +25,37 @@ module.exports = ({ config }) => {
             browser: 'Chrome',
             os: 'Windows',
             os_version: '10'
+        }, {
+            browser: 'Chrome',
+            browser_version: '49.0',
+            os: 'Windows',
+            os_version: '7'
+        }, {
+            browser: 'Firefox',
+            os: 'Windows',
+            os_version: '10'
         // }, {
-        //     // Browser tries to navigate from `<ebay-breadcrumb>` tests.
-        //     browser: 'Chrome',
-        //     browser_version: '49.0',
-        //     os: 'Windows',
-        //     os_version: '7'
-        // }, {
-        //     // Carousel tests failing.
-        //     browser: 'Firefox',
-        //     os: 'Windows',
-        //     os_version: '10'
-        // }, {
-        //     // Escape keypress not handled from `<ebay-menu>` tests.
         //     browser: 'Firefox',
         //     browser_version: '48.0',
         //     os: 'Windows',
         //     os_version: '7'
+        }, {
+            browser: 'Safari',
+            os: 'OS X',
+            os_version: 'Mojave'
         // }, {
-        //     // Browser tries to navigate from `<ebay-breadcrumb>` tests.
-        //     browser: 'Safari',
-        //     os: 'OS X',
-        //     os_version: 'High Sierra'
-        // }, {
-        //     // Unknown error.
+        //     // Doesn't seem to be supporting timeouts?
         //     browser: 'Safari',
         //     browser_version: '6.0',
         //     os: 'OS X',
         //     os_version: 'Lion'
         // }, {
-        //     // Browser tries to navigate from `<ebay-breadcrumb>` tests.
+        //     // Doesn't seem to be supporting timeouts?
         //     browser: 'Edge',
         //     os: 'Windows',
         //     os_version: '10'
         // }, {
-        //     // Browser tries to navigate from `<ebay-breadcrumb>` tests.
+        //     // Various issues.
         //     browser: 'Edge',
         //     browser_version: '14.0',
         //     os: 'Windows',

diff --git a/marko.json b/marko.json
@@ -335,7 +335,8 @@
             "@style": "string",
             "@value": "string",
             "@text": "string",
-            "@selected": "boolean"
+            "@selected": "boolean",
+            "@optgroup": "string"
         }
     },
     "<ebay-select-option>": {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ebay/ebayui-core",
-  "version": "2.6.1",
+  "version": "2.7.0-3",
   "description": "Collection of core eBay components; considered to be the building blocks for all composite structures, pages & apps.",
   "scripts": {
     "installMarkoV3": "yarn add marko@^3 marko-widgets@^6 -D",
@@ -16,7 +16,7 @@
     "test:browser": "marko test --browser",
     "test:fps": "karma start",
     "test:integration": "yarn installMarkoV3 && mocha integration && yarn installMarkoV4 && mocha integration && yarn installMarkoV3 && yarn clean:integration",
-    "test:browserstack": "env $(cat .env | xargs) yarn test",
+    "test:browserstack": "env $(cat .env | xargs) yarn tb",
     "clean": "rimraf .coverage .karma .nyc_output demo/static && yarn clean:integration",
     "clean:integration": "rimraf integration/*.marko.js integration/static",
     "lint": "yarn lint:less && yarn lint:js && yarn lint:whitespace",
@@ -59,22 +59,21 @@
   ],
   "devDependencies": {
     "@ebay/browserslist-config": "^1.0.0",
-    "@ebay/skin": "7.3.2",
+    "@ebay/skin": "7.4.1",
     "@lasso/marko-taglib": "^1.0.15",
-    "async": "^2.6.2",
+    "async": "^3.0.1",
     "babel-cli": "^6.26.0",
-    "babel-plugin-transform-object-assign": "^6.22.0",
     "babel-preset-env": "^1.6.1",
     "browser-refresh": "^1.7.2",
     "chai": "^4.2.0",
     "cheerio": "^1.0.0-rc.3",
-    "coveralls": "^3.0.3",
+    "coveralls": "^3.0.4",
     "eslint": "^5.16.0",
-    "eslint-config-ebay": "^1.0.0",
+    "eslint-config-ebay": "^1.1.0",
     "eslint-plugin-compat": "^2.7.0",
-    "eslint-plugin-import": "^2.17.2",
+    "eslint-plugin-import": "^2.17.3",
     "eslint-plugin-mocha": "^5.3.0",
-    "express": "^4.16.2",
+    "express": "^4.17.1",
     "gh-highlight": "^0.1.3",
     "is-travis": "^2.0.0",
     "karma": "^4.1.0",
@@ -88,39 +87,37 @@
     "lasso-marko": "^2.4.7",
     "lintspaces-cli": "^0.7.1",
     "marko": "^3",
-    "marko-cli": "^7.0.1",
+    "marko-cli": "^7.0.4",
     "marko-prettyprint": "^1.4.1",
     "marko-widgets": "^6",
     "mocha": "^6.1.4",
-    "nyc": "^13.3.0",
-    "opn-cli": "^4.1.0",
+    "nyc": "^14.1.1",
+    "opn-cli": "^5.0.0",
     "pre-push": "^0.1.1",
     "rimraf": "^2.6.2",
     "sinon": "^7.3.2",
-    "stylelint": "^9.10.1",
-    "supertest": "^3.4.2",
+    "stylelint": "^10.1.0",
+    "supertest": "^4.0.2",
     "wdio-browserstack-service": "^0.1.18"
   },
   "peerDependencies": {
-    "@ebay/skin": "7.3.2",
+    "@ebay/skin": "7.4.1",
     "marko": "^3 || ^4",
     "marko-widgets": "^6 || ^7"
   },
   "dependencies": {
-    "core-js": "^2.6.5",
-    "element-closest": "^3.0.1",
+    "core-js-pure": "^3.1.3",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",
-    "makeup-active-descendant": "~0.0.7",
-    "makeup-expander": "~0.7.1",
-    "makeup-floating-label": "~0.0.4",
-    "makeup-focusables": "~0.0.3",
-    "makeup-key-emitter": "~0.0.3",
-    "makeup-keyboard-trap": "~0.1.1",
-    "makeup-prevent-scroll-keys": "~0.0.2",
-    "makeup-roving-tabindex": "~0.1.3",
-    "makeup-screenreader-trap": "~0.0.5",
-    "nodelist-foreach-polyfill": "^1.2.0"
+    "makeup-active-descendant": "~0.1.4",
+    "makeup-expander": "~0.8.0",
+    "makeup-floating-label": "~0.0.5",
+    "makeup-focusables": "~0.0.4",
+    "makeup-key-emitter": "~0.1.0",
+    "makeup-keyboard-trap": "~0.2.0",
+    "makeup-prevent-scroll-keys": "~0.0.3",
+    "makeup-roving-tabindex": "~0.2.3",
+    "makeup-screenreader-trap": "~0.1.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

diff --git a/src/common/html-attributes/index.js b/src/common/html-attributes/index.js
@@ -1,3 +1,4 @@
+const assign = require('core-js-pure/features/object/assign');
 
 /**
  * Convert camelCase to kebab-case
@@ -18,7 +19,7 @@ function processHtmlAttributes(input = {}) {
 
     let obj = htmlAttributes || wildcardAttributes;
     if (htmlAttributes && wildcardAttributes) {
-        obj = Object.assign(wildcardAttributes, htmlAttributes);
+        obj = assign(wildcardAttributes, htmlAttributes);
     }
 
     if (obj) {

diff --git a/src/common/test-utils/browser.js b/src/common/test-utils/browser.js
@@ -32,7 +32,7 @@ function testOriginalEvent(spy) {
  */
 function simulateScroll(el, to, cb) {
     triggerEvent(el, 'scroll', undefined, false);
-    el.scrollTo({ left: to });
+    el.scrollLeft = to;
     setTimeout(cb, 600);
 }
 

diff --git a/src/common/test-utils/server.js b/src/common/test-utils/server.js
@@ -1,5 +1,6 @@
 const cheerio = require('cheerio');
 const expect = require('chai').expect;
+const assign = require('core-js-pure/features/object/assign');
 const prettyPrint = require('marko-prettyprint').prettyPrintAST;
 const markoCompiler = require('marko/compiler');
 let CompileContext;
@@ -32,10 +33,10 @@ function getCheerio(output) {
  * @param {String} parentInput: use to modify base input of parent, rather than that of arrayKey
  */
 function setupInput(input, arrayKey, baseInput, parentInput = {}) {
-    let newInput = baseInput ? Object.assign(baseInput, input) : input;
+    let newInput = baseInput ? assign(baseInput, input) : input;
 
     if (arrayKey) {
-        newInput = Object.assign(parentInput, { [arrayKey]: [newInput] });
+        newInput = assign(parentInput, { [arrayKey]: [newInput] });
     }
 
     return newInput;

diff --git a/src/components/ebay-breadcrumb/mock/index.js b/src/components/ebay-breadcrumb/mock/index.js
@@ -1,3 +1,5 @@
+const assign = require('core-js-pure/features/object/assign');
+
 const getItem = (text, href = '#') => ({
     href,
     navSrc: '{"actionKind":"NAVSRC","operationId":"2489527"}',
@@ -20,7 +22,7 @@ module.exports = {
         items: basicItems
     },
     buttons: {
-        items: basicItems.map(item => Object.assign({}, item, { href: undefined }))
+        items: basicItems.map(item => assign({}, item, { href: undefined }))
     },
     firstItemMissingHref: {
         a11yHeadingText: 'Page navigation',

diff --git a/src/components/ebay-button/index.js b/src/components/ebay-button/index.js
@@ -1,11 +1,12 @@
+const assign = require('core-js-pure/features/object/assign');
 const emitAndFire = require('../../common/emit-and-fire');
 const eventUtils = require('../../common/event-utils');
 const observer = require('../../common/property-observer');
 
 module.exports = require('marko-widgets').defineComponent({
     template: require('./template.marko'),
     getInitialState(input) {
-        return Object.assign({}, input, {
+        return assign({}, input, {
             disabled: input.disabled
         });
     },

diff --git a/src/components/ebay-carousel/browser.json b/src/components/ebay-carousel/browser.json
@@ -1,29 +1,16 @@
 {
     "dependencies": [
         "require: marko-widgets",
-        "require-run: nodelist-foreach-polyfill",
         "require: ./index.js",
         "../ebay-icon",
         {
             "if-not-flag": "ebayui-no-skin",
             "dependencies": [
                 "@ebay/skin/utility",
                 "@ebay/skin/less",
-                "@ebay/skin/icon/foreground"
+                "@ebay/skin/icon/foreground",
+                "@ebay/skin/carousel"
             ]
-        },
-        {
-            "if-not-flag": "skin-ds6",
-            "dependencies": [
-                "./variables-ds4.less"
-            ]
-        },
-        {
-            "if-flag": "skin-ds6",
-            "dependencies": [
-                "./variables-ds6.less"
-            ]
-        },
-        "./style.less"
+        }
     ]
 }
diff --git a/src/components/ebay-carousel/index.js b/src/components/ebay-carousel/index.js
@@ -1,4 +1,5 @@
 const focusables = require('makeup-focusables');
+const assign = require('core-js-pure/features/object/assign');
 const resizeUtil = require('../../common/event-utils').resizeUtil;
 const emitAndFire = require('../../common/emit-and-fire');
 const processHtmlAttributes = require('../../common/html-attributes');
@@ -96,7 +97,7 @@ function getTemplateData(state) {
             item.style = `${style};flex-basis:${itemWidth};margin-right:${marginRight};`;
             if (transform) item.style += `transform:${transform}`;
         } else {
-            item.style = Object.assign({}, style, {
+            item.style = assign({}, style, {
                 'width': itemWidth,
                 'margin-right': marginRight,
                 transform
@@ -110,7 +111,7 @@ function getTemplateData(state) {
         );
     });
 
-    const data = Object.assign({}, state, {
+    const data = assign({}, state, {
         items,
         slide,
         offset: hasOverride ? config.offsetOverride : offset,