Skip to content

Commit

Permalink
Merge branch 'main' into 6689_convert-big-numbers-to-typescript
Browse files Browse the repository at this point in the history
  • Loading branch information
paul-balchin-ibm authored Jan 20, 2025
2 parents d47a652 + df21099 commit cb4cf2f
Show file tree
Hide file tree
Showing 26 changed files with 324 additions and 576 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
node-version: '20.x'
cache: yarn
- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 #4.2.0
with:
path: '**/node_modules'
key: build-modules-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
Expand All @@ -45,7 +45,7 @@ jobs:
node-version: '20.x'
cache: yarn
- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 #4.2.0
with:
path: '**/node_modules'
key: lint-modules-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
Expand All @@ -65,7 +65,7 @@ jobs:
node-version: '20.x'
cache: yarn
- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 #4.2.0
with:
path: '**/node_modules'
key: lint-modules-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
Expand All @@ -85,7 +85,7 @@ jobs:
node-version: '20.x'
cache: yarn
- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 #4.2.0
with:
path: '**/node_modules'
key: spellcheck-modules-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
Expand All @@ -105,7 +105,7 @@ jobs:
node-version: '20.x'
cache: yarn
- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 #4.2.0
with:
path: '**/node_modules'
key: test-c4p-modules-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
Expand All @@ -130,7 +130,7 @@ jobs:
node-version: '20.x'
cache: yarn
- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 #4.2.0
with:
path: '**/node_modules'
key:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-example-gallery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
cache: yarn

- name: Cache dependencies
uses: actions/cache@v4
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 #4.2.0
with:
path: '**/node_modules'
key: check-gallery-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,8 @@ $block-class: #{c4p-settings.$pkg-prefix}--tag-overflow;
$block-class-overflow: #{$block-class}-popover;
$block-class-modal: #{$block-class}-modal;

.#{$block-class} {
.#{$block-class}__visible-tags {
display: flex;
width: 100%;
min-width: $spacing-12;
align-items: center;
justify-content: flex-start;
white-space: nowrap;
}

.#{$block-class}--align-end {
Expand Down
7 changes: 1 addition & 6 deletions packages/ibm-products-web-components/.storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { mergeConfig } from 'vite';
import { litStyleLoader, litTemplateLoader } from '@mordech/vite-lit-loader';
import viteSVGResultCarbonIconLoader from '../tools/vite-svg-result-carbon-icon-loader';
const glob = require('fast-glob');
const stories = glob.sync(
[
Expand Down Expand Up @@ -36,11 +35,7 @@ const config = {
},
async viteFinal(config) {
return mergeConfig(config, {
plugins: [
litStyleLoader(),
litTemplateLoader(),
viteSVGResultCarbonIconLoader(),
],
plugins: [litStyleLoader(), litTemplateLoader()],
});
},
};
Expand Down
19 changes: 10 additions & 9 deletions packages/ibm-products-web-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
"url": "https://github.com/carbon-design-system/ibm-products.git",
"directory": "packages/ibm-products-web-components"
},
"files": [
"custom-elements.json",
"es/**/*",
"lib/**/*",
"scss/**/*"
],
"publishConfig": {
"access": "public",
"provenance": true
},
"exports": {
"./es/components/*": {
"node": "./lib/components/*",
"default": "./es/components/*"
},
"./es/globals/*": {
"node": "./lib/globals/*",
"default": "./es/globals/*"
},
"./es/*": "./es/*",
"./lib/*": "./lib/*",
"./dist/*": "./dist/*",
"./scss/*": "./scss/*",
"./custom-elements.json": "./custom-elements.json",
"./package.json": "./package.json"
},
Expand All @@ -52,7 +52,8 @@
"@carbon/ibm-products-styles": "^2.54.0-rc.0",
"@carbon/styles": "1.71.0",
"@carbon/web-components": "2.19.0",
"lit": "^3.1.0"
"lit": "^3.1.0",
"tslib": "^2.6.3"
},
"devDependencies": {
"@carbon/icon-helpers": "^10.54.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import { SIDE_PANEL_SIZE, SIDE_PANEL_PLACEMENT } from './defs';
import styles from './side-panel.scss?lit';
import { selectorTabbable } from '@carbon/web-components/es/globals/settings.js';
import { carbonElement as customElement } from '@carbon/web-components/es/globals/decorators/carbon-element.js';
import ArrowLeft16 from '@carbon/icons/lib/arrow--left/16';
import Close20 from '@carbon/icons/lib/close/20';
import ArrowLeft16 from '@carbon/web-components/es/icons/arrow--left/16';
import Close20 from '@carbon/web-components/es/icons/close/20';
import { moderate02 } from '@carbon/motion';
import Handle from '../../globals/internal/handle';
import '@carbon/web-components/es/components/button/index.js';
Expand Down
4 changes: 0 additions & 4 deletions packages/ibm-products-web-components/tasks/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import { globby } from 'globby';
import { rollup } from 'rollup';
import alias from '@rollup/plugin-alias';
import autoprefixer from 'autoprefixer';
import carbonIcons from '../tools/rollup-plugin-icons.js';
import carbonIconPaths from '../tools/rollup-plugin-icon-paths.js';
import commonjs from '@rollup/plugin-commonjs';
import copy from 'rollup-plugin-copy';
import cssnano from 'cssnano';
Expand Down Expand Up @@ -149,15 +147,13 @@ function getRollupConfig(input, rootDir, outDir, iconInput) {
).css;
},
}),
carbonIcons(iconInput, banner),
typescript({
noEmitOnError: true,
compilerOptions: {
rootDir,
outDir,
},
}),
carbonIconPaths(),
],
};
}
Expand Down

This file was deleted.

73 changes: 0 additions & 73 deletions packages/ibm-products-web-components/tools/rollup-plugin-icons.js

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit cb4cf2f

Please sign in to comment.