Skip to content

Commit

Permalink
fix(angular): devs can import ionic/angular styles in css (#26875)
Browse files Browse the repository at this point in the history
  • Loading branch information
sean-perkins committed Feb 28, 2023
1 parent df37357 commit 0d2fac2
Show file tree
Hide file tree
Showing 14 changed files with 215 additions and 112 deletions.
39 changes: 29 additions & 10 deletions angular/package-lock.json

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
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
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
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

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
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

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
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

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
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

0 comments on commit 0d2fac2

Please sign in to comment.