Skip to content
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.

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

(fix) Don't generate warning from mini-css about order #1095

Merged
merged 3 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import React from 'react';
import classNames from 'classnames';
import { Button, IconButton } from '@carbon/react';
import { useLayoutType } from '@openmrs/esm-react-utils';
import styles from './action-menu-button.module.scss';
import { useWorkspaces } from '../workspaces';
import styles from './action-menu-button.module.scss';

interface TagsProps {
getIcon: (props: object) => JSX.Element;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use '@carbon/styles/scss/spacing';
@use '@carbon/styles/scss/type';
@import '@openmrs/esm-styleguide/src/vars';
@use '@openmrs/esm-styleguide/src/vars' as *;

.container {
margin-top: spacing.$spacing-02;
Expand All @@ -20,7 +20,7 @@

& > span {
margin-top: spacing.$spacing-02;
@include type.type-style("body-compact-01");
@include type.type-style('body-compact-01');
color: $text-02;
}

Expand Down Expand Up @@ -78,7 +78,6 @@

/* Tablet */
:global(.omrs-breakpoint-lt-desktop) {

.container {
margin-bottom: 0;
margin-top: 0;
Expand All @@ -102,7 +101,7 @@

& > span {
color: $interactive-01;
@include type.type-style("heading-compact-01");
@include type.type-style('heading-compact-01');
}

svg {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use '@carbon/styles/scss/spacing';
@import '@openmrs/esm-styleguide/src/vars';
@use '@openmrs/esm-styleguide/src/vars' as *;

$icon-button-size: 2.5rem;
$actionPanelOffset: 3rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { navigate } from '@openmrs/esm-navigation';
import { reportError } from '@openmrs/esm-error-handling';
import { escapeRegExp } from 'lodash-es';
import { type SingleSpaCustomEventDetail } from 'single-spa';
import styles from './workspace-notification.module.scss';
import {
cancelPrompt,
canCloseWorkspaceWithoutPrompting,
Expand All @@ -16,6 +15,7 @@ import {
resetWorkspaceStore,
useWorkspaces,
} from '../workspaces';
import styles from './workspace-notification.module.scss';

export interface WorkspaceNotificationProps {
contextKey: string;
Expand Down
1 change: 1 addition & 0 deletions packages/shell/esm-app-shell/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"i18next-browser-languagedetector": "^6.1.8",
"import-map-overrides": "^3.0.0",
"lodash-es": "4.17.21",
"mini-css-extract-plugin": "^2.9.0",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-i18next": "^11.18.6",
Expand Down
1 change: 1 addition & 0 deletions packages/shell/esm-app-shell/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ module.exports = (env, argv = {}) => {
isProd &&
new MiniCssExtractPlugin({
filename: 'openmrs.[contenthash].css',
ignoreOrder: true,
}),
new DefinePlugin({
'process.env.BUILD_VERSION': JSON.stringify(`${version}-${timestamp}`),
Expand Down
2 changes: 1 addition & 1 deletion packages/tooling/openmrs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"html-webpack-plugin": "^5.5.0",
"inquirer": "^7.3.3",
"lodash-es": "^4.17.21",
"mini-css-extract-plugin": "^2.4.5",
"mini-css-extract-plugin": "^2.9.0",
"node-watch": "^0.7.4",
"npm-registry-fetch": "^14.0.3",
"pacote": "^15.0.0",
Expand Down
12 changes: 7 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2959,6 +2959,7 @@ __metadata:
i18next-browser-languagedetector: "npm:^6.1.8"
import-map-overrides: "npm:^3.0.0"
lodash-es: "npm:4.17.21"
mini-css-extract-plugin: "npm:^2.9.0"
react: "npm:^18.1.0"
react-dom: "npm:^18.1.0"
react-i18next: "npm:^11.18.6"
Expand Down Expand Up @@ -13498,14 +13499,15 @@ __metadata:
languageName: node
linkType: hard

"mini-css-extract-plugin@npm:^2.4.5":
version: 2.6.1
resolution: "mini-css-extract-plugin@npm:2.6.1"
"mini-css-extract-plugin@npm:^2.9.0":
version: 2.9.0
resolution: "mini-css-extract-plugin@npm:2.9.0"
dependencies:
schema-utils: "npm:^4.0.0"
tapable: "npm:^2.2.1"
peerDependencies:
webpack: ^5.0.0
checksum: 10/368e104453b7631c54a9c537077a4824383892f126259fc0cc0139b356f99e9d3c082297eb933c9c301166bf93f71fdeb9a8bdaef85f71a061300d5a16234f69
checksum: 10/4c9ee9c0c6160a64a4884d5a92a1a5c0b68d556cd00f975cf6c8a79b51ac90e6130a37b3832b17d377d0cb1b31c0313c8c023458d4f69e95fe3424a8b43d834f
languageName: node
linkType: hard

Expand Down Expand Up @@ -14286,7 +14288,7 @@ __metadata:
html-webpack-plugin: "npm:^5.5.0"
inquirer: "npm:^7.3.3"
lodash-es: "npm:^4.17.21"
mini-css-extract-plugin: "npm:^2.4.5"
mini-css-extract-plugin: "npm:^2.9.0"
node-watch: "npm:^0.7.4"
npm-registry-fetch: "npm:^14.0.3"
pacote: "npm:^15.0.0"
Expand Down
Loading