Skip to content

Commit

Permalink
Reorganise (put modules at top level)
Browse files Browse the repository at this point in the history
  • Loading branch information
davidje13 committed Oct 28, 2023
1 parent 9338577 commit 23c7324
Show file tree
Hide file tree
Showing 325 changed files with 69 additions and 58 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ jobs:
with:
node-version: "20"
cache: npm
cache-dependency-path: 'src/*/package-lock.json'
cache-dependency-path: |
backend/package-lock.json
frontend/package-lock.json
e2e/package-lock.json
- name: Build and Test
run: PARALLEL_BUILD=false PARALLEL_E2E=false EXPLICIT_WAIT_TIMEOUT=20000 TEST_TIMEOUT=60000 npm test
- name: Bundle
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
- PARALLEL_BUILD=false PARALLEL_E2E=false EXPLICIT_WAIT_TIMEOUT=20000 TEST_TIMEOUT=60000
cache:
directories:
- src/backend/node_modules
- src/frontend/node_modules
- src/e2e/node_modules
- backend/node_modules
- frontend/node_modules
- e2e/node_modules
- build/node_modules
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ See [SERVICES.md](./SERVICES.md) and

The full list of recognised configuration options (and their default
values) can be found in
[config/default.json](../src/backend/src/config/default.json)
[config/default.json](./backend/src/config/default.json)
(nested properties are joined and written in `UPPER_SNAKE_CASE`).

Typical values to configure are:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/backend/package.json → backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"lint:tsc": "tsc",
"lint:prettier": "prettier --check .",
"lint": "tsc && prettier --check .",
"build": "rm -rf build && rollup --config rollup.config.mjs && cp -r src/static build/static && cp policy.json build && chmod +x build/index.js",
"build": "rm -rf build && rollup --config rollup.config.mjs && cp -r src/static policy.json build && chmod +x build/index.js",
"start": "npm run build && NODE_ENV=development build/index.js",
"test": "lean-test --preprocess tsc --parallel"
},
Expand Down
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.
12 changes: 6 additions & 6 deletions ci/gitlab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ node:21:
- PARALLEL_BUILD=false PARALLEL_E2E=false EXPLICIT_WAIT_TIMEOUT=20000 TEST_TIMEOUT=60000 DOCKER=true npm test

cache:
- key: { files: [src/backend/package-lock.json] }
paths: [src/backend/node_modules]
- key: { files: [src/frontend/package-lock.json] }
paths: [src/frontend/node_modules]
- key: { files: [src/e2e/package-lock.json] }
paths: [src/e2e/node_modules]
- key: { files: [backend/package-lock.json] }
paths: [backend/node_modules]
- key: { files: [frontend/package-lock.json] }
paths: [frontend/node_modules]
- key: { files: [e2e/package-lock.json] }
paths: [e2e/node_modules]
8 changes: 4 additions & 4 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ HEADLESS=false npm run test:e2e
```

The server logs generated during the end-to-end test run are written
to `src/e2e/build/app.log`.
to `e2e/build/app.log`.

## Building

Expand Down Expand Up @@ -117,19 +117,19 @@ and build / test dependencies should be installed with `--save-dev`.
### Examples

```sh
cd src/frontend
cd frontend
npm install --save react
npm install --save-dev jest
```

```sh
cd src/backend
cd backend
npm install --save express
npm install --save-dev supertest
```

```sh
cd src/e2e
cd e2e
npm install --save-dev selenium-webdriver
```

Expand Down
File renamed without changes.
4 changes: 4 additions & 0 deletions e2e/.prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"singleQuote": true,
"trailingComma": "all"
}
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.
20 changes: 10 additions & 10 deletions src/e2e/src/basicflow.test.ts → e2e/tests/basicflow.test.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { buildDriver } from './helpers/selenium';
import { getDownloadedBytes, Mbps } from './helpers/downloadProfiler';
import { type Welcome } from './pages/Welcome';
import { type Password } from './pages/Password';
import { type RetroCreate } from './pages/RetroCreate';
import { type RetroList } from './pages/RetroList';
import { type Retro } from './pages/Retro';
import { type RetroArchiveList } from './pages/RetroArchiveList';
import { type RetroArchive } from './pages/RetroArchive';
import { SiteMap } from './pages/SiteMap';
import { buildDriver } from '../helpers/selenium';
import { getDownloadedBytes, Mbps } from '../helpers/downloadProfiler';
import { type Welcome } from '../pages/Welcome';
import { type Password } from '../pages/Password';
import { type RetroCreate } from '../pages/RetroCreate';
import { type RetroList } from '../pages/RetroList';
import { type Retro } from '../pages/Retro';
import { type RetroArchiveList } from '../pages/RetroArchiveList';
import { type RetroArchive } from '../pages/RetroArchive';
import { SiteMap } from '../pages/SiteMap';
import 'lean-test';

const uniqueID = `${process.env['SELENIUM_BROWSER']}-${Date.now()}`;
Expand Down
2 changes: 1 addition & 1 deletion src/e2e/tsconfig.json → e2e/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
"typeAcquisition": {
"enable": false
},
"include": ["src"]
"include": ["helpers", "pages", "tests"]
}
File renamed without changes.
File renamed without changes.
4 changes: 4 additions & 0 deletions frontend/.prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"singleQuote": true,
"trailingComma": "all"
}
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.
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.
Loading

0 comments on commit 23c7324

Please sign in to comment.