From 24609ef7a85bae46880f8b918ff2520f0a75b947 Mon Sep 17 00:00:00 2001 From: ADAMJR Date: Wed, 22 Dec 2021 20:59:56 +0000 Subject: [PATCH] Separate types for frontend + backend --- backend/package.json | 2 +- backend/src/app.ts | 1 - .../deps.types.ts => backend/types/deps.d.ts | 0 .../types/dotenv.d.ts | 0 .../types/global.d.ts | 2 +- .../channel/message-box/message-box-input.tsx | 5 +- .../src/types/auth.d.ts | 0 .../src/types/entity.d.ts | 0 frontend/src/types/package.json | 4 + {types => frontend/src/types}/patterns.ts | 0 .../src/types/permissions.ts | 0 .../src/types/rest.d.ts | 2 +- .../src/types/testing.d.ts | 2 +- .../src/types/util.d.ts | 0 .../ws.types.ts => frontend/src/types/ws.d.ts | 2 +- frontend/types/dotenv.d.ts | 12 + .../types/store.d.ts | 6 +- types | 1 + types/main.ts | 9 - types/package-lock.json | 556 ------------------ types/package.json | 8 - 21 files changed, 26 insertions(+), 586 deletions(-) rename types/deps.types.ts => backend/types/deps.d.ts (100%) rename types/dotenv.types.ts => backend/types/dotenv.d.ts (100%) rename types/global.types.ts => backend/types/global.d.ts (51%) rename types/auth.types.ts => frontend/src/types/auth.d.ts (100%) rename types/entity.types.ts => frontend/src/types/entity.d.ts (100%) create mode 100644 frontend/src/types/package.json rename {types => frontend/src/types}/patterns.ts (100%) rename types/permission.types.ts => frontend/src/types/permissions.ts (100%) rename types/rest.types.ts => frontend/src/types/rest.d.ts (96%) rename types/testing.ts => frontend/src/types/testing.d.ts (85%) rename types/util.types.ts => frontend/src/types/util.d.ts (100%) rename types/ws.types.ts => frontend/src/types/ws.d.ts (99%) create mode 100644 frontend/types/dotenv.d.ts rename types/store.types.ts => frontend/types/store.d.ts (91%) create mode 120000 types delete mode 100644 types/main.ts delete mode 100644 types/package-lock.json delete mode 100644 types/package.json diff --git a/backend/package.json b/backend/package.json index 081fdac6..c22daefe 100644 --- a/backend/package.json +++ b/backend/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "scripts": { "start": "npm run start:dev", - "start:dev": "ts-node-dev --transpile-only src/app.ts", + "start:dev": "set NODE_ENV=DEV && ts-node-dev --transpile-only src/app.ts", "start:debug": "nodemon --exec 'node --inspect=0.0.0.0:9229 --require ts-node/register src/app.ts' --ext 'ts,yml'", "start:prod": "ts-node-transpile-only src/app.ts", "test": "npm run test:unit && npm run test:int", diff --git a/backend/src/app.ts b/backend/src/app.ts index 48b7e2ce..7efe5a46 100644 --- a/backend/src/app.ts +++ b/backend/src/app.ts @@ -1,4 +1,3 @@ -import '@accord/types'; import { connect } from 'mongoose'; import { config } from 'dotenv'; config(); diff --git a/types/deps.types.ts b/backend/types/deps.d.ts similarity index 100% rename from types/deps.types.ts rename to backend/types/deps.d.ts diff --git a/types/dotenv.types.ts b/backend/types/dotenv.d.ts similarity index 100% rename from types/dotenv.types.ts rename to backend/types/dotenv.d.ts diff --git a/types/global.types.ts b/backend/types/global.d.ts similarity index 51% rename from types/global.types.ts rename to backend/types/global.d.ts index 17bbee7c..40c924ff 100644 --- a/types/global.types.ts +++ b/backend/types/global.d.ts @@ -1,5 +1,5 @@ declare global { const log: import('winston').Logger; - const deps: import('./deps.types').default; + const deps: import('./deps').default; } export {} \ No newline at end of file diff --git a/frontend/src/components/channel/message-box/message-box-input.tsx b/frontend/src/components/channel/message-box/message-box-input.tsx index 76ee2440..6ddf99ba 100644 --- a/frontend/src/components/channel/message-box/message-box-input.tsx +++ b/frontend/src/components/channel/message-box/message-box-input.tsx @@ -1,9 +1,6 @@ import classNames from 'classnames'; -import { useEffect, useRef } from 'react'; +import { useRef } from 'react'; import { useDispatch, useSelector } from 'react-redux'; -import striptags from 'striptags'; -import useFormat from '../../../hooks/use-format'; -import useMentions from '../../../hooks/use-mentions'; import usePerms from '../../../hooks/use-perms'; import { startTyping } from '../../../store/typing'; import { actions as ui } from '../../../store/ui'; diff --git a/types/auth.types.ts b/frontend/src/types/auth.d.ts similarity index 100% rename from types/auth.types.ts rename to frontend/src/types/auth.d.ts diff --git a/types/entity.types.ts b/frontend/src/types/entity.d.ts similarity index 100% rename from types/entity.types.ts rename to frontend/src/types/entity.d.ts diff --git a/frontend/src/types/package.json b/frontend/src/types/package.json new file mode 100644 index 00000000..17342bdb --- /dev/null +++ b/frontend/src/types/package.json @@ -0,0 +1,4 @@ +{ + "name": "@accord/types", + "main": "main.ts" +} diff --git a/types/patterns.ts b/frontend/src/types/patterns.ts similarity index 100% rename from types/patterns.ts rename to frontend/src/types/patterns.ts diff --git a/types/permission.types.ts b/frontend/src/types/permissions.ts similarity index 100% rename from types/permission.types.ts rename to frontend/src/types/permissions.ts diff --git a/types/rest.types.ts b/frontend/src/types/rest.d.ts similarity index 96% rename from types/rest.types.ts rename to frontend/src/types/rest.d.ts index d46c1dbd..d1d8ff92 100644 --- a/types/rest.types.ts +++ b/frontend/src/types/rest.d.ts @@ -1,4 +1,4 @@ -import { Entity } from './entity.types'; +import { Entity } from './entity'; export namespace REST { export namespace To { diff --git a/types/testing.ts b/frontend/src/types/testing.d.ts similarity index 85% rename from types/testing.ts rename to frontend/src/types/testing.d.ts index 4dc4d2e1..3088952b 100644 --- a/types/testing.ts +++ b/frontend/src/types/testing.d.ts @@ -1,4 +1,4 @@ -import { WS } from './ws.types'; +import { WS } from './ws'; declare global { const socket: { diff --git a/types/util.types.ts b/frontend/src/types/util.d.ts similarity index 100% rename from types/util.types.ts rename to frontend/src/types/util.d.ts diff --git a/types/ws.types.ts b/frontend/src/types/ws.d.ts similarity index 99% rename from types/ws.types.ts rename to frontend/src/types/ws.d.ts index e9e0a43b..4c49be06 100644 --- a/types/ws.types.ts +++ b/frontend/src/types/ws.d.ts @@ -1,4 +1,4 @@ -import { Entity, ChannelTypes, InviteTypes, MessageTypes, UserTypes } from './entity.types'; +import { Entity, ChannelTypes, InviteTypes, MessageTypes, UserTypes } from './entity'; export namespace WS { export interface To { diff --git a/frontend/types/dotenv.d.ts b/frontend/types/dotenv.d.ts new file mode 100644 index 00000000..5ac66c26 --- /dev/null +++ b/frontend/types/dotenv.d.ts @@ -0,0 +1,12 @@ +declare global { + namespace NodeJS { + export interface ProcessEnv { + PORT: number; + REACT_APP_API_URL: string; + REACT_APP_CDN_URL: string; + REACT_APP_REPO: string; + REACT_APP_ROOT_API_URL: string; + } + } +} +export {}; \ No newline at end of file diff --git a/types/store.types.ts b/frontend/types/store.d.ts similarity index 91% rename from types/store.types.ts rename to frontend/types/store.d.ts index 4a540c31..816be46a 100644 --- a/types/store.types.ts +++ b/frontend/types/store.d.ts @@ -1,7 +1,7 @@ -import { Entity, UserTypes } from './entity.types'; -import { WS } from './ws.types'; +import { Entity, UserTypes } from '@accord/types/entity'; +import { WS } from '@accord/types/ws'; -export namespace Store { +declare namespace Store { export interface AppState { auth: { attemptedLogin: boolean; diff --git a/types b/types new file mode 120000 index 00000000..452d6bb8 --- /dev/null +++ b/types @@ -0,0 +1 @@ +C:/Users/adamj/Documents/Apps/accord/frontend/src/types \ No newline at end of file diff --git a/types/main.ts b/types/main.ts deleted file mode 100644 index 92bec8ce..00000000 --- a/types/main.ts +++ /dev/null @@ -1,9 +0,0 @@ -export * from './auth.types'; -export * from './deps.types'; -export * from './dotenv.types'; -export * from './entity.types'; -export * from './global.types'; -export * from './rest.types'; -export * from './store.types'; -export * from './util.types'; -export * from './ws.types'; \ No newline at end of file diff --git a/types/package-lock.json b/types/package-lock.json deleted file mode 100644 index ce3206bd..00000000 --- a/types/package-lock.json +++ /dev/null @@ -1,556 +0,0 @@ -{ - "name": "@accord/types", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "@accord/types", - "dependencies": { - "@accord/backend": "file:../backend/src", - "@types/winston": "^2.4.4" - } - }, - "../backend": { - "name": "@accord/backend", - "version": "0.0.0", - "dependencies": { - "@accord/backend": "file:./src", - "@accord/ion": "github:accord-dot-app/ion", - "@accord/types": "file:../types", - "body-parser": "^1.19.0", - "chai-things": "^0.2.0", - "colors": "^1.4.0", - "cors": "^2.8.5", - "crypto-js": "^4.1.1", - "dotenv": "^8.2.0", - "express": "^4.17.1", - "express-async-errors": "^3.1.1", - "express-rate-limit": "^5.2.6", - "faker": "^5.4.0", - "got": "^11.7.0", - "helmet": "^4.4.1", - "imghash": "^0.0.9", - "jsonwebtoken": "^8.5.1", - "mongodb-memory-server": "^8.0.2", - "mongoose": "^5.10.7", - "mongoose-unique-validator": "^2.0.3", - "multer": "^1.4.3", - "node-fetch": "^2.6.1", - "nodemailer": "^6.5.0", - "nodemailer-pug-engine": "^2.0.0", - "passport": "^0.4.1", - "passport-local": "^1.0.0", - "passport-local-mongoose": "^6.0.1", - "rate-limit-mongo": "^2.3.1", - "re2": "^1.16.0", - "socket.io": "^4.0.0", - "socket.io-client": "^4.0.0", - "striptags": "^3.2.0", - "ts-node": "^9.1.1", - "typescript": "^4.2.3", - "winston": "^3.3.3" - }, - "devDependencies": { - "@types/chai": "^4.2.14", - "@types/chai-as-promised": "^7.1.3", - "@types/chai-spies": "^1.0.3", - "@types/chai-things": "^0.0.34", - "@types/colors": "^1.2.1", - "@types/cors": "^2.8.7", - "@types/crypto-js": "^4.0.2", - "@types/deasync": "^0.1.2", - "@types/dotenv": "^8.2.0", - "@types/express": "^4.17.11", - "@types/express-rate-limit": "^5.1.1", - "@types/faker": "^5.1.6", - "@types/jest": "^27.0.1", - "@types/jsonwebtoken": "^8.5.0", - "@types/mocha": "^8.2.3", - "@types/mongoose": "^5.7.36", - "@types/multer": "^1.4.7", - "@types/node": "^14.11.2", - "@types/node-fetch": "^2.5.7", - "@types/nodemailer": "^6.4.1", - "@types/passport": "^1.0.4", - "@types/passport-local": "^1.0.33", - "@types/socket.io": "^2.1.13", - "@types/socket.io-client": "^3.0.0", - "@types/supertest": "^2.0.10", - "chai": "^4.2.0", - "chai-as-promised": "^7.1.1", - "chai-spies": "^1.0.0", - "mocha": "^8.2.1", - "nodemon": "^2.0.14", - "supertest": "^6.1.3", - "ts-mocha": "^8.0.0", - "ts-node-dev": "^1.1.8" - } - }, - "../backend/src": {}, - "node_modules/@accord/backend": { - "resolved": "../backend/src", - "link": true - }, - "node_modules/@dabh/diagnostics": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz", - "integrity": "sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==", - "dependencies": { - "colorspace": "1.1.x", - "enabled": "2.0.x", - "kuler": "^2.0.0" - } - }, - "node_modules/@types/winston": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/@types/winston/-/winston-2.4.4.tgz", - "integrity": "sha512-BVGCztsypW8EYwJ+Hq+QNYiT/MUyCif0ouBH+flrY66O5W+KIXAMML6E/0fJpm7VjIzgangahl5S03bJJQGrZw==", - "deprecated": "This is a stub types definition. winston provides its own type definitions, so you do not need this installed.", - "dependencies": { - "winston": "*" - } - }, - "node_modules/async": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.2.tgz", - "integrity": "sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==" - }, - "node_modules/color": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", - "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", - "dependencies": { - "color-convert": "^1.9.3", - "color-string": "^1.6.0" - } - }, - "node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" - }, - "node_modules/color-string": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz", - "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==", - "dependencies": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" - } - }, - "node_modules/colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "engines": { - "node": ">=0.1.90" - } - }, - "node_modules/colorspace": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz", - "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==", - "dependencies": { - "color": "^3.1.3", - "text-hex": "1.0.x" - } - }, - "node_modules/enabled": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", - "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==" - }, - "node_modules/fecha": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz", - "integrity": "sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q==" - }, - "node_modules/fn.name": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", - "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==" - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/is-arrayish": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" - }, - "node_modules/is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/kuler": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", - "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==" - }, - "node_modules/logform": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.3.0.tgz", - "integrity": "sha512-graeoWUH2knKbGthMtuG1EfaSPMZFZBIrhuJHhkS5ZseFBrc7DupCzihOQAzsK/qIKPQaPJ/lFQFctILUY5ARQ==", - "dependencies": { - "colors": "^1.2.1", - "fecha": "^4.2.0", - "ms": "^2.1.1", - "safe-stable-stringify": "^1.1.0", - "triple-beam": "^1.3.0" - } - }, - "node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, - "node_modules/one-time": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", - "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==", - "dependencies": { - "fn.name": "1.x.x" - } - }, - "node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/safe-stable-stringify": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz", - "integrity": "sha512-ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw==" - }, - "node_modules/simple-swizzle": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", - "dependencies": { - "is-arrayish": "^0.3.1" - } - }, - "node_modules/stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=", - "engines": { - "node": "*" - } - }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/text-hex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", - "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" - }, - "node_modules/triple-beam": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz", - "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==" - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, - "node_modules/winston": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz", - "integrity": "sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw==", - "dependencies": { - "@dabh/diagnostics": "^2.0.2", - "async": "^3.1.0", - "is-stream": "^2.0.0", - "logform": "^2.2.0", - "one-time": "^1.0.0", - "readable-stream": "^3.4.0", - "stack-trace": "0.0.x", - "triple-beam": "^1.3.0", - "winston-transport": "^4.4.0" - }, - "engines": { - "node": ">= 6.4.0" - } - }, - "node_modules/winston-transport": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.1.tgz", - "integrity": "sha512-ciZRlU4CSjHqHe8RQG1iPxKMRVwv6ZJ0RC7DxStKWd0KjpAhPDy5gVYSCpIUq+5CUsP+IyNOTZy1X0tO2QZqjg==", - "dependencies": { - "logform": "^2.2.0", - "readable-stream": "^3.4.0", - "triple-beam": "^1.2.0" - }, - "engines": { - "node": ">= 6.4.0" - } - } - }, - "dependencies": { - "@accord/backend": { - "version": "file:../backend/src" - }, - "@dabh/diagnostics": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz", - "integrity": "sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==", - "requires": { - "colorspace": "1.1.x", - "enabled": "2.0.x", - "kuler": "^2.0.0" - } - }, - "@types/winston": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/@types/winston/-/winston-2.4.4.tgz", - "integrity": "sha512-BVGCztsypW8EYwJ+Hq+QNYiT/MUyCif0ouBH+flrY66O5W+KIXAMML6E/0fJpm7VjIzgangahl5S03bJJQGrZw==", - "requires": { - "winston": "*" - } - }, - "async": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.2.tgz", - "integrity": "sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==" - }, - "color": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", - "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", - "requires": { - "color-convert": "^1.9.3", - "color-string": "^1.6.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" - }, - "color-string": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz", - "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==", - "requires": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" - } - }, - "colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" - }, - "colorspace": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz", - "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==", - "requires": { - "color": "^3.1.3", - "text-hex": "1.0.x" - } - }, - "enabled": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", - "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==" - }, - "fecha": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz", - "integrity": "sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q==" - }, - "fn.name": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", - "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==" - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "is-arrayish": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" - }, - "is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" - }, - "kuler": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", - "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==" - }, - "logform": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.3.0.tgz", - "integrity": "sha512-graeoWUH2knKbGthMtuG1EfaSPMZFZBIrhuJHhkS5ZseFBrc7DupCzihOQAzsK/qIKPQaPJ/lFQFctILUY5ARQ==", - "requires": { - "colors": "^1.2.1", - "fecha": "^4.2.0", - "ms": "^2.1.1", - "safe-stable-stringify": "^1.1.0", - "triple-beam": "^1.3.0" - } - }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, - "one-time": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", - "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==", - "requires": { - "fn.name": "1.x.x" - } - }, - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" - }, - "safe-stable-stringify": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz", - "integrity": "sha512-ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw==" - }, - "simple-swizzle": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", - "requires": { - "is-arrayish": "^0.3.1" - } - }, - "stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=" - }, - "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "requires": { - "safe-buffer": "~5.2.0" - } - }, - "text-hex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", - "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" - }, - "triple-beam": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz", - "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==" - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, - "winston": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz", - "integrity": "sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw==", - "requires": { - "@dabh/diagnostics": "^2.0.2", - "async": "^3.1.0", - "is-stream": "^2.0.0", - "logform": "^2.2.0", - "one-time": "^1.0.0", - "readable-stream": "^3.4.0", - "stack-trace": "0.0.x", - "triple-beam": "^1.3.0", - "winston-transport": "^4.4.0" - } - }, - "winston-transport": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.1.tgz", - "integrity": "sha512-ciZRlU4CSjHqHe8RQG1iPxKMRVwv6ZJ0RC7DxStKWd0KjpAhPDy5gVYSCpIUq+5CUsP+IyNOTZy1X0tO2QZqjg==", - "requires": { - "logform": "^2.2.0", - "readable-stream": "^3.4.0", - "triple-beam": "^1.2.0" - } - } - } -} diff --git a/types/package.json b/types/package.json deleted file mode 100644 index 123fab0b..00000000 --- a/types/package.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "@accord/types", - "main": "main.ts", - "dependencies": { - "@accord/backend": "file:../backend/src", - "@types/winston": "^2.4.4" - } -}