diff --git a/package.json b/package.json index f71eb53..6f964f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "name": "codex.docs", "license": "Apache-2.0", + "type": "module", "browserslist": [ "last 2 versions", "> 1%" @@ -34,7 +35,7 @@ "multer": "^1.4.2", "nedb": "^1.8.0", "node-cache": "^5.1.2", - "node-fetch": "^2.6.1", + "node-fetch": "^3.2.10", "open-graph-scraper": "^4.9.0", "twig": "^1.15.4", "uuid4": "^2.0.2" @@ -120,8 +121,8 @@ "rimraf": "^3.0.2", "sinon": "^11.1.2", "ts-mocha": "^8.0.0", - "ts-node": "^10.1.0", - "typescript": "^4.3.5", + "ts-node": "^10.9.1", + "typescript": "^4.7.4", "webpack": "^5.70.0", "webpack-cli": "^4.9.2" } diff --git a/src/backend/app.ts b/src/backend/app.ts index 6bbbbcb..049ec81 100644 --- a/src/backend/app.ts +++ b/src/backend/app.ts @@ -1,17 +1,24 @@ import express, { NextFunction, Request, Response } from 'express'; import path from 'path'; +import { fileURLToPath } from 'url'; import cookieParser from 'cookie-parser'; import morgan from 'morgan'; -import rcParser from './utils/rcparser'; -import routes from './routes'; -import HttpException from './exceptions/httpException'; +import rcParser from './utils/rcparser.js'; +import routes from './routes/index.js'; +import HttpException from './exceptions/httpException.js'; import * as dotenv from 'dotenv'; import config from 'config'; -import HawkCatcher from '@hawk.so/nodejs'; +import { default as HawkCatcher } from '@hawk.so/nodejs'; import os from 'os'; import appConfig from 'config'; -import { downloadFavicon, FaviconData } from './utils/downloadFavicon'; +import { downloadFavicon, FaviconData } from './utils/downloadFavicon.js'; +/** + * The __dirname CommonJS variables are not available in ES modules. + * https://nodejs.org/api/esm.html#no-__filename-or-__dirname + */ +// eslint-disable-next-line @typescript-eslint/naming-convention +const __dirname = path.dirname(fileURLToPath(import.meta.url)); dotenv.config(); const app = express(); @@ -34,7 +41,7 @@ if (process.env.HAWK_TOKEN_CLIENT) { // view engine setup app.set('views', path.join(__dirname, './', 'views')); app.set('view engine', 'twig'); -require('./utils/twig'); +import('./utils/twig.js'); const downloadedFaviconFolder = os.tmpdir(); diff --git a/src/backend/controllers/aliases.ts b/src/backend/controllers/aliases.ts index 0628302..4416fce 100644 --- a/src/backend/controllers/aliases.ts +++ b/src/backend/controllers/aliases.ts @@ -1,4 +1,4 @@ -import Alias from '../models/alias'; +import Alias from '../models/alias.js'; /** * @class Aliases diff --git a/src/backend/controllers/pages.ts b/src/backend/controllers/pages.ts index 5329552..f5d70df 100644 --- a/src/backend/controllers/pages.ts +++ b/src/backend/controllers/pages.ts @@ -1,9 +1,9 @@ -import Page, { PageData } from '../models/page'; -import Alias from '../models/alias'; -import PagesOrder from './pagesOrder'; -import PageOrder from '../models/pageOrder'; -import HttpException from '../exceptions/httpException'; -import PagesFlatArray from '../models/pagesFlatArray'; +import Page, { PageData } from '../models/page.js'; +import Alias from '../models/alias.js'; +import PagesOrder from './pagesOrder.js'; +import PageOrder from '../models/pageOrder.js'; +import HttpException from '../exceptions/httpException.js'; +import PagesFlatArray from '../models/pagesFlatArray.js'; type PageDataFields = keyof PageData; diff --git a/src/backend/controllers/pagesOrder.ts b/src/backend/controllers/pagesOrder.ts index 0227878..f0a287c 100644 --- a/src/backend/controllers/pagesOrder.ts +++ b/src/backend/controllers/pagesOrder.ts @@ -1,6 +1,6 @@ -import PageOrder from '../models/pageOrder'; -import Page from '../models/page'; -import PagesFlatArray from '../models/pagesFlatArray'; +import PageOrder from '../models/pageOrder.js'; +import Page from '../models/page.js'; +import PagesFlatArray from '../models/pagesFlatArray.js'; /** * @class PagesOrder diff --git a/src/backend/controllers/transport.ts b/src/backend/controllers/transport.ts index 1ebd927..4bd5918 100644 --- a/src/backend/controllers/transport.ts +++ b/src/backend/controllers/transport.ts @@ -3,9 +3,9 @@ import fetch from 'node-fetch'; import fs from 'fs'; import nodePath from 'path'; import config from 'config'; -import File, { FileData } from '../models/file'; -import crypto from '../utils/crypto'; -import deepMerge from '../utils/objects'; +import File, { FileData } from '../models/file.js'; +import crypto from '../utils/crypto.js'; +import deepMerge from '../utils/objects.js'; const random16 = crypto.random16; diff --git a/src/backend/models/alias.ts b/src/backend/models/alias.ts index 58d8142..5853004 100644 --- a/src/backend/models/alias.ts +++ b/src/backend/models/alias.ts @@ -1,5 +1,5 @@ -import crypto from '../utils/crypto'; -import database from '../utils/database/index'; +import crypto from '../utils/crypto.js'; +import database from '../utils/database/index.js'; const binaryMD5 = crypto.binaryMD5; const aliasesDb = database['aliases']; diff --git a/src/backend/models/file.ts b/src/backend/models/file.ts index 794ce0a..e70d849 100644 --- a/src/backend/models/file.ts +++ b/src/backend/models/file.ts @@ -1,4 +1,4 @@ -import database from '../utils/database/index'; +import database from '../utils/database/index.js'; const filesDb = database['files']; diff --git a/src/backend/models/page.ts b/src/backend/models/page.ts index d90b186..cc99baf 100644 --- a/src/backend/models/page.ts +++ b/src/backend/models/page.ts @@ -1,5 +1,5 @@ -import urlify from '../utils/urlify'; -import database from '../utils/database/index'; +import urlify from '../utils/urlify.js'; +import database from '../utils/database/index.js'; const pagesDb = database['pages']; diff --git a/src/backend/models/pageOrder.ts b/src/backend/models/pageOrder.ts index e66fb9e..24ffc17 100644 --- a/src/backend/models/pageOrder.ts +++ b/src/backend/models/pageOrder.ts @@ -1,4 +1,4 @@ -import database from '../utils/database/index'; +import database from '../utils/database/index.js'; const db = database['pagesOrder']; diff --git a/src/backend/models/pagesFlatArray.ts b/src/backend/models/pagesFlatArray.ts index 8388cd2..c0b5366 100644 --- a/src/backend/models/pagesFlatArray.ts +++ b/src/backend/models/pagesFlatArray.ts @@ -1,5 +1,5 @@ -import Page from './page'; -import PageOrder from './pageOrder'; +import Page from './page.js'; +import PageOrder from './pageOrder.js'; import NodeCache from 'node-cache'; // Create cache for flat array diff --git a/src/backend/routes/aliases.ts b/src/backend/routes/aliases.ts index 826d2da..df467e8 100644 --- a/src/backend/routes/aliases.ts +++ b/src/backend/routes/aliases.ts @@ -1,9 +1,9 @@ import express, { Request, Response } from 'express'; -import Aliases from '../controllers/aliases'; -import Pages from '../controllers/pages'; -import Alias from '../models/alias'; -import verifyToken from './middlewares/token'; -import PagesFlatArray from '../models/pagesFlatArray'; +import Aliases from '../controllers/aliases.js'; +import Pages from '../controllers/pages.js'; +import Alias from '../models/alias.js'; +import verifyToken from './middlewares/token.js'; +import PagesFlatArray from '../models/pagesFlatArray.js'; const router = express.Router(); diff --git a/src/backend/routes/api/index.ts b/src/backend/routes/api/index.ts index be225d8..7cb2328 100644 --- a/src/backend/routes/api/index.ts +++ b/src/backend/routes/api/index.ts @@ -1,7 +1,7 @@ import express from 'express'; -import pagesAPI from './pages'; -import transportAPI from './transport'; -import linksAPI from './links'; +import pagesAPI from './pages.js'; +import transportAPI from './transport.js'; +import linksAPI from './links.js'; const router = express.Router(); diff --git a/src/backend/routes/api/pages.ts b/src/backend/routes/api/pages.ts index 7aef335..f4b1673 100644 --- a/src/backend/routes/api/pages.ts +++ b/src/backend/routes/api/pages.ts @@ -1,7 +1,7 @@ import express, { Request, Response } from 'express'; import multerFunc from 'multer'; -import Pages from '../../controllers/pages'; -import PagesOrder from '../../controllers/pagesOrder'; +import Pages from '../../controllers/pages.js'; +import PagesOrder from '../../controllers/pagesOrder.js'; const router = express.Router(); const multer = multerFunc(); diff --git a/src/backend/routes/api/transport.ts b/src/backend/routes/api/transport.ts index 0f99bdd..f492506 100644 --- a/src/backend/routes/api/transport.ts +++ b/src/backend/routes/api/transport.ts @@ -3,8 +3,8 @@ import multer, { StorageEngine } from 'multer'; import mime from 'mime'; import mkdirp from 'mkdirp'; import config from 'config'; -import Transport from '../../controllers/transport'; -import { random16 } from '../../utils/crypto'; +import Transport from '../../controllers/transport.js'; +import { random16 } from '../../utils/crypto.js'; const router = Router(); diff --git a/src/backend/routes/home.ts b/src/backend/routes/home.ts index ffe0148..3f82940 100644 --- a/src/backend/routes/home.ts +++ b/src/backend/routes/home.ts @@ -1,5 +1,5 @@ import express, { Request, Response } from 'express'; -import verifyToken from './middlewares/token'; +import verifyToken from './middlewares/token.js'; const router = express.Router(); diff --git a/src/backend/routes/index.ts b/src/backend/routes/index.ts index 2057c44..b65d653 100644 --- a/src/backend/routes/index.ts +++ b/src/backend/routes/index.ts @@ -1,10 +1,10 @@ import express from 'express'; -import home from './home'; -import pages from './pages'; -import auth from './auth'; -import aliases from './aliases'; -import api from './api'; -import pagesMiddleware from './middlewares/pages'; +import home from './home.js'; +import pages from './pages.js'; +import auth from './auth.js'; +import aliases from './aliases.js'; +import api from './api/index.js'; +import pagesMiddleware from './middlewares/pages.js'; const router = express.Router(); diff --git a/src/backend/routes/middlewares/pages.ts b/src/backend/routes/middlewares/pages.ts index 523b7cc..528ee63 100644 --- a/src/backend/routes/middlewares/pages.ts +++ b/src/backend/routes/middlewares/pages.ts @@ -1,9 +1,9 @@ import { NextFunction, Request, Response } from 'express'; -import Pages from '../../controllers/pages'; -import PagesOrder from '../../controllers/pagesOrder'; -import Page from '../../models/page'; -import asyncMiddleware from '../../utils/asyncMiddleware'; -import PageOrder from '../../models/pageOrder'; +import Pages from '../../controllers/pages.js'; +import PagesOrder from '../../controllers/pagesOrder.js'; +import Page from '../../models/page.js'; +import asyncMiddleware from '../../utils/asyncMiddleware.js'; +import PageOrder from '../../models/pageOrder.js'; /** * Process one-level pages list to parent-children list diff --git a/src/backend/routes/pages.ts b/src/backend/routes/pages.ts index 37908b0..b4c6424 100644 --- a/src/backend/routes/pages.ts +++ b/src/backend/routes/pages.ts @@ -1,9 +1,9 @@ import express, { NextFunction, Request, Response } from 'express'; -import Pages from '../controllers/pages'; -import PagesOrder from '../controllers/pagesOrder'; -import verifyToken from './middlewares/token'; -import allowEdit from './middlewares/locals'; -import PagesFlatArray from '../models/pagesFlatArray'; +import Pages from '../controllers/pages.js'; +import PagesOrder from '../controllers/pagesOrder.js'; +import verifyToken from './middlewares/token.js'; +import allowEdit from './middlewares/locals.js'; +import PagesFlatArray from '../models/pagesFlatArray.js'; const router = express.Router(); diff --git a/src/backend/utils/database/index.ts b/src/backend/utils/database/index.ts index 1f1f60b..caf23d8 100644 --- a/src/backend/utils/database/index.ts +++ b/src/backend/utils/database/index.ts @@ -1,9 +1,9 @@ import Datastore from 'nedb'; -import { AliasData } from '../../models/alias'; -import { FileData } from '../../models/file'; -import { PageData } from '../../models/page'; -import { PageOrderData } from '../../models/pageOrder'; -import initDb from './initDb'; +import { AliasData } from '../../models/alias.js'; +import { FileData } from '../../models/file.js'; +import { PageData } from '../../models/page.js'; +import { PageOrderData } from '../../models/pageOrder.js'; +import initDb from './initDb.js'; /** * @typedef Options - optional params diff --git a/src/backend/utils/downloadFavicon.ts b/src/backend/utils/downloadFavicon.ts index ffecfb7..73aa2c0 100644 --- a/src/backend/utils/downloadFavicon.ts +++ b/src/backend/utils/downloadFavicon.ts @@ -1,6 +1,6 @@ import path from 'path'; import fs from 'fs'; -import fetch from 'node-fetch'; +import fetch, { RequestInit } from 'node-fetch'; /** * Uploaded favicon data @@ -61,7 +61,7 @@ export async function downloadFavicon(destination: string, faviconFolder: string }, 5000); // Make get request to url - const res = await fetch(destination, { signal: controller.signal }); + const res = await fetch(destination, { signal: controller.signal as RequestInit['signal'] }); // Get buffer data from response const fileData = await res.buffer(); diff --git a/src/backend/utils/rcparser.ts b/src/backend/utils/rcparser.ts index 85a274d..1b1befd 100644 --- a/src/backend/utils/rcparser.ts +++ b/src/backend/utils/rcparser.ts @@ -1,6 +1,14 @@ import fs from 'fs'; import path from 'path'; import config from 'config'; +import { fileURLToPath } from 'url'; + +/** + * The __dirname CommonJS variables are not available in ES modules. + * https://nodejs.org/api/esm.html#no-__filename-or-__dirname + */ +// eslint-disable-next-line @typescript-eslint/naming-convention +const __dirname = path.dirname(fileURLToPath(import.meta.url)); const rcPath = path.resolve(__dirname, '../../../', config.get('rcFile') || './.codexdocsrc'); diff --git a/src/backend/utils/twig.ts b/src/backend/utils/twig.ts index 0c66ad9..0cf2925 100644 --- a/src/backend/utils/twig.ts +++ b/src/backend/utils/twig.ts @@ -3,8 +3,16 @@ */ import twig from 'twig'; import fs from 'fs'; -import urlify from './urlify'; +import urlify from './urlify.js'; import path from 'path'; +import { fileURLToPath } from 'url'; + +/** + * The __dirname CommonJS variables are not available in ES modules. + * https://nodejs.org/api/esm.html#no-__filename-or-__dirname + */ +// eslint-disable-next-line @typescript-eslint/naming-convention +const __dirname = path.dirname(fileURLToPath(import.meta.url)); export default (function () { 'use strict'; diff --git a/src/backend/utils/urlify.ts b/src/backend/utils/urlify.ts index 9716a10..8ce6778 100644 --- a/src/backend/utils/urlify.ts +++ b/src/backend/utils/urlify.ts @@ -1,4 +1,4 @@ -import translateString from './translation'; +import translateString from './translation.js'; /** * Convert text to URL-like string diff --git a/src/bin/server.ts b/src/bin/server.ts index 5ea477b..3b67135 100644 --- a/src/bin/server.ts +++ b/src/bin/server.ts @@ -1,7 +1,7 @@ /** * Module dependencies. */ -import app from '../backend/app'; +import app from '../backend/app.js'; import http from 'http'; import config from 'config'; import Debug from 'debug'; @@ -96,4 +96,4 @@ function onListening(): void { export default { server, app, -}; \ No newline at end of file +}; diff --git a/src/test/models/alias.ts b/src/test/models/alias.ts index 453457e..32e2ad2 100644 --- a/src/test/models/alias.ts +++ b/src/test/models/alias.ts @@ -2,12 +2,20 @@ import { expect } from 'chai'; import fs from 'fs'; import path from 'path'; import config from 'config'; -import Alias from '../../backend/models/alias'; -import { binaryMD5 } from '../../backend/utils/crypto'; -import database from '../../backend/utils/database'; +import Alias from '../../backend/models/alias.js'; +import { binaryMD5 } from '../../backend/utils/crypto.js'; +import database from '../../backend/utils/database/index.js'; +import { fileURLToPath } from 'url'; const aliases = database['aliases']; +/** + * The __dirname CommonJS variables are not available in ES modules. + * https://nodejs.org/api/esm.html#no-__filename-or-__dirname + */ +// eslint-disable-next-line @typescript-eslint/naming-convention +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + describe('Alias model', () => { after(() => { const pathToDB = path.resolve(__dirname, '../../../', config.get('database'), './aliases.db'); diff --git a/src/test/models/file.ts b/src/test/models/file.ts index f1d54a4..434aacc 100644 --- a/src/test/models/file.ts +++ b/src/test/models/file.ts @@ -2,8 +2,16 @@ import { expect } from 'chai'; import fs from 'fs'; import path from 'path'; import config from 'config'; -import File from '../../backend/models/file'; -import database from '../../backend/utils/database'; +import File from '../../backend/models/file.js'; +import database from '../../backend/utils/database/index.js'; +import { fileURLToPath } from 'url'; + +/** + * The __dirname CommonJS variables are not available in ES modules. + * https://nodejs.org/api/esm.html#no-__filename-or-__dirname + */ +// eslint-disable-next-line @typescript-eslint/naming-convention +const __dirname = path.dirname(fileURLToPath(import.meta.url)); const files = database['files']; @@ -159,9 +167,9 @@ describe('File model', () => { if (savedFile._id !== undefined){ const foundFile = await File.get(savedFile._id); - + const { data } = foundFile; - + expect(data._id).to.equal(savedFile._id); expect(data.name).to.equal(savedFile.name); expect(data.filename).to.equal(savedFile.filename); @@ -188,9 +196,9 @@ describe('File model', () => { if (savedFile.filename !== undefined){ const foundFile = await File.getByFilename(savedFile.filename); - + const { data } = foundFile; - + expect(data._id).to.equal(savedFile._id); expect(data.name).to.equal(savedFile.name); expect(data.filename).to.equal(savedFile.filename); diff --git a/src/test/models/page.ts b/src/test/models/page.ts index bd9d61d..d94e14e 100644 --- a/src/test/models/page.ts +++ b/src/test/models/page.ts @@ -2,9 +2,17 @@ import { expect } from 'chai'; import fs from 'fs'; import path from 'path'; import config from 'config'; -import Page from '../../backend/models/page'; -import translateString from '../../backend/utils/translation'; -import database from '../../backend/utils/database'; +import Page from '../../backend/models/page.js'; +import translateString from '../../backend/utils/translation.js'; +import database from '../../backend/utils/database/index.js'; +import { fileURLToPath } from 'url'; + +/** + * The __dirname CommonJS variables are not available in ES modules. + * https://nodejs.org/api/esm.html#no-__filename-or-__dirname + */ +// eslint-disable-next-line @typescript-eslint/naming-convention +const __dirname = path.dirname(fileURLToPath(import.meta.url)); const pages = database['pages']; diff --git a/src/test/models/pageOrder.ts b/src/test/models/pageOrder.ts index 7a3bbe3..574e357 100644 --- a/src/test/models/pageOrder.ts +++ b/src/test/models/pageOrder.ts @@ -2,8 +2,16 @@ import { expect } from 'chai'; import fs from 'fs'; import path from 'path'; import config from 'config'; -import PageOrder from '../../backend/models/pageOrder'; -import database from '../../backend/utils/database'; +import PageOrder from '../../backend/models/pageOrder.js'; +import database from '../../backend/utils/database/index.js'; +import { fileURLToPath } from 'url'; + +/** + * The __dirname CommonJS variables are not available in ES modules. + * https://nodejs.org/api/esm.html#no-__filename-or-__dirname + */ +// eslint-disable-next-line @typescript-eslint/naming-convention +const __dirname = path.dirname(fileURLToPath(import.meta.url)); const pagesOrder = database['pagesOrder']; diff --git a/src/test/rest/aliases.ts b/src/test/rest/aliases.ts index fe9ec3e..620989e 100644 --- a/src/test/rest/aliases.ts +++ b/src/test/rest/aliases.ts @@ -3,7 +3,15 @@ import path from 'path'; import config from 'config'; import chai from 'chai'; import chaiHTTP from 'chai-http'; -import server from '../../bin/server'; +import server from '../../bin/server.js'; +import { fileURLToPath } from 'url'; + +/** + * The __dirname CommonJS variables are not available in ES modules. + * https://nodejs.org/api/esm.html#no-__filename-or-__dirname + */ +// eslint-disable-next-line @typescript-eslint/naming-convention +const __dirname = path.dirname(fileURLToPath(import.meta.url)); const {expect} = chai; const app = server.app; diff --git a/src/test/rest/pages.ts b/src/test/rest/pages.ts index ca73eb6..6c36b29 100644 --- a/src/test/rest/pages.ts +++ b/src/test/rest/pages.ts @@ -3,11 +3,20 @@ import path from 'path'; import config from 'config'; import chai from 'chai'; import chaiHTTP from 'chai-http'; -import server from '../../bin/server'; -import model from '../../backend/models/page'; -import Page from '../../backend/models/page'; -import PageOrder from '../../backend/models/pageOrder'; -import translateString from '../../backend/utils/translation'; +import server from '../../bin/server.js'; +import model from '../../backend/models/page.js'; +import Page from '../../backend/models/page.js'; +import PageOrder from '../../backend/models/pageOrder.js'; +import translateString from '../../backend/utils/translation.js'; +import { fileURLToPath } from 'url'; + +/** + * The __dirname CommonJS variables are not available in ES modules. + * https://nodejs.org/api/esm.html#no-__filename-or-__dirname + */ +// eslint-disable-next-line @typescript-eslint/naming-convention +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + const {expect} = chai; const app = server.app; @@ -516,7 +525,7 @@ describe('Pages REST: ', () => { page6 = await Page.get(pages[6]); expect(page6.data._id).to.be.undefined; - + page7 = await Page.get(pages[7]); expect(page7.data._id).to.be.undefined; diff --git a/src/test/rest/transport.ts b/src/test/rest/transport.ts index ccee062..882943e 100644 --- a/src/test/rest/transport.ts +++ b/src/test/rest/transport.ts @@ -5,8 +5,17 @@ import chai from 'chai'; import chaiHTTP from 'chai-http'; import rimraf from 'rimraf'; import config from 'config'; -import server from '../../bin/server'; -import model from '../../backend/models/file'; +import server from '../../bin/server.js'; +import model from '../../backend/models/file.js'; +import { fileURLToPath } from 'url'; + +/** + * The __dirname CommonJS variables are not available in ES modules. + * https://nodejs.org/api/esm.html#no-__filename-or-__dirname + */ +// eslint-disable-next-line @typescript-eslint/naming-convention +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + const {expect} = chai; const app = server.app; @@ -119,7 +128,7 @@ describe('Transport routes: ', () => { if (file.path !== undefined){ const getRes = await agent .get(file.path); - + expect(getRes).to.have.status(200); expect(getRes).to.have.header('content-type', new RegExp(`^${file.mimetype}`)); } @@ -170,7 +179,7 @@ describe('Transport routes: ', () => { if (file.path !== undefined){ const getRes = await agent .get(file.path); - + expect(getRes).to.have.status(200); expect(getRes).to.have.header('content-type', file.mimetype); } diff --git a/tsconfig.json b/tsconfig.json index c92b512..69ddde1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,9 +4,11 @@ /* Basic Options */ // "incremental": true, /* Enable incremental compilation */ - "target": "ES2015", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */ - "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */ - // "lib": [], /* Specify library files to be included in the compilation. */ + "target": "ES2021", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */ + "module": "Node16", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */ + "lib": [ /* Specify library files to be included in the compilation. */ + "ESNext" /* ESNext includes new Level-4 features that were recently added to the ECMA-262 JS spec */ + ], // "allowJs": true, /* Allow javascript files to be compiled. */ // "checkJs": true, /* Report errors in .js files. */ // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */ @@ -44,13 +46,15 @@ // "noPropertyAccessFromIndexSignature": true, /* Require undeclared properties from index signatures to use element accesses. */ /* Module Resolution Options */ - // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ + "moduleResolution": "NodeNext", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ // "typeRoots": [], /* List of folders to include type definitions from. */ - // "types": [], /* Type declaration files to be included in compilation. */ - // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ + "types": [ /* Type declaration files to be included in compilation. */ + "node" + ], + "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ @@ -69,5 +73,12 @@ "skipLibCheck": true, /* Skip type checking of declaration files. */ "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ }, - "include": ["src/**/*"] + "include": ["src/**/*"], + "ts-node": { + /** + * Tell ts-node CLI to install the --loader automatically, explained below + * https://typestrong.org/ts-node/docs/imports/ + */ + "esm": true + } } diff --git a/webpack.config.js b/webpack.config.js index 997726a..90fa76f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,5 +1,12 @@ -const MiniCssExtractPlugin = require('mini-css-extract-plugin'); -const path = require('path'); +import MiniCssExtractPlugin from 'mini-css-extract-plugin'; +import path from 'path'; +import { fileURLToPath } from 'url'; + +/** + * The __dirname CommonJS variables are not available in ES modules. + * https://nodejs.org/api/esm.html#no-__filename-or-__dirname + */ +const __dirname = path.dirname(fileURLToPath(import.meta.url)); /** * Options for the Babel @@ -22,7 +29,7 @@ const babelLoader = { }, }; -module.exports = () => { +export default () => { return { entry: './src/frontend/js/app.js', output: { @@ -53,9 +60,31 @@ module.exports = () => { loader: 'postcss-loader', }, ], - }, { + }, + /** + * https://github.com/webpack/webpack/issues/11467#issuecomment-691873586 + */ + // { + // test: /\.m?js/, + // type: "javascript/auto", + // }, + // { + // test: /\.m?js/, + // resolve: { + // fullySpecified: false, + // }, + // }, + { test: /\.js$/, exclude: /(node_modules|bower_components)/, + resolve: { + /** + * Disable mandatory to specify full paths with extensions using '"type": "module"' in package.json + * @see https://github.com/webpack/webpack/issues/11467#issuecomment-691873586 + * @see https://stackoverflow.com/questions/69427025/programmatic-webpack-jest-esm-cant-resolve-module-without-js-file-exten + */ + fullySpecified: false, + }, use: [ babelLoader, ], diff --git a/yarn.lock b/yarn.lock index f25e47b..aec2531 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11,7 +11,6 @@ "@babel/code-frame@7.12.11": version "7.12.11" resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz" - integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== dependencies: "@babel/highlight" "^7.10.4" @@ -805,15 +804,11 @@ version "1.0.0" resolved "https://registry.yarnpkg.com/@codexteam/misprints/-/misprints-1.0.0.tgz#e5a7dec7389fe0f176cd51a040d6dc9bdc252086" -"@cspotcode/source-map-consumer@0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b" - -"@cspotcode/source-map-support@0.7.0": - version "0.7.0" - resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz#4789840aa859e46d2f3173727ab707c66bf344f5" +"@cspotcode/source-map-support@^0.8.0": + version "0.8.1" + resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" dependencies: - "@cspotcode/source-map-consumer" "0.8.0" + "@jridgewell/trace-mapping" "0.3.9" "@csstools/convert-colors@^1.4.0": version "1.4.0" @@ -902,7 +897,6 @@ "@hawk.so/javascript@^3.0.1": version "3.0.1" resolved "https://registry.yarnpkg.com/@hawk.so/javascript/-/javascript-3.0.1.tgz#364a646dce1448a805ec1b475a729b731820a8c8" - integrity sha512-c8YzhxDzginwzavhW9uwYT8FkYl8beUbr5bpuzcTTX+KKR1ryntogBIaYvTSbdr/ZMP9aS6yJQ9vKglJON3f/Q== dependencies: "@hawk.so/types" "^0.1.13" error-stack-parser "^2.0.6" @@ -910,7 +904,6 @@ "@hawk.so/nodejs@^3.1.2": version "3.1.2" resolved "https://registry.yarnpkg.com/@hawk.so/nodejs/-/nodejs-3.1.2.tgz#b06229f0c8a0d8676412329511f9f2b01e492211" - integrity sha512-FqZtJDEc3G/VdirsEEfA4BodA3OGXCSy2188aPSeaLkLWswaKAnkaJNTGHQL59dtOeSbvipMJVgtoqihHkpGBQ== dependencies: "@hawk.so/types" "^0.1.15" axios "^0.21.1" @@ -919,7 +912,6 @@ "@hawk.so/types@^0.1.13", "@hawk.so/types@^0.1.15": version "0.1.18" resolved "https://registry.yarnpkg.com/@hawk.so/types/-/types-0.1.18.tgz#746537634756825f066182737429d11ea124d5c5" - integrity sha512-SvECLGmLb5t90OSpk3n8DCjJsUoyjrq/Z6Ioil80tVkbMXRdGjaHZpn/0w1gBqtgNWBfW2cSbsQPqmyDj1NsqQ== dependencies: "@types/mongodb" "^3.5.34" @@ -962,6 +954,13 @@ version "1.4.14" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" +"@jridgewell/trace-mapping@0.3.9": + version "0.3.9" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping@^0.3.0": version "0.3.4" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3" @@ -1074,7 +1073,6 @@ "@types/bson@*": version "4.2.0" resolved "https://registry.yarnpkg.com/@types/bson/-/bson-4.2.0.tgz#a2f71e933ff54b2c3bf267b67fa221e295a33337" - integrity sha512-ELCPqAdroMdcuxqwMgUpifQyRoTpyYCNr1V9xKyF40VsBobsj+BbWNRvwGchMgBPGqkw655ypkjj2MEF5ywVwg== dependencies: bson "*" @@ -1224,7 +1222,6 @@ "@types/mongodb@^3.5.34": version "3.6.20" resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.6.20.tgz#b7c5c580644f6364002b649af1c06c3c0454e1d2" - integrity sha512-WcdpPJCakFzcWWD9juKoZbRtQxKIMYF/JIAM4JrNHrMcnJL6/a2NWjXxW7fo9hxboxxkg+icff8d7+WIEvKgYQ== dependencies: "@types/bson" "*" "@types/node" "*" @@ -1694,7 +1691,6 @@ autoprefixer@^10.4.2: axios@^0.21.1: version "0.21.4" resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" - integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== dependencies: follow-redirects "^1.14.0" @@ -1763,7 +1759,6 @@ balanced-match@^1.0.0: base64-js@^1.3.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== basic-auth@~2.0.1: version "2.0.1" @@ -1830,7 +1825,6 @@ browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4 bson@*: version "4.6.4" resolved "https://registry.yarnpkg.com/bson/-/bson-4.6.4.tgz#e66d4a334f1ab230dfcfb9ec4ea9091476dd372e" - integrity sha512-TdQ3FzguAu5HKPPlr0kYQCyrYUYh8tFM+CMTpxjNzVzxeiJY00Rtuj3LXLHSgiGvmaWlZ8PE+4KyM2thqE38pQ== dependencies: buffer "^5.6.0" @@ -1845,7 +1839,6 @@ buffer-from@^1.0.0, buffer-from@^1.1.0: buffer@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== dependencies: base64-js "^1.3.1" ieee754 "^1.1.13" @@ -2020,7 +2013,6 @@ clone-response@^1.0.2: clone@2.x: version "2.1.2" resolved "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz" - integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== code-point-at@^1.0.0: version "1.1.0" @@ -2361,6 +2353,10 @@ csurf@^1.11.0: csrf "3.1.0" http-errors "~1.7.3" +data-uri-to-buffer@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz#b5db46aea50f6176428ac05b73be39a57701a64b" + date-fns@^2.16.1: version "2.28.0" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.28.0.tgz#9570d656f5fc13143e50c975a3b6bbeb46cd08b2" @@ -2577,7 +2573,6 @@ error-ex@^1.2.0, error-ex@^1.3.1: error-stack-parser@^2.0.6: version "2.1.4" resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286" - integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ== dependencies: stackframe "^1.3.4" @@ -2966,6 +2961,13 @@ fastq@^1.6.0: dependencies: reusify "^1.0.4" +fetch-blob@^3.1.2, fetch-blob@^3.1.4: + version "3.2.0" + resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.2.0.tgz#f09b8d4bbd45adc6f0c20b7e787e793e309dcce9" + dependencies: + node-domexception "^1.0.0" + web-streams-polyfill "^3.0.3" + file-entry-cache@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" @@ -2983,7 +2985,6 @@ file-type@*: file-type@^16.5.4: version "16.5.4" resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.5.4.tgz#474fb4f704bee427681f98dd390058a172a6c2fd" - integrity sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw== dependencies: readable-web-to-node-stream "^3.0.0" strtok3 "^6.2.4" @@ -3060,7 +3061,6 @@ flatten@^1.0.2: follow-redirects@^1.14.0: version "1.15.1" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" - integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== foreachasync@^3.0.0: version "3.0.0" @@ -3089,6 +3089,12 @@ form-data@^3.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" +formdata-polyfill@^4.0.10: + version "4.0.10" + resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423" + dependencies: + fetch-blob "^3.1.2" + formidable@^1.2.0: version "1.2.6" resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.6.tgz#d2a51d60162bbc9b4a055d8457a7c75315d1a168" @@ -3247,18 +3253,6 @@ growl@1.10.5: version "1.10.5" resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" -handlebars@^4.1.0: - version "4.7.7" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" - integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== - dependencies: - minimist "^1.2.5" - neo-async "^2.6.0" - source-map "^0.6.1" - wordwrap "^1.0.0" - optionalDependencies: - uglify-js "^3.1.4" - has-bigints@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" @@ -3305,6 +3299,10 @@ hosted-git-info@^2.1.4: version "2.8.9" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" +html-escaper@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" + htmlparser2@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" @@ -3920,7 +3918,7 @@ make-dir@^1.3.0: dependencies: pify "^3.0.0" -make-dir@^2.0.0: +make-dir@^2.0.0, make-dir@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" dependencies: @@ -4147,10 +4145,9 @@ negotiator@0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" -neo-async@^2.6.0, neo-async@^2.6.2: +neo-async@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== nice-try@^1.0.4: version "1.0.5" @@ -4169,15 +4166,20 @@ nise@^5.1.0: node-cache@^5.1.2: version "5.1.2" resolved "https://registry.npmjs.org/node-cache/-/node-cache-5.1.2.tgz" - integrity sha512-t1QzWwnk4sjLWaQAS8CHgOJ+RAfmHpxFWmc36IWTiWHQfs0w5JDMBS1b1ZxQteo0vVVuWJvIUKHDkkeK7vIGCg== dependencies: clone "2.x" -node-fetch@^2.6.1: - version "2.6.7" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" +node-domexception@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5" + +node-fetch@^3.2.10: + version "3.2.10" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.2.10.tgz#e8347f94b54ae18b57c9c049ef641cef398a85c8" dependencies: - whatwg-url "^5.0.0" + data-uri-to-buffer "^4.0.0" + fetch-blob "^3.1.4" + formdata-polyfill "^4.0.10" node-releases@^2.0.2: version "2.0.3" @@ -5437,12 +5439,10 @@ stable@^0.1.8: stack-trace@^0.0.10: version "0.0.10" resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" - integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== stackframe@^1.3.4: version "1.3.4" resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310" - integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw== statuses@2.0.1: version "2.0.1" @@ -5597,10 +5597,9 @@ supports-color@^5.3.0, supports-color@^5.4.0: dependencies: has-flag "^3.0.0" -supports-color@^6.0.0: +supports-color@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" - integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== dependencies: has-flag "^3.0.0" @@ -5717,10 +5716,6 @@ token-types@^5.0.0-alpha.2: "@tokenizer/token" "^0.3.0" ieee754 "^1.2.1" -tr46@~0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - tree-kill@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" @@ -5746,11 +5741,11 @@ ts-node@7.0.1: source-map-support "^0.5.6" yn "^2.0.0" -ts-node@^10.1.0: - version "10.7.0" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.7.0.tgz#35d503d0fab3e2baa672a0e94f4b40653c2463f5" +ts-node@^10.9.1: + version "10.9.1" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b" dependencies: - "@cspotcode/source-map-support" "0.7.0" + "@cspotcode/source-map-support" "^0.8.0" "@tsconfig/node10" "^1.0.7" "@tsconfig/node12" "^1.0.7" "@tsconfig/node14" "^1.0.0" @@ -5761,7 +5756,7 @@ ts-node@^10.1.0: create-require "^1.1.0" diff "^4.0.1" make-error "^1.1.1" - v8-compile-cache-lib "^3.0.0" + v8-compile-cache-lib "^3.0.1" yn "3.1.1" tsconfig-paths@^3.14.1, tsconfig-paths@^3.5.0, tsconfig-paths@^3.9.0: @@ -5825,14 +5820,9 @@ typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -typescript@^4.3.5: - version "4.6.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c" - -uglify-js@^3.1.4: - version "3.16.3" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.16.3.tgz#94c7a63337ee31227a18d03b8a3041c210fd1f1d" - integrity sha512-uVbFqx9vvLhQg0iBaau9Z75AxWJ8tqM9AV890dIZCLApF4rTcyHwmAvLeEdYRs+BzYWu8Iw81F79ah0EfTXbaw== +typescript@^4.7.4: + version "4.7.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235" uid-safe@2.1.5: version "2.1.5" @@ -5906,9 +5896,9 @@ uuid@^3.3.2: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" -v8-compile-cache-lib@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz#0582bcb1c74f3a2ee46487ceecf372e46bce53e8" +v8-compile-cache-lib@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" v8-compile-cache@^2.0.3: version "2.3.0" @@ -5942,9 +5932,9 @@ watchpack@^2.3.1: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" -webidl-conversions@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" +web-streams-polyfill@^3.0.3: + version "3.2.1" + resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6" webpack-cli@^4.9.2: version "4.9.2" @@ -6003,13 +5993,6 @@ webpack@^5.70.0: watchpack "^2.3.1" webpack-sources "^3.2.3" -whatwg-url@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - dependencies: - tr46 "~0.0.3" - webidl-conversions "^3.0.0" - which-boxed-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" @@ -6044,11 +6027,6 @@ word-wrap@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" -wordwrap@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== - wrap-ansi@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"