Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into logic-1
Browse files Browse the repository at this point in the history
  • Loading branch information
danielnaab committed Jan 29, 2025
2 parents cbcc1cd + b2bfed0 commit 99d16f2
Show file tree
Hide file tree
Showing 111 changed files with 4,620 additions and 4,333 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/_validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
playwright_version:
description: Installed playwright version
required: false
default: "1.48.1"
default: '1.50.0'
type: string

jobs:
Expand Down Expand Up @@ -69,7 +69,6 @@ jobs:
- name: Make directory for build artifacts
run: mkdir -p output/build-artifacts


- name: Spotlight app performance budget
run: pnpm --filter @atj/spotlight size:ci > output/build-artifacts/spotlight-size-output.txt

Expand All @@ -95,7 +94,7 @@ jobs:
- name: Setup Terraform
uses: hashicorp/setup-terraform@v3
with:
terraform_version: "1.10.4"
terraform_version: '1.10.4'

- name: Initialize Terraform CDK configuration
shell: bash
Expand Down
9 changes: 1 addition & 8 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,8 @@ jobs:
app-name: server-doj
tag-name: ${{ github.ref_name }}

build-image-kansas:
uses: ./.github/workflows/_docker-build-image.yml
secrets: inherit
with:
app-name: server-kansas
tag-name: ${{ github.ref_name }}

deploy:
needs: [build-image-doj, build-image-kansas]
needs: [build-image-doj]
uses: ./.github/workflows/_terraform-apply.yml
secrets: inherit
with:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
_site
.turbo/
.vscode/
.idea/
coverage/
html/
node_modules/
Expand Down
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
pnpm lint
pnpm format
pnpm test
pnpm test:ci
1 change: 0 additions & 1 deletion apps/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"test": "vitest run --coverage"
},
"dependencies": {
"@atj/dependency-graph": "workspace:*",
"@atj/infra-core": "workspace:*",
"commander": "^11.1.0"
}
Expand Down
9 changes: 0 additions & 9 deletions apps/cli/src/cli-controller/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Command } from 'commander';

import { createDependencyGraph } from '@atj/dependency-graph';
import type { Context } from './types.js';
import { addSecretCommands } from './secrets.js';

Expand All @@ -16,14 +15,6 @@ export const CliController = (ctx: Context) => {
ctx.console.log('Hello!');
});

cli
.command('create-workspace-graph')
.description('create a dependency graph of projects in the workspace')
.action(async () => {
await createDependencyGraph(ctx.workspaceRoot);
ctx.console.log('wrote workspace dependency graph');
});

addSecretCommands(ctx, cli);

return cli;
Expand Down
1 change: 1 addition & 0 deletions apps/server-doj/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export const createCustomServer = async (db: DatabaseContext): Promise<any> => {
'[email protected]',
'[email protected]',
'[email protected]',
'[email protected]',
// DOJ test users
'[email protected]',
'[email protected]',
Expand Down
2 changes: 0 additions & 2 deletions apps/server-kansas/.gitignore

This file was deleted.

3 changes: 0 additions & 3 deletions apps/server-kansas/README.md

This file was deleted.

23 changes: 0 additions & 23 deletions apps/server-kansas/package.json

This file was deleted.

22 changes: 0 additions & 22 deletions apps/server-kansas/src/index.ts

This file was deleted.

26 changes: 0 additions & 26 deletions apps/server-kansas/src/server.ts

This file was deleted.

15 changes: 0 additions & 15 deletions apps/server-kansas/tests/integration.test.ts

This file was deleted.

12 changes: 0 additions & 12 deletions apps/server-kansas/tsconfig.json

This file was deleted.

4 changes: 2 additions & 2 deletions e2e/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# base image with Node.js and playwright preinstalled
FROM mcr.microsoft.com/playwright:v1.48.1-noble as base
FROM mcr.microsoft.com/playwright:v1.50.0-noble as base
ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH"
ENV NODE_ENV=test
RUN apt-get -y update && apt-get install -y netcat-openbsd
RUN apt-get -y update && apt-get install -y netcat-openbsd make g++
WORKDIR /srv/apps/atj-platform
COPY ./pnpm-lock.yaml ./pnpm-lock.yaml
COPY ./package.json ./package.json
Expand Down
1 change: 0 additions & 1 deletion e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"test": "export E2E_ENDPOINT=http://localhost:4321; pnpm playwright test --ui-port=8080 --ui-host=0.0.0.0"
},
"devDependencies": {
"@playwright/test": "1.48.1",
"@storybook/test-runner": "^0.19.1",
"path-to-regexp": "^8.2.0"
},
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
"lint": "turbo run lint",
"pages": "rm -rf node_modules && npm i -g pnpm turbo && pnpm i && pnpm build && ln -sf ./apps/spotlight/dist _site",
"test": "vitest run",
"test:ci": "vitest run # --coverage.enabled --coverage.provider=v8 --coverage.reporter=text --coverage.reporter=json-summary --coverage.reporter=json --coverage.reportOnFailure",
"test:ci": "CI=true vitest run # --coverage.enabled --coverage.provider=v8 --coverage.reporter=text --coverage.reporter=json-summary --coverage.reporter=json --coverage.reportOnFailure",
"test:infra": "turbo run --filter=infra-cdktf test",
"typecheck": "tsc --build",
"typecheck": "tsc --build --noEmit",
"prepare": "husky"
},
"hooks": {
"pre-commit": "pnpm format"
},
"devDependencies": {
"@playwright/test": "^1.49.1",
"@playwright/test": "^1.50.0",
"@rollup/plugin-commonjs": "^28.0.2",
"@rollup/plugin-json": "^6.1.0",
"@rollup/plugin-node-resolve": "^16.0.0",
Expand Down
7 changes: 0 additions & 7 deletions packages-python/docassemble-server/Dockerfile

This file was deleted.

11 changes: 0 additions & 11 deletions packages-python/docassemble-server/README.md

This file was deleted.

13 changes: 0 additions & 13 deletions packages-python/docassemble-server/docker-compose.yml

This file was deleted.

8 changes: 0 additions & 8 deletions packages-python/docassemble-server/manifest.yml

This file was deleted.

12 changes: 12 additions & 0 deletions packages/common/src/locales/en/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ export const en = {
displayName: 'Short answer',
maxLength: 'Maximum length',
},
textarea: {
...defaults,
displayName: 'Long answer',
maxLength: 'Maximum length',
hintLabel: 'Hint Text (optional)',
hint: 'The more specific you can be, the better. Use the space below and/or attach additional pages.',
},
packageDownload: {
...defaults,
displayName: 'Package download',
Expand Down Expand Up @@ -99,5 +106,10 @@ export const en = {
preferNotToAnswerTextLabel:
'Prefer not to share my gender identity checkbox label',
},
repeater: {
...defaults,
displayName: 'Repeatable Group',
errorTextMustContainChar: 'String must contain at least 1 character(s)',
},
},
};
1 change: 0 additions & 1 deletion packages/dependency-graph/.gitignore

This file was deleted.

15 changes: 0 additions & 15 deletions packages/dependency-graph/README.md

This file was deleted.

23 changes: 0 additions & 23 deletions packages/dependency-graph/package.json

This file was deleted.

36 changes: 0 additions & 36 deletions packages/dependency-graph/src/get-dependencies.ts

This file was deleted.

Loading

0 comments on commit 99d16f2

Please sign in to comment.