Switch to pnpm, update dependencies, delete unneeded files
This commit is contained in:
parent
c8019d04cd
commit
b39a6a16c4
GPG Key ID:
82A5E6C236C535AA
@ -1 +0,0 @@
|
||||
{"image":"mcr.microsoft.com/devcontainers/javascript-node","build":{}}
|
||||
180
.drone.yml
180
.drone.yml
@ -1,180 +0,0 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
name: pr
|
||||
trigger:
|
||||
event:
|
||||
- pull_request
|
||||
|
||||
steps:
|
||||
- name: restore-cache
|
||||
image: drillster/drone-volume-cache
|
||||
settings:
|
||||
restore: true
|
||||
mount:
|
||||
- ./node_modules
|
||||
volumes:
|
||||
- name: cache
|
||||
path: /cache
|
||||
- name: dependencies
|
||||
image: node:lts-alpine
|
||||
environment:
|
||||
CI: true
|
||||
commands:
|
||||
- npm install
|
||||
depends_on:
|
||||
- restore-cache
|
||||
- name: tests
|
||||
image: node:lts-alpine
|
||||
environment:
|
||||
CI: true
|
||||
commands:
|
||||
- npm test
|
||||
depends_on:
|
||||
- dependencies
|
||||
- name: format
|
||||
image: node:lts-alpine
|
||||
environment:
|
||||
CI: true
|
||||
commands:
|
||||
- npm run format
|
||||
depends_on:
|
||||
- tests
|
||||
- name: push-changes
|
||||
image: appleboy/drone-git-push
|
||||
environment:
|
||||
CI: true
|
||||
CI_USERNAME:
|
||||
from_secret: ci_username
|
||||
CI_PASSWORD:
|
||||
from_secret: ci_password
|
||||
GIT_COMMITTER_NAME:
|
||||
from_secret: ci_username
|
||||
GIT_COMMITTER_EMAIL:
|
||||
from_secret: ci_email
|
||||
PLUGIN_AUTHOR_NAME:
|
||||
from_secret: ci_username
|
||||
PLUGIN_AUTHOR_EMAIL:
|
||||
from_secret: ci_email
|
||||
PLUGIN_USERNAME:
|
||||
from_secret: ci_username
|
||||
PLUGIN_PASSWORD:
|
||||
from_secret: ci_password
|
||||
settings:
|
||||
branch: "${DRONE_SOURCE_BRANCH}"
|
||||
remote: https://${CI_USERNAME}:${CI_PASSWORD}@git.astrogd.cloud/internal/template-typescript.git
|
||||
force: false
|
||||
commit: true
|
||||
commit_message: "[CI] Ensure code style on ${DRONE_COMMIT_SHA:0:7}"
|
||||
author_name: "${GIT_COMMITTER_NAME}"
|
||||
author_email: "${GIT_COMMITTER_EMAIL}"
|
||||
depends_on:
|
||||
- format
|
||||
- name: rebuild-cache
|
||||
image: drillster/drone-volume-cache
|
||||
settings:
|
||||
rebuild: true
|
||||
mount:
|
||||
- ./node_modules
|
||||
volumes:
|
||||
- name: cache
|
||||
path: /cache
|
||||
depends_on:
|
||||
- dependencies
|
||||
|
||||
volumes:
|
||||
- name: cache
|
||||
host:
|
||||
path: /tmp/drone/ci/cache
|
||||
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
name: push
|
||||
trigger:
|
||||
event:
|
||||
- push
|
||||
branch:
|
||||
- main
|
||||
- dev
|
||||
|
||||
steps:
|
||||
- name: restore-cache
|
||||
image: drillster/drone-volume-cache
|
||||
settings:
|
||||
restore: true
|
||||
mount:
|
||||
- ./node_modules
|
||||
volumes:
|
||||
- name: cache
|
||||
path: /cache
|
||||
- name: dependencies
|
||||
image: node:lts-alpine
|
||||
environment:
|
||||
CI: true
|
||||
commands:
|
||||
- npm install
|
||||
depends_on:
|
||||
- restore-cache
|
||||
- name: tests
|
||||
image: node:lts-alpine
|
||||
environment:
|
||||
CI: true
|
||||
commands:
|
||||
- npm test
|
||||
depends_on:
|
||||
- dependencies
|
||||
- name: format
|
||||
image: node:lts-alpine
|
||||
environment:
|
||||
CI: true
|
||||
commands:
|
||||
- npm run format
|
||||
depends_on:
|
||||
- tests
|
||||
- name: push-changes
|
||||
image: appleboy/drone-git-push
|
||||
environment:
|
||||
CI: true
|
||||
CI_USERNAME:
|
||||
from_secret: ci_username
|
||||
CI_PASSWORD:
|
||||
from_secret: ci_password
|
||||
GIT_COMMITTER_NAME:
|
||||
from_secret: ci_username
|
||||
GIT_COMMITTER_EMAIL:
|
||||
from_secret: ci_email
|
||||
PLUGIN_AUTHOR_NAME:
|
||||
from_secret: ci_username
|
||||
PLUGIN_AUTHOR_EMAIL:
|
||||
from_secret: ci_email
|
||||
PLUGIN_USERNAME:
|
||||
from_secret: ci_username
|
||||
PLUGIN_PASSWORD:
|
||||
from_secret: ci_password
|
||||
settings:
|
||||
branch: "${DRONE_SOURCE_BRANCH}"
|
||||
remote: https://${CI_USERNAME}:${CI_PASSWORD}@git.astrogd.cloud/internal/template-typescript.git
|
||||
force: false
|
||||
commit: true
|
||||
commit_message: "[CI] Ensure code style on ${DRONE_COMMIT_SHA:0:7}"
|
||||
author_name: "${GIT_COMMITTER_NAME}"
|
||||
author_email: "${GIT_COMMITTER_EMAIL}"
|
||||
depends_on:
|
||||
- format
|
||||
- name: rebuild-cache
|
||||
image: drillster/drone-volume-cache
|
||||
settings:
|
||||
rebuild: true
|
||||
mount:
|
||||
- ./node_modules
|
||||
volumes:
|
||||
- name: cache
|
||||
path: /cache
|
||||
depends_on:
|
||||
- dependencies
|
||||
|
||||
volumes:
|
||||
- name: cache
|
||||
host:
|
||||
path: /tmp/drone/ci/cache
|
||||
@ -1,4 +0,0 @@
|
||||
DB_USER=user
|
||||
DB_PASS=PASSWORD
|
||||
DB_HOST=localhost
|
||||
DB_NAME=template
|
||||
14
.npmignore
14
.npmignore
@ -1,14 +0,0 @@
|
||||
*.ts
|
||||
!*.d.ts
|
||||
tsconfig.json
|
||||
.prettierrc.json
|
||||
.prettierignore
|
||||
.eslintrc.json
|
||||
.eslintignore
|
||||
.drone.yml
|
||||
coverage
|
||||
.env
|
||||
Dockerfile
|
||||
.devcontainer.json
|
||||
data
|
||||
userdata
|
||||
4
.npmrc
4
.npmrc
@ -1,4 +0,0 @@
|
||||
@astrogd:registry=https://git.astrogd.cloud/api/packages/packages/npm/
|
||||
//git.astrogd.cloud/api/packages/packages/npm/:_authToken=${NPM_TOKEN}
|
||||
@internal:registry=https://git.astrogd.cloud/api/packages/internal/npm/
|
||||
//git.astrogd.cloud/api/packages/internal/npm/:_authToken=${NPM_TOKEN}
|
||||
14
Dockerfile
14
Dockerfile
@ -1,14 +0,0 @@
|
||||
FROM node:lts-alpine AS builder
|
||||
ENV NODE_ENV=production
|
||||
# RUN apk add --no-cache python3 make g++
|
||||
COPY dist/package*.json ./
|
||||
RUN npm install --omit=dev
|
||||
|
||||
FROM node:lts-alpine AS app
|
||||
WORKDIR /usr/src/app
|
||||
ENV NODE_ENV=production
|
||||
COPY --from=builder node_modules ./node_modules
|
||||
COPY dist/ .
|
||||
VOLUME [ "/usr/src/app/save" ]
|
||||
EXPOSE 80
|
||||
CMD ["node", "--enable-source-maps", "index.js"]
|
||||
@ -1,33 +0,0 @@
|
||||
version: "3.9"
|
||||
services:
|
||||
app:
|
||||
image: astrogd/template-typescript:latest
|
||||
build: ./
|
||||
ports:
|
||||
- 80:80
|
||||
tty: true
|
||||
stdin_open: true
|
||||
depends_on:
|
||||
- db
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- TOKEN=$TOKEN
|
||||
- DB_HOST=database
|
||||
- DB_USERNAME=$DB_USER
|
||||
- DB_PASSWORD=$DB_PASS
|
||||
- DB_DATABASE=$DB_NAME
|
||||
volumes:
|
||||
- ./data/app:/usr/src/app/save
|
||||
db:
|
||||
image: postgres:latest
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- 5432:5432
|
||||
environment:
|
||||
- POSTGRES_USER=$DB_USER
|
||||
- POSTGRES_PASSWORD=$DB_PASS
|
||||
- POSTGRES_DB=$DB_NAME
|
||||
expose:
|
||||
- 5432
|
||||
volumes:
|
||||
- ./data/db:/var/lib/postgresql/data
|
||||
@ -1,26 +0,0 @@
|
||||
import { randomUUID } from "crypto";
|
||||
|
||||
jest.spyOn(console, "log");
|
||||
jest.mock("typeorm");
|
||||
|
||||
describe("index", () => {
|
||||
beforeEach(() => {
|
||||
jest.clearAllMocks();
|
||||
|
||||
process.env["DB_HOST"] = randomUUID();
|
||||
process.env["DB_USER"] = randomUUID();
|
||||
process.env["DB_PASS"] = randomUUID();
|
||||
process.env["DB_NAME"] = randomUUID();
|
||||
});
|
||||
|
||||
it("should log hello world", async () => {
|
||||
(console.log as jest.MockedFn<typeof console.log>).mockImplementation(() => {
|
||||
return;
|
||||
});
|
||||
|
||||
await (await import("./index")).default;
|
||||
|
||||
expect(console.log).toHaveBeenCalledTimes(1);
|
||||
expect(console.log).toHaveBeenLastCalledWith("Hello world!");
|
||||
});
|
||||
});
|
||||
10
index.ts
10
index.ts
@ -1,9 +1 @@
|
||||
import { initPromise } from "./src/db/dataSource";
|
||||
|
||||
async function run() {
|
||||
await initPromise;
|
||||
|
||||
console.log("Hello world!");
|
||||
}
|
||||
|
||||
export default run();
|
||||
console.log("Hello world!");
|
||||
|
||||
86
package.json
86
package.json
@ -1,86 +1,38 @@
|
||||
{
|
||||
"name": "@internal/template-typescript",
|
||||
"name": "@tu-darmstadt/aupl-ss24-sudoku-solver",
|
||||
"version": "1.0.0-dev.1",
|
||||
"description": "Just another cool typescript project",
|
||||
"description": "A tool converting a given sudoku into DIMACS CNF to be solved with a SAT solver, and reverting the solution from the SAT solver back into an easy readable sudoku visualitsation",
|
||||
"main": "dist/index.js",
|
||||
"types": "dist/types/",
|
||||
"directories": {
|
||||
"bin": "dist/bin/"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "npm run build && node --enable-source-maps .",
|
||||
"test": "npm run build && npm run test:jest && npm run test:style",
|
||||
"start": "pnpm run build && node --enable-source-maps .",
|
||||
"test": "pnpm run build && pnpm run test:style",
|
||||
"format": "prettier --write .",
|
||||
"build": "tsc",
|
||||
"deploy:npm": "npm publish",
|
||||
"deploy:docker": "npm run prepack && docker build -t astrogd/template-typescript:latest .",
|
||||
"version:dev": "npm version prerelease --preid dev --no-commit-hooks --no-git-tag-version",
|
||||
"version:patch": "npm version prepatch --preid dev --no-commit-hooks --no-git-tag-version",
|
||||
"version:minor": "npm version preminor --preid dev --no-commit-hooks --no-git-tag-version",
|
||||
"version:major": "npm version premajor --preid dev --no-commit-hooks --no-git-tag-version",
|
||||
"version:release": "npm version patch --no-commit-hooks --no-git-tag-version",
|
||||
"ci:sign": "drone sign internal/template-typescript --save",
|
||||
"test:jest": "jest --coverage",
|
||||
"test:style": "eslint **.ts --fix",
|
||||
"postinstall": "jest --clearCache",
|
||||
"prepack": "npx rimraf dist && npm run test && npm run build",
|
||||
"migration:create": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:generate -d src/db/dataSource.migration.ts -p src/db/migrations/data",
|
||||
"migration:run": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:run -d src/db/dataSource.migration.ts",
|
||||
"migration:revert": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:revert -d src/db/dataSource.migration.ts",
|
||||
"migration:show": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:show -d src/db/dataSource.migration.ts",
|
||||
"migration:check": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:generate --check -d src/db/dataSource.migration.ts src/db/migrations/data"
|
||||
"version:dev": "pnpm version prerelease --preid dev --no-commit-hooks --no-git-tag-version",
|
||||
"version:patch": "pnpm version prepatch --preid dev --no-commit-hooks --no-git-tag-version",
|
||||
"version:minor": "pnpm version preminor --preid dev --no-commit-hooks --no-git-tag-version",
|
||||
"version:major": "pnpm version premajor --preid dev --no-commit-hooks --no-git-tag-version",
|
||||
"version:release": "pnpm version patch --no-commit-hooks --no-git-tag-version",
|
||||
"test:style": "eslint **.ts --fix"
|
||||
},
|
||||
"author": "AstroGD Lukas Weber <hello@astrogd.eu> (https://www.astrogd.eu/)",
|
||||
"license": "UNLICENSED",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://git.astrogd.cloud/internal/template-typescript.git"
|
||||
},
|
||||
"jest": {
|
||||
"preset": "ts-jest",
|
||||
"testEnvironment": "node",
|
||||
"coverageThreshold": {
|
||||
"global": {
|
||||
"branches": 80,
|
||||
"functions": 80,
|
||||
"lines": 80,
|
||||
"statements": -20
|
||||
},
|
||||
"**/*.{ts,tsx}": {
|
||||
"branches": 95,
|
||||
"functions": 95,
|
||||
"lines": 95,
|
||||
"statements": -5
|
||||
}
|
||||
},
|
||||
"collectCoverageFrom": [
|
||||
"**/*.ts",
|
||||
"!**/*.d.ts",
|
||||
"!**/node_modules /**",
|
||||
"!**/coverage /**"
|
||||
],
|
||||
"testPathIgnorePatterns": [
|
||||
"/node_modules/",
|
||||
"/*.d.ts"
|
||||
]
|
||||
"url": "https://git.astrogd.cloud/tu-darmstadt/aupl-ss24-sudoku-solver.git"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/jest": "^29.4.0",
|
||||
"@types/node": "^18.16.19",
|
||||
"@typescript-eslint/eslint-plugin": "^6.7.0",
|
||||
"@typescript-eslint/parser": "^6.7.0",
|
||||
"eslint": "^8.33.0",
|
||||
"jest": "^29.4.2",
|
||||
"prettier": "^3.0.0",
|
||||
"rimraf": "^5.0.1",
|
||||
"ts-jest": "^29.0.5",
|
||||
"ts-node": "^10.9.1",
|
||||
"typescript": "^5.1.6"
|
||||
},
|
||||
"dependencies": {
|
||||
"dotenv": "^16.3.1",
|
||||
"dotenv-expand": "^10.0.0",
|
||||
"pg": "^8.11.1",
|
||||
"typeorm": "^0.3.17"
|
||||
"@types/node": "^20.14.2",
|
||||
"@typescript-eslint/eslint-plugin": "^7.12.0",
|
||||
"@typescript-eslint/parser": "^7.12.0",
|
||||
"eslint": "^8.57.0",
|
||||
"prettier": "^3.3.1",
|
||||
"rimraf": "^5.0.7",
|
||||
"ts-node": "^10.9.2",
|
||||
"typescript": "^5.4.5"
|
||||
}
|
||||
}
|
||||
|
||||
1381
pnpm-lock.yaml
generated
Normal file
1381
pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,21 +0,0 @@
|
||||
import { randomUUID } from "crypto";
|
||||
|
||||
jest.mock("typeorm");
|
||||
|
||||
describe("src/db:dataSource.migration", () => {
|
||||
beforeEach(() => {
|
||||
jest.resetModules();
|
||||
jest.clearAllMocks();
|
||||
|
||||
process.env["DB_HOST"] = randomUUID();
|
||||
process.env["DB_USER"] = randomUUID();
|
||||
process.env["DB_PASS"] = randomUUID();
|
||||
process.env["DB_NAME"] = randomUUID();
|
||||
});
|
||||
|
||||
it("exports an initialized dataSource", async () => {
|
||||
const dut = (await import("./dataSource.migration")).default;
|
||||
|
||||
expect(dut.initialize).toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@ -1,3 +0,0 @@
|
||||
import dataSource from "./dataSource";
|
||||
|
||||
export default dataSource;
|
||||
@ -1,59 +0,0 @@
|
||||
import { randomUUID } from "crypto";
|
||||
|
||||
jest.mock("typeorm");
|
||||
jest.mock("dotenv");
|
||||
jest.mock("dotenv-expand");
|
||||
|
||||
describe("src/db:dataSource", () => {
|
||||
beforeEach(() => {
|
||||
jest.resetModules();
|
||||
jest.clearAllMocks();
|
||||
|
||||
process.env["DB_HOST"] = randomUUID();
|
||||
process.env["DB_USER"] = randomUUID();
|
||||
process.env["DB_PASS"] = randomUUID();
|
||||
process.env["DB_NAME"] = randomUUID();
|
||||
});
|
||||
|
||||
it("throws an error if an environment variable is missing", async () => {
|
||||
delete process.env["DB_HOST"];
|
||||
process.env["DB_USER"] = randomUUID();
|
||||
process.env["DB_PASS"] = randomUUID();
|
||||
process.env["DB_NAME"] = randomUUID();
|
||||
|
||||
await expect(async () => await import("./dataSource")).rejects.toThrowError(ReferenceError);
|
||||
|
||||
jest.resetModules();
|
||||
|
||||
process.env["DB_HOST"] = randomUUID();
|
||||
delete process.env["DB_USER"];
|
||||
|
||||
await expect(async () => await import("./dataSource")).rejects.toThrowError(ReferenceError);
|
||||
|
||||
jest.resetModules();
|
||||
|
||||
process.env["DB_USER"] = randomUUID();
|
||||
delete process.env["DB_PASS"];
|
||||
|
||||
await expect(async () => await import("./dataSource")).rejects.toThrowError(ReferenceError);
|
||||
|
||||
jest.resetModules();
|
||||
|
||||
process.env["DB_PASS"] = randomUUID();
|
||||
delete process.env["DB_NAME"];
|
||||
|
||||
await expect(async () => await import("./dataSource")).rejects.toThrowError(ReferenceError);
|
||||
|
||||
jest.resetModules();
|
||||
|
||||
process.env["DB_NAME"] = randomUUID();
|
||||
|
||||
expect(async () => await import("./dataSource")).not.toThrow();
|
||||
});
|
||||
|
||||
it("exports an initialized dataSource", async () => {
|
||||
const dut = (await import("./dataSource")).default;
|
||||
|
||||
expect(dut.initialize).toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@ -1,37 +0,0 @@
|
||||
import path from "path";
|
||||
import { DataSource } from "typeorm";
|
||||
import { config } from "dotenv";
|
||||
import dotenvExpand from "dotenv-expand";
|
||||
|
||||
const env = config();
|
||||
dotenvExpand.expand(env);
|
||||
|
||||
const host = process.env["DB_HOST"];
|
||||
const username = process.env["DB_USER"];
|
||||
const password = process.env["DB_PASS"];
|
||||
const database = process.env["DB_NAME"];
|
||||
|
||||
if (!host) throw new ReferenceError("Environment variable DB_HOST is missing");
|
||||
if (!password) throw new ReferenceError("Environment variable DB_PASS is missing");
|
||||
if (!username) throw new ReferenceError("Environment variable DB_USER is missing");
|
||||
if (!database) throw new ReferenceError("Environment variable DB_NAME is missing");
|
||||
|
||||
const dataSource = new DataSource({
|
||||
type: "postgres",
|
||||
host: host,
|
||||
port: 5432,
|
||||
username: username,
|
||||
password: password,
|
||||
database: database,
|
||||
migrationsRun: true,
|
||||
migrations: [path.join(__dirname, "/migrations/*")],
|
||||
entities: [],
|
||||
migrationsTransactionMode: "each",
|
||||
});
|
||||
|
||||
const initPromise = dataSource.initialize();
|
||||
|
||||
export default dataSource;
|
||||
export {
|
||||
initPromise
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user