Skip to content

Commit d977f49

Browse files
eirikveirikv
authored
feat. Bygg frontend med vite istedenfor craco (#1193)
* feat. Bygg frontend med vite istedenfor craco * Fjernet craco til fordel for vite * Fjernet ubrukte pakker * Fjernet enzyme tester som kun sjekket på lengde * Feat/npm (#1194) * feat. Flyttet fra yarn til npm + oppdatert minor/patch * feat. Oppdatert server og major version * fix. ikke bruk esm for server + legge til cross-env * feat. Oppgradert nav-dekoratør til nyeste versjon * feat. Removed webpack config for server * feat. Korrigert csp oppsett med ny nav header * feat. Siste oppdateringer * fix. Korrigert path for assets og maps * feat. Kjørt prettier + oppdatert commit hook (#1195) * feat. Kjørt prettier + oppdatert commit hook * feat. Sjekk at npm blir brukt og ikke yarn * fix. Fix manglende lodash * fix. Korrigert path i docker container * fix. Forbedret CSP for modia * fix. Forbedret CSP for modia * fix. Forbedret CSP for modia * fix. Fikset feil på ikoner * chore. Bump siste versjon av avhengighet
1 parent 686a6a5 commit d977f49

File tree

423 files changed

+13107
-21210
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

423 files changed

+13107
-21210
lines changed

‎.dockerignore

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
!node_modules
33
!server
44
!build
5-
!src/setupProxy.js
65
!src/whitelist.js
76
!server.js
87
!dist

‎.editorconfig

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[*]
2+
charset = utf-8
3+
end_of_line = lf
4+
indent_size = 4
5+
indent_style = space
6+
insert_final_newline = true
7+
max_line_length = 120

‎.github/workflows/bygg-og-deploy-dev.yml

+27-12
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,35 @@ jobs:
1818
steps:
1919
- name: Sjekk ut kode
2020
uses: actions/checkout@v3
21-
- name: Server yarn install
22-
working-directory: ./server
23-
run: yarn install
24-
- name: Server yarn build
21+
- name: Setup node.js
22+
uses: actions/setup-node@v3
23+
with:
24+
registry-url: 'https://npm.pkg.github.com'
25+
- name: Install
26+
run: npm ci
27+
env:
28+
NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
29+
- name: Server install
2530
working-directory: ./server
26-
run: yarn build
27-
- name: Frontend yarn install
28-
run: yarn install --frozen-lockfile
31+
run: npm ci
32+
env:
33+
NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
34+
- name: Typescript
35+
run: npm run ts
36+
- name: Prettier
37+
run: npm run prettier
2938
- name: Kjør tester
30-
run: yarn test
31-
- name: Frontend yarn build
32-
run: yarn build
33-
- name: Sett opp sentry release
34-
run: yarn run release
39+
run: npm run test
40+
- name: Build
41+
run: npm run build
42+
- name: Server build
43+
working-directory: ./server
44+
run: npm run build
45+
- name: Sentry release
46+
run: npm run release
47+
- name: Remove source maps
48+
run: |
49+
rm dist/client/assets/*.map
3550
- name: Bygg, tag og push Docker-image
3651
run: |
3752
echo ${GITHUB_TOKEN} | docker login ghcr.io -u ${GITHUB_REPOSITORY} --password-stdin

‎.github/workflows/bygg-og-deploy-master.yml

+27-12
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,35 @@ jobs:
2020
steps:
2121
- name: Sjekk ut kode
2222
uses: actions/checkout@v3
23-
- name: Server yarn install
24-
working-directory: ./server
25-
run: yarn install --frozen-lockfile
26-
- name: Server yarn build
23+
- name: Setup node.js
24+
uses: actions/setup-node@v3
25+
with:
26+
registry-url: 'https://npm.pkg.github.com'
27+
- name: Install
28+
run: npm ci
29+
env:
30+
NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
31+
- name: Server install
2732
working-directory: ./server
28-
run: yarn build
29-
- name: Installer avhengigheter
30-
run: yarn install --frozen-lockfile
33+
run: npm ci
34+
env:
35+
NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
36+
- name: Typescript
37+
run: npm run ts
38+
- name: Prettier
39+
run: npm run prettier
3140
- name: Kjør tester
32-
run: yarn test
33-
- name: Bygg
34-
run: yarn run build
35-
- name: Sett opp sentry release
36-
run: yarn run release
41+
run: npm run test
42+
- name: Build
43+
run: npm run build
44+
- name: Server build
45+
working-directory: ./server
46+
run: npm run build
47+
- name: Sentry release
48+
run: npm run release
49+
- name: Fjerne source maps
50+
run: |
51+
rm dist/client/assets/*.map
3752
- name: Bygg, tag og push Docker-image
3853
run: |
3954
echo ${GITHUB_TOKEN} | docker login ghcr.io -u ${GITHUB_REPOSITORY} --password-stdin

‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/coverage
99

1010
# production
11-
/build
11+
/server/dist
1212
/dist
1313
# misc
1414
.DS_Store
@@ -24,4 +24,4 @@ yarn-debug.log*
2424
yarn-error.log*
2525
.firebase/
2626

27-
debug.log
27+
debug.log

‎.husky/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_

‎.husky/pre-commit

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
npx lint-staged

‎.prettierignore

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Ignore files:
2-
build
3-
tsconfig.json
2+
*.yaml
3+
.github
4+
dist
5+
package-lock.json
46
tsconfig.base.json
7+
tsconfig.json
58
tslint.json
6-
package-lock.json
7-
.github

‎.prettierrc

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# .prettierrc or .prettierrc.yaml
2-
trailingComma: "es5"
3-
tabWidth: 4
4-
semi: true
5-
singleQuote: true
61
printWidth: 120
2+
singleQuote: true
3+
tabWidth: 4

‎@types/react-day-picker-moment.d.ts

-28
This file was deleted.

‎Dockerfile

+2-15
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,9 @@ RUN npm config set unsafe-perm=true
55

66
WORKDIR /app
77

8+
COPY ./dist .
89

9-
# yarn installl -> server/node_modules
10-
#yarn build -> ../dist
11-
12-
# COPY dist -> dist // output path i webpack config definerer dette.
13-
#COPY server/node_modules -> dist/node_modules // slik at server.js ligger i samme path folder. Og treffer dependencies.
14-
15-
COPY ./dist ./dist
16-
COPY ./server/node_modules ./dist/node_modules
17-
18-
19-
COPY ./build ./build
2010
EXPOSE 3000
2111

2212
ENTRYPOINT ["sh", "-c"]
23-
CMD ["node dist/server.js"]
24-
25-
26-
# NODE_ENV = production // NODE_ENV = development
13+
CMD ["node server/index.cjs"]

‎README.md

+8-15
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
# Tiltaksgjennomføring
22

33
Starte via Yarn med REST-API (krever at https://github.com/navikt/tiltaksgjennomforing-api også kjører lokalt).
4-
`yarn start`
5-
6-
Starte med mocket backend
7-
`yarn run mock`
8-
9-
Starte med ordinær backend
10-
`yarn run server`
4+
`npm run start`
115

126
Bygg image
137
`docker build -t tiltaksgjennomforing .`
@@ -17,14 +11,13 @@ Kjør container
1711

1812
Åpnes i browser: [http://localhost:3000/tiltaksgjennomforing](http://localhost:3000/tiltaksgjennomforing)
1913

20-
### Testing
14+
## Installere
2115

22-
Vi bruker jest for å teste. `yarn test` kjører testene og setter dem i watch modus.
16+
Før du kjører `install` så må du sette opp autentisering mot @navikt.
2317

24-
Enkle regler for testing her:
18+
`@navikt` pakker publiseres nå kun i GitHub Packages registry'et.
19+
For å kunne installere nyere versjoner må pakker fra @navikt-orgen scopes til GitHub Packages.
2520

26-
- Alle `.tsx`-filer skal ha en tilsvarende `spec.tsx`-fil. Disse filene skal inneholde en komponent
27-
som default export. Andre funksjoner exporteres utenom for å testes i egen tester.
28-
- Kun lag en rendertest per `spec.tsx`-fil om du har behov for å teste at variasjoner rendrer riktig
29-
kan det godt være at du har lagt deg på feil abstraksonsnivå. Logikk bør wrappes i funksjoner og testes
30-
i egne tester i `spec.tsx`-fila.
21+
1. Opprett et [PAT på github](https://github.com/settings/tokens) med `read:package` scope
22+
2. Kjør `npm login --registry=https://npm.pkg.github.com --auth-type=legacy` (bruk PAT fra forrige steg som passord ved login)
23+
3. Legg til `@navikt:registry=https://npm.pkg.github.com` i `.npmrc`.

‎_scripts/generate-tests.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const glob = require('glob');
22
const path = require('path');
33
const fs = require('fs');
4-
const createSimpleTest = componentName => {
4+
const createSimpleTest = (componentName) => {
55
return `
66
import React from 'react';
77
import { shallow } from 'enzyme';
@@ -12,24 +12,24 @@ test('Test that <${componentName}> renders correctly', () => {
1212
expect(wrapper).toHaveLength(1);
1313
});`;
1414
};
15-
const ensureFileExists = filePath => {
15+
const ensureFileExists = (filePath) => {
1616
if (!fs.existsSync(filePath)) {
1717
console.log('Creating an new file: ' + relativeFilePath(filePath));
1818
fs.closeSync(fs.openSync(filePath, 'w'));
1919
}
2020
};
21-
const relativeFilePath = absFilePath => {
21+
const relativeFilePath = (absFilePath) => {
2222
const rootDir = path.join(__dirname, '..');
2323
return absFilePath.replace(rootDir, '');
2424
};
2525
const pathToTest = path.join(__dirname, '..', 'src/**/*.tsx');
2626

27-
glob(pathToTest, function(er, files) {
27+
glob(pathToTest, function (er, files) {
2828
if (er) {
2929
console.error(er);
3030
process.exit(1);
3131
}
32-
files.forEach(filePath => {
32+
files.forEach((filePath) => {
3333
if (filePath.slice(-8) !== 'spec.tsx') {
3434
const specFilePath = filePath.replace('tsx', 'spec.tsx');
3535
ensureFileExists(specFilePath);

‎craco.config.js

-49
This file was deleted.

‎index.html

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<!doctype html>
2+
<html lang="no">
3+
<head>
4+
<meta charset="utf-8" />
5+
<link rel="icon" href="%BASE_URL%/favicon.ico" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
7+
<meta name="theme-color" content="#000000" />
8+
<link rel="manifest" href="%BASE_URL%/manifest.json" />
9+
<title>Tiltaksgjennomføring</title>
10+
</head>
11+
<body>
12+
<noscript>You need to enable JavaScript to run this app.</noscript>
13+
<div id="root" aria-live="polite" class="tiltaksgjennomforing"></div>
14+
<script type="module" src="/src/index.tsx"></script>
15+
</body>
16+
</html>

‎jest.config.js

-5
This file was deleted.

‎less-watch-compiler.config.json

-6
This file was deleted.

‎nais/dev-gcp-ekstern.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@
88
"proxy-cluster": "dev-fss"
99
"aad-redirect-url": "https://tiltaksgjennomforing.ekstern.dev.nav.no/oauth2/callback"
1010
"notifikasjon-audience": "dev-gcp:fager:notifikasjon-bruker-api"
11-
"decorator-host": "dekoratoren.ekstern.dev.nav.no"
1211
"arbeidsgiver-dialog": "https://navdialog--sit2.sandbox.my.site.com/arbeidsgiverdialogtest/s"

‎nais/dev-gcp-intern.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@
1010
"decorator-internal": "https://internarbeidsflatedecorator-q0.dev.adeo.no"
1111
"decorator-internal-script": "/internarbeidsflatedecorator/v2.1/static/js/head.v2.min.js"
1212
"decorator-internal-styling": "/internarbeidsflatedecorator/v2.1/static/css/main.css"
13-
"decorator-host": "dekoratoren.ekstern.dev.nav.no"

‎nais/nais-gcp-ekstern.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ spec:
6060
namespace: arbeidsgiver
6161
- application: notifikasjon-bruker-api
6262
namespace: fager
63+
- application: nav-dekoratoren
64+
namespace: personbruker
6365
external:
6466
- host: tiltak-proxy.{{{proxy-cluster}}}-pub.nais.io
65-
- host: '{{{decorator-host}}}'

‎nais/nais-gcp-intern.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ spec:
5858
cluster: '{{{proxy-cluster}}}'
5959
- application: tiltak-stillingstitler
6060
namespace: arbeidsgiver
61+
- application: nav-dekoratoren
62+
namespace: personbruker
6163
external:
6264
- host: tiltak-proxy.{{{proxy-cluster}}}-pub.nais.io
63-
- host: '{{{decorator-host}}}'

0 commit comments

Comments
 (0)