Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert all nodemon changes #123

Closed
wants to merge 7 commits into from
Closed

Revert all nodemon changes #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3fce67b
Revert "reload code after a change fix (#122)"
samuelhwilliams Jan 29, 2025
d675a4b
Revert "adding debugger attach fix and remove unwanted idea config fi…
samuelhwilliams Jan 29, 2025
9279f8c
Revert "adding remote debug fixes (#119)"
samuelhwilliams Jan 29, 2025
4db2139
Revert "Adjust prod script"
samuelhwilliams Jan 29, 2025
ae89e75
Revert "FS-4978: dont use nodemon in production"
samuelhwilliams Jan 29, 2025
55a1a89
Revert "Update runner/package.json"
samuelhwilliams Jan 29, 2025
63045f0
Revert "Add nodemon config"
samuelhwilliams Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .run/DESIGNER.run.xml → .run/DESIGNER No AUTH.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<env name="ACCESSIBILITY_STATEMENT_URL" value="http://localhost:3008/accessibility_statement" />
<env name="ALLOW_USER_TEMPLATES" value="true" />
<env name="AUTH_COOKIE_NAME" value="fsd_user_token" />
<env name="AUTH_ENABLED" value="true" />
<env name="AUTH_ENABLED" value="false" />
<env name="AWS_ACCESS_KEY_ID" value="FSDIOSFODNN7EXAMPLE" />
<env name="AWS_BUCKET_NAME" value="fsd-bucket" />
<env name="AWS_DEFAULT_REGION" value="eu-west-2" />
Expand All @@ -30,8 +30,6 @@
<env name="REDIRECT_TO_AUTHENTICATION_URL" value="http://localhost:3004/sessions/sign-out" />
<env name="RSA256_PUBLIC_KEY_BASE64" value="&quot;LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlHZU1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTUFEQ0JpQUtCZ0hHYnRGMXlWR1crckNBRk9JZGFrVVZ3Q2Z1dgp4SEUzOGxFL2kwS1dwTXdkU0haRkZMWW5IakJWT09oMTVFaWl6WXphNEZUSlRNdkwyRTRRckxwcVlqNktFNnR2CkhyaHlQL041ZnlwU3p0OHZDajlzcFo4KzBrRnVjVzl6eU1rUHVEaXNZdG1rV0dkeEJta2QzZ3RZcDNtT0k1M1YKVkRnS2J0b0lGVTNzSWs1TkFnTUJBQUU9Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQ\=\=&quot;" />
<env name="SERVICE_START_PAGE" value="http://localhost:3008/account" />
<env name="SSL_CERT" value="$PROJECT_DIR$/../../certs/cert.pem"/>
<env name="SSL_KEY" value="$PROJECT_DIR$/../../certs/key.pem"/>
</envs>
<method v="2">
<option name="NpmBeforeRunTask" enabled="true">
Expand All @@ -46,4 +44,4 @@
</option>
</method>
</configuration>
</component>
</component>
6 changes: 0 additions & 6 deletions .run/DOCKER-DEBUG.run.xml
View file
Open in desktop

This file was deleted.

24 changes: 24 additions & 0 deletions .run/RUNNER TEST.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="RUNNER TEST" type="js.build_tools.npm">
<package-json value="$PROJECT_DIR$/package.json"/>
<command value="run"/>
<scripts>
<script value="runner"/>
</scripts>
<arguments value="unit-test-cov"/>
<node-interpreter value="project"/>
<envs/>
<method v="2">
<option name="NpmBeforeRunTask" enabled="true">
<package-json value="$PROJECT_DIR$/package.json"/>
<command value="run"/>
<scripts>
<script value="runner"/>
</scripts>
<arguments value="build"/>
<node-interpreter value="project"/>
<envs/>
</option>
</method>
</configuration>
</component>
49 changes: 49 additions & 0 deletions .run/RUNNER No AUTH NO REDIS.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="RUNNER No AUTH NO REDIS" type="js.build_tools.npm">
<package-json value="$PROJECT_DIR$/package.json"/>
<command value="run"/>
<scripts>
<script value="runner"/>
</scripts>
<arguments value="dev"/>
<node-interpreter value="project"/>
<envs>
<env name="ACCESSIBILITY_STATEMENT_URL" value="http://localhost:3008/accessibility_statement"/>
<env name="ALLOW_USER_TEMPLATES" value="true"/>
<env name="AWS_ACCESS_KEY_ID" value="FSDIOSFODNN7EXAMPLE"/>
<env name="AWS_BUCKET_NAME" value="fsd-bucket"/>
<env name="AWS_DEFAULT_REGION" value="eu-west-2"/>
<env name="AWS_ENDPOINT_OVERRIDE" value="http://s3.localhost.localstack.cloud:4566"/>
<env name="AWS_REGION" value="eu-west-2"/>
<env name="AWS_SECRET_ACCESS_KEY" value="fsdlrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"/>
<env name="AWS_SIGNATURE_VERSION" value="v4"/>
<env name="CONTACT_US_URL" value="http://localhost:3008/contact_us"/>
<env name="COOKIE_POLICY_URL" value="http://localhost:3008/cookie_policy"/>
<env name="E2E_MODE_ENABLED" value="false"/>
<env name="ELIGIBILITY_RESULT_URL" value="http://localhost:3008/eligibility-result"/>
<env name="FEEDBACK_LINK" value="http://localhost:3008/feedback"/>
<env name="JWT_AUTH_COOKIE_NAME" value="fsd_user_token"/>
<env name="JWT_AUTH_ENABLED" value="false"/>
<env name="JWT_REDIRECT_TO_AUTHENTICATION_URL" value="http://localhost:3004/sessions/sign-out"/>
<env name="LOG_LEVEL" value="debug"/>
<env name="LOGOUT_URL" value="http://localhost:3004/sessions/sign-out"/>
<env name="MULTIFUND_URL" value="http://localhost:3008/account"/>
<env name="PRIVACY_POLICY_URL" value="http://localhost:3008/privacy"/>
<env name="RSA256_PUBLIC_KEY_BASE64"
value="TUlHZk1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTkFEQ0JpUUtCZ1FDdUZBL2xrczcwM2JEeDZYN0duUVIwVlVSOAp6eW8yUEJ6L2E2MVd0TjJCUitYWlV5cjlGaHc4K3E4YVRsbzZ0K2VJa3hENjE4eWpaQkx0cGhZVjUwcTAvOW1OCkk0QStPSURhQ1J0aWd0NDJ4ZUlrbmpydWZ5a280Q0xjV3BFc1dzSkZWSnJnR2xQTHZrMzJHMVJ5WFErOGY1dWsKVmlKbjBKbGlzbWo4bGtzc2pRSURBUUFC"/>
<env name="SERVICE_START_PAGE" value="http://localhost:3008/account"/>
</envs>
<method v="2">
<option name="NpmBeforeRunTask" enabled="true">
<package-json value="$PROJECT_DIR$/package.json"/>
<command value="run"/>
<scripts>
<script value="runner"/>
</scripts>
<arguments value="build"/>
<node-interpreter value="project"/>
<envs/>
</option>
</method>
</configuration>
</component>
51 changes: 51 additions & 0 deletions .run/RUNNER No AUTH.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="RUNNER No AUTH" type="js.build_tools.npm">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
<scripts>
<script value="runner" />
</scripts>
<arguments value="dev" />
<node-interpreter value="project" />
<envs>
<env name="ACCESSIBILITY_STATEMENT_URL" value="https://frontend.levellingup.gov.localhost:3008/accessibility_statement" />
<env name="ALLOW_USER_TEMPLATES" value="true" />
<env name="AWS_ACCESS_KEY_ID" value="FSDIOSFODNN7EXAMPLE" />
<env name="AWS_BUCKET_NAME" value="fsd-bucket" />
<env name="AWS_DEFAULT_REGION" value="eu-west-2" />
<env name="AWS_ENDPOINT_OVERRIDE" value="http://s3.localhost.localstack.cloud:4566" />
<env name="AWS_REGION" value="eu-west-2" />
<env name="AWS_SECRET_ACCESS_KEY" value="fsdlrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY" />
<env name="AWS_SIGNATURE_VERSION" value="v4" />
<env name="CONTACT_US_URL" value="https://frontend.levellingup.gov.localhost:3008/contact_us" />
<env name="COOKIE_POLICY_URL" value="https://frontend.levellingup.gov.localhost:3008/cookie_policy" />
<env name="E2E_MODE_ENABLED" value="false" />
<env name="ELIGIBILITY_RESULT_URL" value="https://frontend.levellingup.gov.localhost:3008/eligibility-result" />
<env name="FEEDBACK_LINK" value="https://frontend.levellingup.gov.localhost:3008/feedback" />
<env name="FORM_RUNNER_ADAPTER_REDIS_INSTANCE_URI" value="redis://localhost:6379" />
<env name="JWT_AUTH_COOKIE_NAME" value="fsd_user_token" />
<env name="JWT_AUTH_ENABLED" value="false" />
<env name="JWT_REDIRECT_TO_AUTHENTICATION_URL" value="https://authenticator.levellingup.gov.localhost:3004/sessions/sign-out" />
<env name="LOG_LEVEL" value="debug" />
<env name="LOGOUT_URL" value="https://authenticator.levellingup.gov.localhost:3004/sessions/sign-out" />
<env name="MULTIFUND_URL" value="https://frontend.levellingup.gov.localhost:3008/account" />
<env name="PREVIEW_MODE" value="true" />
<env name="PRIVACY_POLICY_URL" value="https://frontend.levellingup.gov.localhost:3008/privacy" />
<env name="RSA256_PUBLIC_KEY_BASE64" value="TUlHZk1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTkFEQ0JpUUtCZ1FDdUZBL2xrczcwM2JEeDZYN0duUVIwVlVSOAp6eW8yUEJ6L2E2MVd0TjJCUitYWlV5cjlGaHc4K3E4YVRsbzZ0K2VJa3hENjE4eWpaQkx0cGhZVjUwcTAvOW1OCkk0QStPSURhQ1J0aWd0NDJ4ZUlrbmpydWZ5a280Q0xjV3BFc1dzSkZWSnJnR2xQTHZrMzJHMVJ5WFErOGY1dWsKVmlKbjBKbGlzbWo4bGtzc2pRSURBUUFC" />
<env name="SERVICE_START_PAGE" value="https://frontend.levellingup.gov.localhost:3008/account" />
<env name="SINGLE_REDIS" value="true" />
</envs>
<method v="2">
<option name="NpmBeforeRunTask" enabled="true">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
<scripts>
<script value="runner" />
</scripts>
<arguments value="build" />
<node-interpreter value="project" />
<envs />
</option>
</method>
</configuration>
</component>
52 changes: 52 additions & 0 deletions .run/RUNNER-prod mode.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="RUNNER-prod mode" type="js.build_tools.npm">
<package-json value="$PROJECT_DIR$/package.json"/>
<command value="run"/>
<scripts>
<script value="runner"/>
</scripts>
<arguments value="dev"/>
<node-interpreter value="project"/>
<envs>
<env name="ACCESSIBILITY_STATEMENT_URL" value="http://localhost:3008/accessibility_statement"/>
<env name="ALLOW_USER_TEMPLATES" value="true"/>
<env name="AWS_ACCESS_KEY_ID" value="FSDIOSFODNN7EXAMPLE"/>
<env name="AWS_BUCKET_NAME" value="fsd-bucket"/>
<env name="AWS_DEFAULT_REGION" value="eu-west-2"/>
<env name="AWS_ENDPOINT_OVERRIDE" value="http://s3.localhost.localstack.cloud:4566"/>
<env name="AWS_REGION" value="eu-west-2"/>
<env name="AWS_SECRET_ACCESS_KEY" value="fsdlrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"/>
<env name="AWS_SIGNATURE_VERSION" value="v4"/>
<env name="CONTACT_US_URL" value="http://localhost:3008/contact_us"/>
<env name="COOKIE_POLICY_URL" value="http://localhost:3008/cookie_policy"/>
<env name="E2E_MODE_ENABLED" value="false"/>
<env name="ELIGIBILITY_RESULT_URL" value="http://localhost:3008/eligibility-result"/>
<env name="FEEDBACK_LINK" value="http://localhost:3008/feedback"/>
<env name="FORM_RUNNER_ADAPTER_REDIS_INSTANCE_URI" value="redis://localhost:6379"/>
<env name="JWT_AUTH_COOKIE_NAME" value="fsd_user_token"/>
<env name="JWT_AUTH_ENABLED" value="true"/>
<env name="JWT_REDIRECT_TO_AUTHENTICATION_URL" value="http://localhost:3004/sessions/sign-out"/>
<env name="LOG_LEVEL" value="debug"/>
<env name="LOGOUT_URL" value="http://localhost:3004/sessions/sign-out"/>
<env name="MULTIFUND_URL" value="http://localhost:3008/account"/>
<env name="PRIVACY_POLICY_URL" value="http://localhost:3008/privacy"/>
<env name="RSA256_PUBLIC_KEY_BASE64"
value="TUlHZk1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTkFEQ0JpUUtCZ1FDdUZBL2xrczcwM2JEeDZYN0duUVIwVlVSOAp6eW8yUEJ6L2E2MVd0TjJCUitYWlV5cjlGaHc4K3E4YVRsbzZ0K2VJa3hENjE4eWpaQkx0cGhZVjUwcTAvOW1OCkk0QStPSURhQ1J0aWd0NDJ4ZUlrbmpydWZ5a280Q0xjV3BFc1dzSkZWSnJnR2xQTHZrMzJHMVJ5WFErOGY1dWsKVmlKbjBKbGlzbWo4bGtzc2pRSURBUUFC"/>
<env name="SERVICE_START_PAGE" value="http://localhost:3008/account"/>
<env name="SINGLE_REDIS" value="true"/>
<env name="PREVIEW_MODE" value="false"/>
</envs>
<method v="2">
<option name="NpmBeforeRunTask" enabled="true">
<package-json value="$PROJECT_DIR$/package.json"/>
<command value="run"/>
<scripts>
<script value="runner"/>
</scripts>
<arguments value="build"/>
<node-interpreter value="project"/>
<envs/>
</option>
</method>
</configuration>
</component>
2 changes: 0 additions & 2 deletions .run/RUNNER.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
<env name="RSA256_PUBLIC_KEY_BASE64" value="TUlHZk1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTkFEQ0JpUUtCZ1FDdUZBL2xrczcwM2JEeDZYN0duUVIwVlVSOAp6eW8yUEJ6L2E2MVd0TjJCUitYWlV5cjlGaHc4K3E4YVRsbzZ0K2VJa3hENjE4eWpaQkx0cGhZVjUwcTAvOW1OCkk0QStPSURhQ1J0aWd0NDJ4ZUlrbmpydWZ5a280Q0xjV3BFc1dzSkZWSnJnR2xQTHZrMzJHMVJ5WFErOGY1dWsKVmlKbjBKbGlzbWo4bGtzc2pRSURBUUFC" />
<env name="SERVICE_START_PAGE" value="https://frontend.levellingup.gov.localhost:3008/account" />
<env name="SINGLE_REDIS" value="true" />
<env name="SSL_CERT" value="$PROJECT_DIR$/../../certs/cert.pem"/>
<env name="SSL_KEY" value="$PROJECT_DIR$/../../certs/key.pem"/>
</envs>
<method v="2">
<option name="NpmBeforeRunTask" enabled="true">
Expand Down
7 changes: 3 additions & 4 deletions designer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
"scripts": {
"watch": "NODE_ENV=development webpack",
"dev": "NODE_OPTIONS=--openssl-legacy-provider && concurrently 'yarn watch' 'yarn start:local'",
"production": "NODE_ENV=production yarn start:server",
"start:test": "NODE_ENV=test yarn start:server",
"production": "yarn start:prod",
"build": "NODE_ENV=production && NODE_OPTIONS=--openssl-legacy-provider && webpack",
"start:server": "node dist/server.js",
"start:local": "NODE_ENV=development PERSISTENT_BACKEND=preview ts-node-dev --inspect=0.0.0.0:9229 --respawn --transpile-only server/index.ts"
"start:prod": "NODE_ENV=production nodemon dist/server.js",
"start:local": "NODE_ENV=development PERSISTENT_BACKEND=preview ts-node-dev --inspect --respawn --transpile-only server/index.ts"
},
"author": "Communities UK",
"license": "SEE LICENSE IN LICENSE",
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
- LAST_COMMIT
- LAST_TAG
- AUTH_ENABLED=false
command: yarn designer start:test
command: yarn designer production
depends_on:
- runner
- localstack
Expand Down Expand Up @@ -44,7 +44,7 @@ services:
- SINGLE_REDIS=true
- FORM_RUNNER_ADAPTER_REDIS_INSTANCE_URI=redis://redis-data:6379
- PREVIEW_MODE=true
command: yarn runner start:test
command: yarn runner production
logging:
driver: "json-file"
depends_on:
Expand Down
6 changes: 2 additions & 4 deletions runner/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@
"scss:build": "node compile-scss.js",
"copy-forms": "node copy-form-json.js",
"clean:build": "rm -rf dist",
"dev": "NODE_ENV=development nodemon --watch src --ext js,json,ts,html,scss --exec 'yarn build && node --inspect=0.0.0.0:9228 dist/digital-form-builder-adapter/runner/index.js'",
"start:server": "node dist/digital-form-builder-adapter/runner/index.js",
"production": "NODE_ENV=production npm run start:server",
"start:test": "NODE_ENV=development npm run start:server",
"dev": "NODE_ENV=development nodemon dist/digital-form-builder-adapter/runner/index.js",
"production": "NODE_ENV=development nodemon dist/digital-form-builder-adapter/runner/index.js",
"test-cov": "yarn run unit-test-cov",
"test:dev": "lab -T test/.transform.js -P (test|src)/**/*.test.* -v test --coverage-exclude",
"unit-test": "lab -T test/.transform.js -P (test|src)/**/*.test.* -v test -S -v -r console -o stdout -r html -o unit-test.html -I version -l",
Expand Down
Loading