Skip to content

Commit

Permalink
Merge pull request #447 from sanger/develop
Browse files Browse the repository at this point in the history
Merge develop into master
  • Loading branch information
StephenHulme authored Jun 24, 2024
2 parents 5677a26 + 415eadc commit 2c91ca2
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 14 deletions.
1 change: 0 additions & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
NODE_ENV=development
VITE_SEQUENCESCAPE_BASE_URL=http://localhost:3000/api/v2
VITE_SEQUENCESCAPE_API_KEY=development
VITE_PRINT_MY_BARCODE_BASE_URL=http://localhost:9292
Expand Down
2 changes: 1 addition & 1 deletion .env.production
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
NODE_ENV=production
VITE_SEQUENCESCAPE_BASE_URL=REPLACE_VITE_SEQUENCESCAPE_BASE_URL
VITE_SEQUENCESCAPE_API_KEY=REPLACE_VITE_SEQUENCESCAPE_API_KEY
VITE_PRINT_MY_BARCODE_BASE_URL=REPLACE_VITE_PRINT_MY_BARCODE_BASE_URL
VITE_CUSTOM_PRINTERS=REPLACE_VITE_CUSTOM_PRINTERS
3 changes: 1 addition & 2 deletions .env.uat
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
NODE_ENV=production
VITE_SEQUENCESCAPE_BASE_URL=REPLACE_VITE_SEQUENCESCAPE_BASE_URL
VITE_SEQUENCESCAPE_API_KEY=REPLACE_VITE_SEQUENCESCAPE_API_KEY
VITE_PRINT_MY_BARCODE_BASE_URL=REPLACE_VITE_PRINT_MY_BARCODE_BASE_URL
VITE_CUSTOM_PRINTERS=stub,morgan-plate-barcode
VITE_CUSTOM_PRINTERS=REPLACE_VITE_CUSTOM_PRINTERS
19 changes: 19 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,25 @@ npm run test:unit
npm run test:e2e
```

## Building

To build the app for production, run:

```shell
./compile-build.sh release.tar.gz dist
```

This runs the npm build script and then compiles the build into a tarball, including the revision number.

The build executes in `production` [mode by default](https://vitejs.dev/guide/env-and-mode#modes) and includes environment variables from the `.env.production` file.
Environment variables not specified in the `.env.production` file will fall back to values in the `.env` file if they exist.

## Deployment

Deployment is handled by the Deployment project, as usual, however it should be noted that context-specific environment variables undergo a string replacement process during deployment. All environment variables with the prefix `REPLACE_` are replaced with the corresponding values in the Deployment project at deployment time using GNU `awk`'s `gsub` function.

As of June 2024, Quanthub is hosted on the SS load balancers.

## Notes

A predefined list of printers is used for the printer selection dropdown. This list is defined in the file `src/config/printers.json`. Additional printers, such as the logging printer `stub`, can be added to this list by setting the environment variable `VITE_CUSTOM_PRINTERS` to a comma-separated list of printer names, e.g. `VITE_CUSTOM_PRINTERS=stub,printer1,printer2`.
Expand Down
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
"@vitest/coverage-v8": "^1.6.0",
"@vue/test-utils": "^2.4.6",
"autoprefixer": "^10.4.19",
"cypress": "^13.11.0",
"cypress": "^13.12.0",
"cypress-file-upload": "^5.0.8",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-cypress": "^3.3.0",
"eslint-plugin-vue": "^9.26.0",
"esm": "^3.2.25",
"flush-promises": "^1.0.2",
"lint-staged": "^15.2.5",
"lint-staged": "^15.2.7",
"node-stdlib-browser": "^1.2.0",
"npm-run-all": "^4.1.5",
"postcss-cli": "^10.1.0",
Expand Down

0 comments on commit 2c91ca2

Please sign in to comment.