Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.7.0 PR prior to merge #744

Merged
merged 25 commits into from Jul 9, 2019
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
2281e9c
Replaced Object.assign and other polyfills with functions (#692)
DylanPiercey Jun 14, 2019
8fffceb
DevDeps: safe updates
ianmcburnie Jun 14, 2019
bb44ed8
DevDeps: upgraded makeupjs modules
ianmcburnie Jun 14, 2019
aea5b45
DevDeps: upgraded major versions
ianmcburnie Jun 14, 2019
00f5b69
DevDeps: reverted lasso-babel-transform to v1
ianmcburnie Jun 14, 2019
e6f226e
Merge pull request #711 from eBay/694-devdeps
ianmcburnie Jun 18, 2019
c05399a
Merge remote-tracking branch 'origin/master' into 2.7.0
Jun 19, 2019
8560e3f
Select: Add optgroup (#719)
Jun 20, 2019
ff8fb94
Menu: fix event firing when radio item already selected (#720)
Jun 20, 2019
c352315
2.7.0-0
Jun 20, 2019
bcd3c0c
Carousel: now using CSS from Skin
ianmcburnie Jun 24, 2019
783fa58
Icon: force the entire icon to be replaced for Marko v3
ianmcburnie Jun 25, 2019
c713c86
Merge pull request #722 from eBay/718-carousel-skin
ianmcburnie Jun 25, 2019
0a10482
2.7.0-1
ianmcburnie Jun 25, 2019
58245dd
Upgraded skin to 7.4.0-1
ianmcburnie Jun 26, 2019
082e45d
2.7.0-2
ianmcburnie Jun 26, 2019
93abf44
Add support for safari and firefox in CI
DylanPiercey Jun 26, 2019
6c196d3
Add support for older version of chrome
DylanPiercey Jun 26, 2019
e1d5c13
Merge pull request #723 from eBay/increased-browser-support
ianmcburnie Jun 26, 2019
2749e21
Upgrade marko-cli to improve false negative test failures (#727)
DylanPiercey Jun 27, 2019
6c120e5
Select: fix option click and rerender; (#730)
Jul 1, 2019
a3fc19c
2.7.0-3
Jul 1, 2019
39ff3ff
Merge remote-tracking branch 'origin/master' into 2.7.0
Jul 8, 2019
f7acbfb
Bump Skin to v7.4.0
Jul 8, 2019
052db52
Bump Skin to v7.4.1
Jul 9, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion .babelrc
@@ -1,5 +1,4 @@
{
"presets": ["env"],
"plugins": ["transform-object-assign"],
"retainLines": true
}
36 changes: 16 additions & 20 deletions marko-cli.js
Expand Up @@ -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',
Expand Down
3 changes: 2 additions & 1 deletion marko.json
Expand Up @@ -335,7 +335,8 @@
"@style": "string",
"@value": "string",
"@text": "string",
"@selected": "boolean"
"@selected": "boolean",
"@optgroup": "string"
}
},
"<ebay-select-option>": {
Expand Down
51 changes: 24 additions & 27 deletions 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",
Expand All @@ -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",
Expand Down Expand Up @@ -59,22 +59,21 @@
],
"devDependencies": {
"@ebay/browserslist-config": "^1.0.0",
"@ebay/skin": "7.3.2",
"@ebay/skin": "7.4.0",
"@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",
Expand All @@ -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.0",
"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"
Expand Down
3 changes: 2 additions & 1 deletion src/common/html-attributes/index.js
@@ -1,3 +1,4 @@
const assign = require('core-js-pure/features/object/assign');

/**
* Convert camelCase to kebab-case
Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/common/test-utils/browser.js
Expand Up @@ -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);
}

Expand Down
5 changes: 3 additions & 2 deletions 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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion 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"}',
Expand All @@ -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',
Expand Down
3 changes: 2 additions & 1 deletion 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
});
},
Expand Down
19 changes: 3 additions & 16 deletions 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"
}
]
}
5 changes: 3 additions & 2 deletions 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');
Expand Down Expand Up @@ -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
Expand All @@ -110,7 +111,7 @@ function getTemplateData(state) {
);
});

const data = Object.assign({}, state, {
const data = assign({}, state, {
items,
slide,
offset: hasOverride ? config.offsetOverride : offset,
Expand Down