Skip to content

Commit

Permalink
VR-99: converting veritable-ui to esm. (#39)
Browse files Browse the repository at this point in the history
* VR-99: converting to esm.

* vr-99: version bump.

* VR-99: switching back to .js as it was but instead ESM export.

* VR-99: and a Dockerfile, oops missed one earlier.

* VR-99: changed knexfile to .ts.

* VR-99: converting knex along with migrations to typescript.

* VR-99: tsconfig update.

* VR-99: linting.

* VR-99: and Dockerfile update to remove old knex refs.

* VR-99: updated tests to follow 'esm' principkles.

* VR-99: default exports of pino logger.

* VR-99: revoming styling property from a Button.

* VR-99: another invalid import.

* VR-99: version bump.

* VR-99: snapshot update.

* VR-99: messing around with ESM modules.

* VR-99: linting.

* VR-99: and another import of pino.

* VR-99: and the same for the pino-http logger.

---------

Co-authored-by: Paulius Michelevicius <[email protected]>
  • Loading branch information
n3op2 and Paulius Michelevicius authored May 29, 2024
1 parent 1220afc commit 9d34e17
Show file tree
Hide file tree
Showing 28 changed files with 261 additions and 165 deletions.
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ COPY package*.json ./
RUN npm ci --omit-dev

COPY public ./public
COPY migrations ./migrations
COPY knexfile.js ./
COPY --from=builder /veritable-ui/build ./build

EXPOSE 80
Expand Down
17 changes: 0 additions & 17 deletions migrations/20240507144207_init.js

This file was deleted.

222 changes: 181 additions & 41 deletions package-lock.json

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

13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "veritable-ui",
"version": "0.3.12",
"version": "0.3.13",
"description": "UI for Veritable",
"main": "src/index.ts",
"type": "commonjs",
"type": "module",
"author": "Digital Catapult",
"license": "Apache-2.0",
"engines": {
Expand All @@ -19,11 +19,11 @@
"tsoa:watch": "node --watch-path=./src ./node_modules/.bin/tsoa -- spec-and-routes",
"dev": "npm run tsoa:watch & NODE_ENV=dev node --import=tsimp/import --watch src/index.ts",
"start": "node build/index.js",
"db:cmd": "node ./node_modules/.bin/knex",
"db:migrate": "npm run db:cmd -- migrate:latest",
"db:rollback": "npm run db:cmd -- migrate:rollback",
"db:cmd": "node --import=tsimp/import ./node_modules/.bin/knex",
"db:migrate": "npm run db:cmd -- migrate:latest --knexfile src/models/db/knexfile.ts",
"db:rollback": "npm run db:cmd -- migrate:rollback --knexfile src/models/db/knexfile.ts",
"db:seed": "npm run db:cmd -- seed:run",
"lint": "prettier -c ./src ./test ./seeds ./migrations",
"lint": "prettier -c ./src ./test ./seeds",
"lint:fix": "npm run lint -- -w",
"xss-scan": "xss-scan"
},
Expand Down Expand Up @@ -59,6 +59,7 @@
"@types/mocha": "^10.0.6",
"@types/node": "^20.12.12",
"@types/nodemailer": "^6.4.15",
"@types/pino-http": "^5.8.4",
"@types/sinon": "^17.0.3",
"@types/swagger-ui-express": "^4.1.6",
"chai": "^5.1.1",
Expand Down
Loading

0 comments on commit 9d34e17

Please sign in to comment.