Merge pull request #117 from communitiesuk/FS-4978-use-node

FS-4978 Use appropriate production runtime

Author: sfount

designer/package.json

@@ -5,9 +5,10 @@
   "scripts": {
     "watch": "NODE_ENV=development webpack",
     "dev": "NODE_OPTIONS=--openssl-legacy-provider && concurrently 'yarn watch' 'yarn start:local'",
-    "production": "yarn start:prod",
+    "production": "NODE_ENV=production yarn start:server",
+    "start:test": "NODE_ENV=test yarn start:server",
     "build": "NODE_ENV=production && NODE_OPTIONS=--openssl-legacy-provider && webpack",
-    "start:prod": "NODE_ENV=production nodemon dist/server.js",
+    "start:server": "node dist/server.js",
     "start:local": "NODE_ENV=development PERSISTENT_BACKEND=preview ts-node-dev --inspect --respawn --transpile-only server/index.ts"
   },
   "author": "Communities UK",

docker-compose.e2e.yml

@@ -13,7 +13,7 @@ services:
       - LAST_COMMIT
       - LAST_TAG
       - AUTH_ENABLED=false
-    command: yarn designer production
+    command: yarn designer start:test
     depends_on:
       - runner
       - localstack
@@ -44,7 +44,7 @@ services:
       - SINGLE_REDIS=true
       - FORM_RUNNER_ADAPTER_REDIS_INSTANCE_URI=redis://redis-data:6379
       - PREVIEW_MODE=true
-    command: yarn runner production
+    command: yarn runner start:test
     logging:
       driver: "json-file"
     depends_on:

runner/package.json

@@ -12,7 +12,9 @@
     "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 dist/digital-form-builder-adapter/runner/index.js'",
-    "production": "NODE_ENV=development nodemon dist/digital-form-builder-adapter/runner/index.js",
+    "start:server": "nodemon 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",
     "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",