Skip to content

Commit fc920be

Browse files
committed
Fikser common client import
1 parent a3f9543 commit fc920be

11 files changed

+723
-225
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@ cms-assets
3131
/Dockerfile-local
3232
/xp-archive/server/src/_ssr-dist/
3333
/legacy-archive/server/src/_ssr-dist/
34+
/legacy-archive/.cache/

common/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"type": "module",
66
"devDependencies": {
77
"@navikt/ds-react": "5",
8+
"@navikt/ds-css": "5",
89
"@types/express": "4.17.21",
910
"express": "4",
1011
"lru-cache": "11",

common/src/client/AppLayout.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import './global.css';
2+
13
import React from 'react';
24
import { AppTopSection } from './top-section/AppTopSection';
35

common/src/client/global.css

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
@import '@navikt/ds-css/dist/index.css';
2+
3+
body {
4+
min-height: 100%;
5+
max-height: 100%;
6+
}

legacy-archive/client/main-client.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import './global.css';
2-
31
import React from 'react';
42
import ReactDOM from 'react-dom/client';
53
import { App } from './components/App';

legacy-archive/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
type='image/svg+xml'
1717
/>
1818
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
19-
<title>NAV CMS-arkiv</title>
19+
<title>Nav Enonic CMS arkiv (2006 - 2019)</title>
2020
</head>
2121
<body>
2222
<div id="root"><!--ssr-app-html--></div>

legacy-archive/vite.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { defineConfig, loadEnv } from 'vite';
22
import react from '@vitejs/plugin-react';
3-
import visualizer from 'rollup-plugin-visualizer';
43
import tsconfigPaths from 'vite-tsconfig-paths';
4+
import visualizer from 'rollup-plugin-visualizer';
55

66
// https://vitejs.dev/config/
77
export default defineConfig(({ mode }) => {

package-lock.json

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)