Skip to content

Commit 5386ff8

Browse files
authored
Fixes and updates (#25)
* staging workflow * fix tests (1st try) * fix tests (2nd try) * clean up the mess * generate new lock.files * fix select overflow * fix configurations * fix generated .eslintcahce file in root folder facebook/create-react-app#10161 * Update code-style.yml * also update the shared module * Fix broken stylongs and update shared-modules * ignore tsconfig.tsbuildinfo * fixx * fix test configuration * fix gh actions
1 parent c65e346 commit 5386ff8

File tree

74 files changed

+6617
-11906
lines changed

Some content is hidden

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

74 files changed

+6617
-11906
lines changed

.github/workflows/code-style.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
runs-on: ubuntu-latest
77

88
steps:
9-
- uses: actions/checkout@v2
9+
- uses: actions/checkout@v3
1010
- uses: actions/setup-node@v3
1111
with:
1212
node-version: 16

.github/workflows/system-tests-and-deploy.yml

+13-7
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,29 @@ on:
88
branches:
99
- staging
1010
paths-ignore:
11-
- 'documentation/**'
12-
- 'README.md'
11+
- "documentation/**"
12+
- "README.md"
1313

1414
jobs:
1515
system-tests:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Check out repository code
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v3
2020

2121
# This would cause all other tests to be skipped
2222
- name: Make sure we have no focused system-tests
2323
run: |
2424
test "$(grep -r 'test.only' ./system-tests/src/ | wc -l)" -eq 0
2525
26+
- name: set npm version
27+
run: npm install -g [email protected]
28+
2629
- name: Setup system test environment
2730
run: npm ci
2831
working-directory: ./system-tests/
2932

30-
- name: Install, test and build server
33+
- name: Install, test and build server
3134
run: |
3235
npm ci
3336
npm test
@@ -44,19 +47,22 @@ jobs:
4447
name: test-results
4548
path: ./system-tests/test-results/
4649
if-no-files-found: ignore
47-
50+
4851
- uses: actions/upload-artifact@v2
4952
if: failure()
5053
with:
5154
name: playwright-html-report
5255
path: ./system-tests/playwright-report/index.html
5356
if-no-files-found: ignore
54-
57+
5558
typecheck:
5659
runs-on: ubuntu-latest
5760
steps:
5861
- name: Check out repository code
59-
uses: actions/checkout@v2
62+
uses: actions/checkout@v3
63+
64+
- name: set npm version
65+
run: npm install -g [email protected]
6066

6167
- name: Run npm ci in repo root
6268
run: npm ci

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ yarn-error.log*
4040
/playwright-report/
4141
/playwright/.cache/
4242

43-
*tsbuildinfo
43+
tsconfig.tsbuildinfo

bin/ktunnel

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
ktunnel expose factorial-analysis 80:3008
2+
3+
internal_url: http://factorial-analysis.default.svc.cluster.local:80/api/service-info
4+
5+
bin/pods
6+
bin/shell >

jest.config.js

+14-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
1-
/** @type {import('jest').Config} */
2-
const config = {
1+
/* eslint-disable @typescript-eslint/no-var-requires */
2+
/* eslint-disable i18next/no-literal-string */
3+
4+
const nextJest = require("next/jest")
5+
6+
// Providing the path to your Next.js app which will enable loading next.config.js and .env files
7+
const createJestConfig = nextJest({ dir: "./" })
8+
9+
// Any custom config you want to pass to Jest
10+
const customJestConfig = {
11+
preset: "ts-jest",
12+
testEnvironment: "jsdom",
313
testPathIgnorePatterns: ["<rootDir>/system-tests/"],
414
}
515

6-
module.exports = config
16+
// createJestConfig is exported in this way to ensure that next/jest can load the Next.js configuration, which is async
17+
module.exports = createJestConfig(customJestConfig)

next.config.js

+1-7
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@ const config = {
1414
source: "/(.*)",
1515
headers: externallyEmbeddableIFrameResponseHeaders,
1616
},
17-
// This application is meant to be used with a sandboxed iframe.
18-
// That causes that we need cors headers for fonts.
19-
{
20-
source: "/(.*).woff2",
21-
headers: [{ key: "Access-Control-Allow-Origin", value: "*" }],
22-
},
2317
]
2418
},
2519
output: "standalone",
@@ -38,7 +32,7 @@ const config = {
3832
compiler: {
3933
emotion: {
4034
autoLabel: "always",
41-
labelFormat: "[dirname]--[filename]--[local]",
35+
// labelFormat: "[dirname]--[filename]--[local]",
4236
},
4337
},
4438
experimental: {

0 commit comments

Comments
 (0)