Skip to content

Commit

Permalink
Merge branch 'main' into feat/configure-remove-viewbox
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrielduete authored Dec 17, 2024
2 parents 5f8bc8a + d374fd4 commit 5deb0e1
Show file tree
Hide file tree
Showing 20 changed files with 2,517 additions and 6,724 deletions.
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"packages/core": "2.31.0",
"packages/core": "3.0.0",
"packages/tokens": "2.0.0"
}
9,128 changes: 2,454 additions & 6,674 deletions package-lock.json

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
"tokens:build": "nx build @juntossomosmais/atomium-tokens"
},
"dependencies": {
"@ionic/core": "^7.8.6",
"@ionic/core": "^8.4.1",
"@popperjs/core": "^2.11.8",
"@stencil/core": "~4.17.2"
"@stencil/core": "~4.22.3"
},
"devDependencies": {
"@babel/core": "^7.25.2",
Expand All @@ -42,7 +42,7 @@
"@commitlint/cli": "^19.4.1",
"@commitlint/config-conventional": "^19.4.1",
"@juntossomosmais/linters": "^0.21.0",
"@nrwl/workspace": "19.8.4",
"@nrwl/workspace": "19.6.4",
"@rollup/plugin-typescript": "^11.1.6",
"@stencil/react-output-target": "^0.5.3",
"@stencil/sass": "^3.0.12",
Expand All @@ -52,7 +52,7 @@
"@storybook/addon-essentials": "^7.6.17",
"@storybook/addon-mdx-gfm": "^7.6.17",
"@storybook/addons": "^7.6.17",
"@storybook/preset-typescript": "^3.0.0",
"@storybook/preset-typescript": "^2.1.0",
"@storybook/react": "^7.6.17",
"@storybook/react-webpack5": "^7.6.17",
"@storybook/theming": "^7.6.17",
Expand Down Expand Up @@ -108,6 +108,9 @@
"vite": "^5.4.2",
"vue": "^3.4.38"
},
"optionalDependencies": {
"@rollup/rollup-linux-x64-gnu": "4.9.5"
},
"lint-staged": {
"*.{js,jsx,ts,tsx}": [
"prettier --write",
Expand Down
11 changes: 11 additions & 0 deletions packages/core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## [3.0.0](https://github.com/juntossomosmais/atomium/compare/atomium-v2.31.0...atomium-v3.0.0) (2024-12-17)


### ⚠ BREAKING CHANGES

* **core:** update stencil and ionic ([#632](https://github.com/juntossomosmais/atomium/issues/632))

### Features

* **core:** update stencil and ionic ([#632](https://github.com/juntossomosmais/atomium/issues/632)) ([a2c3d06](https://github.com/juntossomosmais/atomium/commit/a2c3d068b497c48d9c9875fc47537272dcf37d36))

## [2.31.0](https://github.com/juntossomosmais/atomium/compare/atomium-v2.30.0...atomium-v2.31.0) (2024-12-13)


Expand Down
4 changes: 1 addition & 3 deletions packages/core/loader/cdn.js
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@

module.exports = require('../dist/cjs/loader.cjs.js');
module.exports.applyPolyfills = function() { return Promise.resolve() };
module.exports = require('../dist/cjs/loader.cjs.js');
4 changes: 1 addition & 3 deletions packages/core/loader/index.cjs.js
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@

module.exports = require('../dist/cjs/loader.cjs.js');
module.exports.applyPolyfills = function() { return Promise.resolve() };
module.exports = require('../dist/cjs/loader.cjs.js');
3 changes: 3 additions & 0 deletions packages/core/loader/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ export interface CustomElementsDefineOptions {
rel?: (el: EventTarget, eventName: string, listener: EventListenerOrEventListenerObject, options: boolean | AddEventListenerOptions) => void;
}
export declare function defineCustomElements(win?: Window, opts?: CustomElementsDefineOptions): void;
/**
* @deprecated
*/
export declare function applyPolyfills(): Promise<void>;

/**
Expand Down
4 changes: 1 addition & 3 deletions packages/core/loader/index.es2017.js
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@

export * from '../dist/esm/polyfills/index.js';
export * from '../dist/esm/loader.js';
export * from '../dist/esm/loader.js';
4 changes: 1 addition & 3 deletions packages/core/loader/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/core/output-target/react-boolean.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import { reactOutputTarget } from '@stencil/react-output-target'
import fs from 'fs'
import { reactBooleanFixOutputTarget } from './react-boolean'

describe('React Boolean Fix', () => {
describe.skip('React Boolean Fix', () => {
let compiler: Compiler
let sys: CompilerSystem

beforeAll(async () => {
// https://stenciljs.com/docs/compiler-api#createcompiler
const logger = createNodeLogger({ process })
const logger = createNodeLogger()
sys = createNodeSys({ process })

const validated = await loadConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@juntossomosmais/atomium",
"version": "2.31.0",
"version": "3.0.0",
"description": "Core of web components for Atomium",
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
import { HTMLStencilElement, JSXBase } from "@stencil/core/internal";
import { IconProps } from "./icons";
import { Mode, TextFieldTypes } from "@ionic/core";
import { IonTypes } from "@ionic/core/dist/types/components";
import { LocalJSX as IonTypes } from "@ionic/core/dist/types/components";
export { IconProps } from "./icons";
export { Mode, TextFieldTypes } from "@ionic/core";
export { IonTypes } from "@ionic/core/dist/types/components";
export { LocalJSX as IonTypes } from "@ionic/core/dist/types/components";
export namespace Components {
interface AtomAlert {
"actionText"?: string;
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/carousel/carousel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class AtomCarousel {
}

set currentIndex(value: number) {
if (!this.carouselWrapper) return
if (!this.carouselWrapper || !value) return

this.currentIdx = value
this.carouselWrapper.style.transform = `translateX(-${this.currentIndex * 100}%)`
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/icon/icon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export class AtomIcon {
this.updateSize(this.size)
}

render(): JSX.Element {
render() {
return (
<Host aria-hidden='true'>
<ion-icon
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/input/input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export class AtomInput {
this.atomFocus.emit()
}

render(): JSX.Element {
render() {
return (
<Host>
<ion-input
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/select/select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ export class AtomSelect {
this.atomDismiss.emit()
}

render(): JSX.Element {
render() {
return (
<Host
class={{
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/textarea/textarea.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export class AtomTextarea {
this.atomFocus.emit()
}

render(): JSX.Element {
render() {
return (
<Host>
<ion-textarea
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/tooltip/tooltip.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ describe('AtomTooltip', () => {
<div class=\"atom-tooltip__content\">
<slot></slot>
</div>
<div aria-hidden=\"\" class=\"atom-tooltip__arrow\"></div>
<div aria-hidden=\"\" class=\"atom-tooltip__arrow\" style="position: absolute;"></div>
</div>
</mock:shadow-root>
John Doe
Expand Down
3 changes: 0 additions & 3 deletions packages/core/src/global/global.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
:root {
/* Set the background of the entire app */
--ion-background-color: white;

/* Set the font family of the entire app */
--ion-font-family: var(--font-family);

--ion-color-primary: var(--color-brand-primary-regular);
Expand Down
45 changes: 26 additions & 19 deletions packages/core/stencil.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import { reactBooleanFixOutputTarget } from './output-target/react-boolean'
// Since Ionic components are imported in `global.ts`
// we need to exclude them here to avoid unnecessary imports in the React and Vue output module
const excludeComponents = [
'ion-accordion',
'ion-accordion-group',
'ion-accordion',
'ion-action-sheet',
'ion-alert',
'ion-app',
Expand All @@ -22,77 +22,84 @@ const excludeComponents = [
'ion-breadcrumbs',
'ion-button',
'ion-buttons',
'ion-card',
'ion-card-content',
'ion-card-header',
'ion-card-subtitle',
'ion-card-title',
'ion-card',
'ion-checkbox',
'ion-chip',
'ion-col',
'ion-content',
'ion-datetime',
'ion-datetime-button',
'ion-fab',
'ion-datetime',
'ion-fab-button',
'ion-fab-list',
'ion-fab',
'ion-footer',
'ion-grid',
'ion-header',
'ion-icon',
'ion-img',
'ion-infinite-scroll',
'ion-infinite-scroll-content',
'ion-infinite-scroll',
'ion-input-password-toggle',
'ion-input',
'ion-item',
'ion-item-divider',
'ion-item-group',
'ion-item-option',
'ion-item-options',
'ion-item-sliding',
'ion-item',
'ion-label',
'ion-list',
'ion-list-header',
'ion-list',
'ion-loading',
'ion-menu',
'ion-menu-button',
'ion-menu-toggle',
'ion-menu',
'ion-modal',
'ion-nav',
'ion-nav-link',
'ion-nav',
'ion-note',
'ion-picker',
'ion-picker-column',
'ion-picker-column-internal',
'ion-picker-column-option',
'ion-picker-column',
'ion-picker-internal',
'ion-picker-legacy-column',
'ion-picker-legacy',
'ion-picker',
'ion-popover',
'ion-progress-bar',
'ion-radio',
'ion-radio-group',
'ion-radio',
'ion-range',
'ion-refresher',
'ion-refresher-content',
'ion-reorder',
'ion-refresher',
'ion-reorder-group',
'ion-reorder',
'ion-ripple-effect',
'ion-route',
'ion-route-redirect',
'ion-router',
'ion-route',
'ion-router-link',
'ion-router-outlet',
'ion-router',
'ion-row',
'ion-searchbar',
'ion-segment',
'ion-segment-button',
'ion-select',
'ion-segment-content',
'ion-segment-view',
'ion-segment',
'ion-select-modal',
'ion-select-option',
'ion-select-popover',
'ion-select',
'ion-skeleton-text',
'ion-spinner',
'ion-split-pane',
'ion-tab',
'ion-tab-bar',
'ion-tab-button',
'ion-tab',
'ion-tabs',
'ion-text',
'ion-textarea',
Expand Down

0 comments on commit 5deb0e1

Please sign in to comment.