Skip to content

Commit

Permalink
Merge Main and Navigation apps (#894)
Browse files Browse the repository at this point in the history
* Merge Main and Navigation apps
  • Loading branch information
kshmidt-digma committed Jun 14, 2024
1 parent 77b5422 commit 931fe6f
Show file tree
Hide file tree
Showing 30 changed files with 303 additions and 226 deletions.
7 changes: 6 additions & 1 deletion .babelrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@
}
],
"@babel/preset-typescript",
"@babel/preset-react"
[
"@babel/preset-react",
{
"runtime": "automatic"
}
]
],
"plugins": [
[
Expand Down
11 changes: 1 addition & 10 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { StorybookConfig } from "@storybook/react-webpack5";
const config: StorybookConfig = {
stories: ["../src/**/*.mdx", "../src/**/*.stories.tsx"],
addons: [
"@storybook/addon-webpack5-compiler-swc",
"@storybook/addon-webpack5-compiler-babel",
"@storybook/addon-links",
"@storybook/addon-essentials",
"@storybook/addon-interactions",
Expand All @@ -16,15 +16,6 @@ const config: StorybookConfig = {
strictMode: true
}
},
swc: () => ({
jsc: {
transform: {
react: {
runtime: "automatic"
}
}
}
}),
core: {
disableTelemetry: true
},
Expand Down
1 change: 1 addition & 0 deletions .storybook/preview-body.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
window.isDockerComposeInstalled = true;
window.isMicrometerProject;
window.isDigmathonModeEnabled = true;
window.isLoggingEnabled = true;

window.assetsRefreshInterval;

Expand Down
104 changes: 57 additions & 47 deletions package-lock.json

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

4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"build:documentation:dev": "webpack --config webpack.dev.ts --env app=documentation",
"build:installation-wizard:dev": "webpack --config webpack.dev.ts --env app=installationWizard",
"build:main:dev": "webpack --config webpack.dev.ts --env app=main",
"build:navigation:dev": "webpack --config webpack.dev.ts --env app=navigation",
"build:notifications:dev": "webpack --config webpack.dev.ts --env app=notifications",
"build:recentActivity:dev": "webpack --config webpack.dev.ts --env app=recentActivity",
"build:troubleshooting:dev": "webpack --config webpack.dev.ts --env app=troubleshooting",
Expand All @@ -25,7 +24,6 @@
"build:documentation:prod": "webpack --config webpack.prod.ts --env app=documentation",
"build:installation-wizard:prod": "webpack --config webpack.prod.ts --env app=installationWizard",
"build:main:prod": "webpack --config webpack.prod.ts --env app=main",
"build:navigation:prod": "webpack --config webpack.prod.ts --env app=navigation",
"build:notifications:prod": "webpack --config webpack.prod.ts --env app=notifications",
"build:recentActivity:prod": "webpack --config webpack.prod.ts --env app=recentActivity",
"build:troubleshooting:prod": "webpack --config webpack.prod.ts --env app=troubleshooting",
Expand Down Expand Up @@ -59,7 +57,7 @@
"@storybook/addon-essentials": "^8.1.6",
"@storybook/addon-interactions": "^8.1.6",
"@storybook/addon-links": "^8.1.6",
"@storybook/addon-webpack5-compiler-swc": "^1.0.3",
"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
"@storybook/blocks": "^8.1.6",
"@storybook/react": "^8.1.6",
"@storybook/react-webpack5": "^8.1.6",
Expand Down
1 change: 0 additions & 1 deletion src/components/Assets/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ export const Container = styled.div`
height: 100%;
display: flex;
flex-direction: column;
background: ${({ theme }) => theme.colors.v3.surface.primary};
`;

export const Header = styled.div`
Expand Down
1 change: 0 additions & 1 deletion src/components/Errors/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ export const Container = styled.div`
display: flex;
flex-direction: column;
height: 100%;
background: ${({ theme }) => theme.colors.v3.surface.primary};
`;
Loading

0 comments on commit 931fe6f

Please sign in to comment.