Skip to content

Commit f349aac

Browse files
committed
Merge branch 'next' of github.com:ionic-team/ionic-framework into chore-sync-next-with-main
2 parents 9d3576e + f9a936b commit f349aac

File tree

425 files changed

+332
-4644
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

425 files changed

+332
-4644
lines changed

core/package-lock.json

Lines changed: 8 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,11 @@
6666
"fs-extra": "^9.0.1",
6767
"jest": "^29.7.0",
6868
"jest-cli": "^29.7.0",
69-
"outsystems-design-tokens": "^1.3.2",
69+
"outsystems-design-tokens": "^1.3.4",
7070
"prettier": "^2.8.8",
7171
"rollup": "^2.26.4",
7272
"sass": "^1.33.0",
7373
"serve": "^14.0.1",
74-
"style-dictionary": "^5.0.0",
7574
"stylelint": "^13.13.1",
7675
"stylelint-order": "^4.1.0"
7776
},
@@ -80,7 +79,7 @@
8079
"build.css": "npm run css.sass && npm run css.minify",
8180
"build.debug": "npm run clean && stencil build --debug",
8281
"build.docs.json": "stencil build --docs-json dist/docs.json",
83-
"build.tokens": "node ./node_modules/outsystems-design-tokens/scripts/index.js --config ./scripts/tokens/index.mjs && npm run prettier.tokens",
82+
"build.tokens": "npx build.tokens --dest src/foundations/ --root=false --scss=true --scss-file=ionic.vars.scss --scss-prefix=ion --utilities=false && npm run prettier.tokens",
8483
"clean": "node scripts/clean.js",
8584
"css.minify": "cleancss -O2 -o ./css/ionic.bundle.css ./css/ionic.bundle.css",
8685
"css.sass": "sass --embed-sources --style compressed src/css:./css",

core/scripts/testing/scripts.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,15 @@
4848
document.head.appendChild(linkTag);
4949
}
5050

51+
const utilsBundleLinkTag = document.querySelector('link[href*="css/utils.bundle.css"]');
52+
if (!utilsBundleLinkTag) {
53+
const linkTag = document.createElement('link');
54+
linkTag.setAttribute('rel', 'stylesheet');
55+
linkTag.setAttribute('type', 'text/css');
56+
linkTag.setAttribute('href', '/css/utils.bundle.css');
57+
document.head.appendChild(linkTag);
58+
}
59+
5160
const defaultThemeLinkTag = document.querySelector('link[href*="css/ionic.bundle.css"]');
5261
if (defaultThemeLinkTag) {
5362
defaultThemeLinkTag.remove();

core/scripts/tokens/index.mjs

Lines changed: 0 additions & 188 deletions
This file was deleted.

0 commit comments

Comments
 (0)