Skip to content

Commit

Permalink
Merge branch 'main' into renovate/carbon-pictograms-react-11.x
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelojcs authored Jan 15, 2025
2 parents b269359 + 94da52e commit a155893
Show file tree
Hide file tree
Showing 246 changed files with 6,553 additions and 2,131 deletions.
29 changes: 0 additions & 29 deletions .github/workflows/automerge-mastheadv2.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/e2e-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: e2e-integration

on:
push:
branches: [ main, release/v2*, feat/masthead-v2, feat/masthead-v2-dev ]
branches: [ main, release/v2* ]
schedule:
- cron: '0 20 * * 1-5'

Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/e2e-tests-parallel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,10 @@ jobs:
id: cypress-tests-wc
continue-on-error: true
working-directory: packages/web-components
run: yarn test:e2e-storybook:test:parallel
run: |
export CYPRESS_VERIFY_TIMEOUT=60000
yarn cypress:verify
yarn test:e2e-storybook:test:parallel
env:
CI_BUILD_ID: '${{ github.sha }}-${{ github.workflow }}-wc'
CYPRESS_API_URL: "https://sorry-cypress-director.qfl95m0zv01.us-east.codeengine.appdomain.cloud"
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"ci-check": "npm run format:diff && yarn lint:license && yarn lint && yarn lint:styles",
"clean": "lerna run clean && lerna clean --yes && rimraf node_modules",
"doctoc": "doctoc --title '## Table of Contents' docs",
"format": "prettier --cache --write '**/*.{js,md,scss,ts}'",
"format": "prettier --cache --write '**/*.{js,md,scss,ts}' && stylelint '**/*.{css,scss}' --fix",
"format:diff": "prettier --cache --list-different '**/*.{js,md,scss,ts}'",
"lint": "eslint packages --ext .js,.ts",
"lint:license": "gulp lint:license",
Expand Down
24 changes: 24 additions & 0 deletions packages/services-store/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.53.5](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-12-18)

**Note:** Version bump only for package @carbon/ibmdotcom-services-store





## [1.53.4](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-12-12)

**Note:** Version bump only for package @carbon/ibmdotcom-services-store





## [1.53.3](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-11-13)

**Note:** Version bump only for package @carbon/ibmdotcom-services-store





## [1.53.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-09-18)

**Note:** Version bump only for package @carbon/ibmdotcom-services-store
Expand Down
2 changes: 1 addition & 1 deletion packages/services-store/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/ibmdotcom-services-store",
"private": true,
"version": "1.53.2",
"version": "1.53.5",
"description": "Redux store for Carbon for IBM.com Services",
"license": "Apache-2.0",
"main": "lib/store.js",
Expand Down
80 changes: 80 additions & 0 deletions packages/services/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,86 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.16.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-12-18)

**Note:** Version bump only for package @carbon/ibmdotcom-services





## [2.16.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-12-12)

**Note:** Version bump only for package @carbon/ibmdotcom-services





# [2.16.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-12-12)

**Note:** Version bump only for package @carbon/ibmdotcom-services





# [2.16.0-rc.3](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-12-07)

**Note:** Version bump only for package @carbon/ibmdotcom-services





# [2.16.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-12-05)

**Note:** Version bump only for package @carbon/ibmdotcom-services





# [2.16.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-11-29)

**Note:** Version bump only for package @carbon/ibmdotcom-services





# [2.16.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-11-25)

**Note:** Version bump only for package @carbon/ibmdotcom-services





## [2.15.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-11-13)

**Note:** Version bump only for package @carbon/ibmdotcom-services





# [2.15.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-11-05)

**Note:** Version bump only for package @carbon/ibmdotcom-services





# [2.15.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-11-05)

**Note:** Version bump only for package @carbon/ibmdotcom-services





# [2.14.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-10-25)

**Note:** Version bump only for package @carbon/ibmdotcom-services
Expand Down
4 changes: 2 additions & 2 deletions packages/services/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/ibmdotcom-services",
"description": "Carbon for IBM.com Services",
"version": "2.14.0",
"version": "2.16.2",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -47,7 +47,7 @@
},
"dependencies": {
"@babel/runtime": "^7.16.3",
"@carbon/ibmdotcom-utilities": "2.14.0",
"@carbon/ibmdotcom-utilities": "2.16.2",
"@ibm/telemetry-js": "^1.5.0",
"axios": "^1.6.8",
"marked": "^4.0.10",
Expand Down
57 changes: 57 additions & 0 deletions packages/services/src/services/SAPCommerce/SAPCommerce.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/**
* @license
*
* Copyright IBM Corp. 2024
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

import Cookies from 'js-cookie';

const _cookieName = 'activeCartId';

class SAPCommerceAPI {
/**
* Check if the user has an active cart by looking for the non-empty cookie.
*
* @returns {boolean}
*/
static hasActiveCart() {
const activeCartId = SAPCommerceAPI.getActiveCartId();
// Return true if the activeCartId cookie is non-empty.
return activeCartId !== '';
}

/**
* Returns the active cart id.
*
* @returns {string}
* The active cart id if there is one, otherwise empty string.
*/
static getActiveCartId() {
const activeCartId = Cookies.get(_cookieName);
return activeCartId && typeof activeCartId === 'string'
? activeCartId.trim()
: '';
}

/**
* Set the active cart id.
*
* @param {string} activeCartId
* The active cart id.
*/
static setActiveCartId(activeCartId) {
Cookies.set(_cookieName, activeCartId.trim());
}

/**
* Remove the active cart id.
*/
static removeActiveCartId() {
Cookies.remove(_cookieName);
}
}

export default SAPCommerceAPI;
9 changes: 9 additions & 0 deletions packages/services/src/services/SAPCommerce/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/**
* @license
*
* Copyright IBM Corp. 2024
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/
export { default as SAPCommerceAPI } from './SAPCommerce.js';
3 changes: 2 additions & 1 deletion packages/services/src/services/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright IBM Corp. 2016, 2021
* Copyright IBM Corp. 2016, 2024
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
Expand All @@ -13,6 +13,7 @@ export * from './Locale';
export * from './MarketingSearch';
export * from './MastheadLogo';
export * from './Profile';
export * from './SAPCommerce';
export * from './SearchTypeahead';
export * from './Translation';
export * from './KalturaPlayer';
24 changes: 24 additions & 0 deletions packages/storybook-addon-theme/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.44.5](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-12-18)

**Note:** Version bump only for package @carbon/storybook-addon-theme





## [1.44.4](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-12-12)

**Note:** Version bump only for package @carbon/storybook-addon-theme





## [1.44.3](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-11-13)

**Note:** Version bump only for package @carbon/storybook-addon-theme





## [1.44.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-09-18)

**Note:** Version bump only for package @carbon/storybook-addon-theme
Expand Down
2 changes: 1 addition & 1 deletion packages/storybook-addon-theme/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/storybook-addon-theme",
"private": true,
"version": "1.44.2",
"version": "1.44.5",
"description": "Storybook add-on for Carbon theme chooser",
"license": "Apache-2.0",
"main": "es/index.js",
Expand Down
Loading

0 comments on commit a155893

Please sign in to comment.