Skip to content

Commit 23c7324

Browse files
committed
Reorganise (put modules at top level)
1 parent 9338577 commit 23c7324

File tree

325 files changed

+69
-58
lines changed

Some content is hidden

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

325 files changed

+69
-58
lines changed

.github/workflows/ci.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ jobs:
2020
with:
2121
node-version: "20"
2222
cache: npm
23-
cache-dependency-path: 'src/*/package-lock.json'
23+
cache-dependency-path: |
24+
backend/package-lock.json
25+
frontend/package-lock.json
26+
e2e/package-lock.json
2427
- name: Build and Test
2528
run: PARALLEL_BUILD=false PARALLEL_E2E=false EXPLICIT_WAIT_TIMEOUT=20000 TEST_TIMEOUT=60000 npm test
2629
- name: Bundle

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111
- PARALLEL_BUILD=false PARALLEL_E2E=false EXPLICIT_WAIT_TIMEOUT=20000 TEST_TIMEOUT=60000
1212
cache:
1313
directories:
14-
- src/backend/node_modules
15-
- src/frontend/node_modules
16-
- src/e2e/node_modules
14+
- backend/node_modules
15+
- frontend/node_modules
16+
- e2e/node_modules
1717
- build/node_modules

README.md

+1-1
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/backend/package.json backend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"lint:tsc": "tsc",
77
"lint:prettier": "prettier --check .",
88
"lint": "tsc && prettier --check .",
9-
"build": "rm -rf build && rollup --config rollup.config.mjs && cp -r src/static build/static && cp policy.json build && chmod +x build/index.js",
9+
"build": "rm -rf build && rollup --config rollup.config.mjs && cp -r src/static policy.json build && chmod +x build/index.js",
1010
"start": "npm run build && NODE_ENV=development build/index.js",
1111
"test": "lean-test --preprocess tsc --parallel"
1212
},
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

ci/gitlab.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ node:21:
2020
- PARALLEL_BUILD=false PARALLEL_E2E=false EXPLICIT_WAIT_TIMEOUT=20000 TEST_TIMEOUT=60000 DOCKER=true npm test
2121

2222
cache:
23-
- key: { files: [src/backend/package-lock.json] }
24-
paths: [src/backend/node_modules]
25-
- key: { files: [src/frontend/package-lock.json] }
26-
paths: [src/frontend/node_modules]
27-
- key: { files: [src/e2e/package-lock.json] }
28-
paths: [src/e2e/node_modules]
23+
- key: { files: [backend/package-lock.json] }
24+
paths: [backend/node_modules]
25+
- key: { files: [frontend/package-lock.json] }
26+
paths: [frontend/node_modules]
27+
- key: { files: [e2e/package-lock.json] }
28+
paths: [e2e/node_modules]

docs/CONTRIBUTING.md

+4-4
File renamed without changes.

e2e/.prettierrc.json

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"singleQuote": true,
3+
"trailingComma": "all"
4+
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/e2e/src/basicflow.test.ts e2e/tests/basicflow.test.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { buildDriver } from './helpers/selenium';
2-
import { getDownloadedBytes, Mbps } from './helpers/downloadProfiler';
3-
import { type Welcome } from './pages/Welcome';
4-
import { type Password } from './pages/Password';
5-
import { type RetroCreate } from './pages/RetroCreate';
6-
import { type RetroList } from './pages/RetroList';
7-
import { type Retro } from './pages/Retro';
8-
import { type RetroArchiveList } from './pages/RetroArchiveList';
9-
import { type RetroArchive } from './pages/RetroArchive';
10-
import { SiteMap } from './pages/SiteMap';
1+
import { buildDriver } from '../helpers/selenium';
2+
import { getDownloadedBytes, Mbps } from '../helpers/downloadProfiler';
3+
import { type Welcome } from '../pages/Welcome';
4+
import { type Password } from '../pages/Password';
5+
import { type RetroCreate } from '../pages/RetroCreate';
6+
import { type RetroList } from '../pages/RetroList';
7+
import { type Retro } from '../pages/Retro';
8+
import { type RetroArchiveList } from '../pages/RetroArchiveList';
9+
import { type RetroArchive } from '../pages/RetroArchive';
10+
import { SiteMap } from '../pages/SiteMap';
1111
import 'lean-test';
1212

1313
const uniqueID = `${process.env['SELENIUM_BROWSER']}-${Date.now()}`;

src/e2e/tsconfig.json e2e/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
"typeAcquisition": {
1212
"enable": false
1313
},
14-
"include": ["src"]
14+
"include": ["helpers", "pages", "tests"]
1515
}
File renamed without changes.
File renamed without changes.

frontend/.prettierrc.json

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"singleQuote": true,
3+
"trailingComma": "all"
4+
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)