Skip to content

fix(angular): devs can import ionic/angular styles in css #26875

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Feb 28, 2023
Merged

fix(angular): devs can import ionic/angular styles in css #26875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d2636d
fix(angular): devs can import ionic/angular styles in css
sean-perkins Feb 28, 2023
4022a76
chore: use exports syntax, export all including css maps
sean-perkins Feb 28, 2023
4321f78
Merge branch 'feature-7.0' into fix/angular-css-imports
liamdebeasi Feb 28, 2023
23203ba
chore(all): use the beta version of packages
sean-perkins Feb 28, 2023
51dd016
Merge remote-tracking branch 'origin/fix/angular-css-imports' into fi…
sean-perkins Feb 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 29 additions & 10 deletions angular/package-lock.json
View file
Open in desktop

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

7 changes: 6 additions & 1 deletion angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,13 @@
"tsc": "tsc -p .",
"validate": "npm i && npm run lint && npm run test && npm run build"
},
"exports": {
"./css/*": {
"style": "./css/*"
}
},
"dependencies": {
"@ionic/core": "^7.0.0-beta.5",
"@ionic/core": "7.0.0-beta.5",
"ionicons": "^6.1.3",
"jsonc-parser": "^3.0.0",
"tslib": "^2.3.0"
Expand Down
13 changes: 1 addition & 12 deletions angular/test/base/angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,7 @@
"output": "./svg"
}
],
"styles": [
"src/styles.css",
"node_modules/@ionic/angular/css/core.css",
"node_modules/@ionic/angular/css/normalize.css",
"node_modules/@ionic/angular/css/structure.css",
"node_modules/@ionic/angular/css/typography.css",
"node_modules/@ionic/angular/css/padding.css",
"node_modules/@ionic/angular/css/float-elements.css",
"node_modules/@ionic/angular/css/text-alignment.css",
"node_modules/@ionic/angular/css/text-transformation.css",
"node_modules/@ionic/angular/css/flex-utils.css"
],
"styles": ["src/styles.css"],
"scripts": []
},
"configurations": {
Expand Down
14 changes: 14 additions & 0 deletions angular/test/base/src/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/* Core CSS required for Ionic components to work properly */
@import '~@ionic/angular/css/core.css';

/* Basic CSS for apps built with Ionic */
@import '~@ionic/angular/css/normalize.css';
@import '~@ionic/angular/css/structure.css';
@import '~@ionic/angular/css/typography.css';

/* Optional CSS utils that can be commented out */
@import '~@ionic/angular/css/padding.css';
@import '~@ionic/angular/css/float-elements.css';
@import '~@ionic/angular/css/text-alignment.css';
@import '~@ionic/angular/css/text-transformation.css';
@import '~@ionic/angular/css/flex-utils.css';
39 changes: 29 additions & 10 deletions packages/angular-server/package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion packages/angular-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@
},
"prettier": "@ionic/prettier-config",
"dependencies": {
"@ionic/core": "^7.0.0-beta.5"
"@ionic/core": "7.0.0-beta.5"
}
}
73 changes: 46 additions & 27 deletions packages/react-router/package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion packages/react-router/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"dist/"
],
"dependencies": {
"@ionic/react": "^7.0.0-beta.5",
"@ionic/react": "7.0.0-beta.5",
"tslib": "*"
},
"peerDependencies": {
Expand Down
39 changes: 29 additions & 10 deletions packages/react/package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion packages/react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"css/"
],
"dependencies": {
"@ionic/core": "^7.0.0-beta.5",
"@ionic/core": "7.0.0-beta.5",
"ionicons": "^6.1.3",
"tslib": "*"
},
Expand Down
Loading