From 51bc05ae806ee11d36764bdafb4e4645d00e93be Mon Sep 17 00:00:00 2001 From: AllAwesome497 <47748690+AllAwesome497@users.noreply.github.com> Date: Thu, 18 Nov 2021 12:57:15 -0600 Subject: [PATCH] refactor(typescript): add foundation for incremential TS migration (#13569) * refactor(typescript): add foundation for incremential TS migration Converts the logger interface to TypeScript. Adds eslint rules and TypeScript configuration to allow for a gradual migration to TS. Adds a build script to transpile both TS and JS code while keeping the same API for package usage. Changes imports from test files to use "absolute" paths that point to the directory of the compiled code. * use || instead of ?? * fix source maps breaking tests * fix build script for older versions of node * make some small fixes + add better docs to logger.ts * add ts support to tests * update yarn.lock * disable no-loss-of-percesion rule * fix & cleanup a lil * test.js -> test.[tj]s Co-authored-by: Sascha Depold --- .eslintrc.json | 44 +- .gitignore | 1 + build.js | 87 ++ lib/sequelize.js | 10 +- lib/utils/logger.js | 40 - lib/utils/logger.ts | 68 ++ package.json | 34 +- .../associations/belongs-to-many.test.js | 4 +- .../associations/belongs-to.test.js | 4 +- .../integration/associations/has-many.test.js | 4 +- test/integration/associations/has-one.test.js | 2 +- .../multiple-level-filters.test.js | 2 +- test/integration/associations/scope.test.js | 4 +- test/integration/associations/self.test.js | 2 +- test/integration/data-types.test.js | 4 +- .../abstract/connection-manager.test.js | 4 +- .../dialects/mariadb/associations.test.js | 2 +- .../dialects/mariadb/dao-factory.test.js | 2 +- test/integration/dialects/mariadb/dao.test.js | 2 +- .../dialects/mariadb/errors.test.js | 2 +- .../dialects/mssql/query-queue.test.js | 12 +- .../dialects/mysql/associations.test.js | 2 +- .../dialects/mysql/connector-manager.test.js | 2 +- .../dialects/mysql/dao-factory.test.js | 2 +- .../integration/dialects/mysql/errors.test.js | 4 +- .../dialects/postgres/associations.test.js | 2 +- .../postgres/connection-manager.test.js | 4 +- .../integration/dialects/postgres/dao.test.js | 4 +- .../dialects/postgres/data-types.test.js | 2 +- .../dialects/postgres/error.test.js | 2 +- .../dialects/postgres/hstore.test.js | 2 +- .../dialects/postgres/query-interface.test.js | 2 +- .../dialects/postgres/query.test.js | 4 +- .../dialects/postgres/range.test.js | 4 +- .../sqlite/connection-manager.test.js | 2 +- .../dialects/sqlite/dao-factory.test.js | 2 +- test/integration/dialects/sqlite/dao.test.js | 2 +- .../dialects/sqlite/sqlite-master.test.js | 2 +- test/integration/hooks/associations.test.js | 2 +- test/integration/hooks/bulkOperation.test.js | 2 +- test/integration/hooks/count.test.js | 2 +- test/integration/hooks/create.test.js | 2 +- test/integration/hooks/destroy.test.js | 2 +- test/integration/hooks/find.test.js | 2 +- test/integration/hooks/hooks.test.js | 2 +- test/integration/hooks/restore.test.js | 2 +- .../hooks/updateAttributes.test.js | 2 +- test/integration/hooks/upsert.test.js | 2 +- test/integration/hooks/validate.test.js | 2 +- test/integration/include.test.js | 4 +- test/integration/include/findAll.test.js | 4 +- .../include/findAndCountAll.test.js | 2 +- test/integration/include/findOne.test.js | 10 +- test/integration/include/limit.test.js | 4 +- test/integration/include/paranoid.test.js | 2 +- test/integration/include/schema.test.js | 4 +- test/integration/include/separate.test.js | 2 +- test/integration/instance.test.js | 2 +- test/integration/instance.validations.test.js | 2 +- test/integration/instance/decrement.test.js | 2 +- test/integration/instance/increment.test.js | 2 +- test/integration/instance/reload.test.js | 4 +- test/integration/instance/save.test.js | 4 +- test/integration/instance/to-json.test.js | 2 +- test/integration/instance/update.test.js | 4 +- test/integration/instance/values.test.js | 4 +- test/integration/model.test.js | 6 +- test/integration/model/attributes.test.js | 2 +- .../model/attributes/field.test.js | 4 +- .../model/attributes/types.test.js | 2 +- test/integration/model/bulk-create.test.js | 6 +- .../model/bulk-create/include.test.js | 4 +- test/integration/model/count.test.js | 2 +- test/integration/model/create.test.js | 4 +- test/integration/model/create/include.test.js | 4 +- test/integration/model/findAll.test.js | 4 +- test/integration/model/findAll/group.test.js | 2 +- .../model/findAll/groupedLimit.test.js | 2 +- test/integration/model/findAll/order.test.js | 2 +- .../model/findAll/separate.test.js | 2 +- test/integration/model/findOne.test.js | 4 +- test/integration/model/findOrBuild.test.js | 2 +- test/integration/model/geography.test.js | 2 +- test/integration/model/geometry.test.js | 8 +- test/integration/model/increment.test.js | 2 +- test/integration/model/json.test.js | 4 +- test/integration/model/notExist.test.js | 2 +- .../model/optimistic_locking.test.js | 2 +- test/integration/model/paranoid.test.js | 2 +- test/integration/model/schema.test.js | 2 +- test/integration/model/scope.test.js | 2 +- .../integration/model/scope/aggregate.test.js | 2 +- .../model/scope/associations.test.js | 2 +- test/integration/model/scope/count.test.js | 2 +- test/integration/model/scope/destroy.test.js | 2 +- test/integration/model/scope/find.test.js | 2 +- .../model/scope/findAndCountAll.test.js | 2 +- test/integration/model/scope/merge.test.js | 2 +- test/integration/model/scope/update.test.js | 2 +- test/integration/model/searchPath.test.js | 2 +- test/integration/model/sum.test.js | 2 +- test/integration/model/sync.test.js | 2 +- test/integration/model/update.test.js | 2 +- test/integration/model/upsert.test.js | 4 +- test/integration/operators.test.js | 4 +- test/integration/query-interface.test.js | 2 +- .../query-interface/changeColumn.test.js | 2 +- .../query-interface/createTable.test.js | 2 +- .../query-interface/describeTable.test.js | 2 +- .../query-interface/dropEnum.test.js | 2 +- .../query-interface/removeColumn.test.js | 2 +- test/integration/replication.test.js | 2 +- test/integration/schema.test.js | 2 +- test/integration/sequelize.test.js | 6 +- .../integration/sequelize.transaction.test.js | 2 +- test/integration/sequelize/deferrable.test.js | 2 +- test/integration/transaction.test.js | 2 +- test/integration/trigger.test.js | 2 +- test/integration/utils.test.js | 6 +- test/integration/vectors.test.js | 2 +- test/registerEsbuild.js | 53 ++ test/support.js | 8 +- test/tsconfig.json | 14 + test/unit/associations/association.test.js | 2 +- .../unit/associations/belongs-to-many.test.js | 10 +- test/unit/associations/belongs-to.test.js | 2 +- .../associations/dont-modify-options.test.js | 4 +- test/unit/associations/has-many.test.js | 6 +- test/unit/associations/has-one.test.js | 2 +- test/unit/connection-manager.test.js | 2 +- .../dialects/abstract/query-generator.test.js | 2 +- test/unit/dialects/abstract/query.test.js | 2 +- .../abstract/quote-identifier.test.js | 2 +- .../dialects/mariadb/query-generator.test.js | 6 +- .../dialects/mssql/connection-manager.test.js | 2 +- .../dialects/mssql/query-generator.test.js | 8 +- test/unit/dialects/mssql/query.test.js | 2 +- .../dialects/mysql/query-generator.test.js | 6 +- test/unit/dialects/mysql/query.test.js | 2 +- .../unit/dialects/postgres/data-types.test.js | 6 +- .../dialects/postgres/query-generator.test.js | 6 +- .../dialects/sqlite/query-generator.test.js | 6 +- test/unit/errors.test.js | 2 +- test/unit/instance-validator.test.js | 4 +- test/unit/instance/build.test.js | 2 +- test/unit/instance/changed.test.js | 2 +- test/unit/instance/get.test.js | 2 +- test/unit/instance/is-soft-deleted.test.js | 2 +- test/unit/instance/previous.test.js | 2 +- test/unit/instance/set.test.js | 2 +- test/unit/instance/to-json.test.js | 2 +- test/unit/logger.test.ts | 70 ++ test/unit/model/bulkcreate.test.js | 2 +- test/unit/model/count.test.js | 2 +- test/unit/model/define.test.js | 2 +- test/unit/model/destroy.test.js | 2 +- test/unit/model/find-and-count-all.test.js | 2 +- test/unit/model/find-create-find.test.js | 2 +- test/unit/model/findall.test.js | 6 +- test/unit/model/findone.test.js | 2 +- test/unit/model/include.test.js | 2 +- test/unit/model/indexes.test.js | 2 +- test/unit/model/overwriting-builtins.test.js | 2 +- test/unit/model/removeAttribute.test.js | 2 +- test/unit/model/scope.test.js | 4 +- test/unit/model/underscored.test.js | 4 +- test/unit/model/update.test.js | 2 +- test/unit/model/upsert.test.js | 4 +- test/unit/model/validation.test.js | 2 +- test/unit/sql/add-column.test.js | 2 +- test/unit/sql/change-column.test.js | 2 +- test/unit/sql/create-table.test.js | 2 +- test/unit/sql/data-types.test.js | 2 +- test/unit/sql/delete.test.js | 2 +- test/unit/sql/enum.test.js | 2 +- test/unit/sql/generateJoin.test.js | 4 +- test/unit/sql/group.test.js | 2 +- test/unit/sql/insert.test.js | 2 +- test/unit/sql/json.test.js | 2 +- test/unit/sql/order.test.js | 4 +- test/unit/sql/select.test.js | 4 +- test/unit/sql/update.test.js | 2 +- test/unit/sql/where.test.js | 8 +- test/unit/utils.test.js | 25 +- tsconfig.json | 22 + types/lib/utils/logger.d.ts | 18 - types/test/e2e/docs-example.ts | 4 +- types/test/errors.ts | 2 +- types/test/hooks.ts | 8 +- types/test/model.ts | 2 +- types/test/sequelize.ts | 2 +- types/test/tsconfig.json | 4 +- types/test/where.ts | 2 +- yarn.lock | 768 ++++++++++++------ 194 files changed, 1157 insertions(+), 633 deletions(-) create mode 100644 build.js delete mode 100644 lib/utils/logger.js create mode 100644 lib/utils/logger.ts create mode 100644 test/registerEsbuild.js create mode 100644 test/tsconfig.json create mode 100644 test/unit/logger.test.ts create mode 100644 tsconfig.json delete mode 100644 types/lib/utils/logger.d.ts diff --git a/.eslintrc.json b/.eslintrc.json index 38d78cf4ea61..0c7211db0fb0 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,12 +1,18 @@ { - "extends": "eslint:recommended", + "parser": "@typescript-eslint/parser", + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/eslint-recommended", + "plugin:@typescript-eslint/recommended" + ], "rules": { + "@typescript-eslint/no-loss-of-precision": "off", "mocha/no-exclusive-tests": "error", "mocha/no-skipped-tests": "warn", "jsdoc/check-param-names": "error", "jsdoc/check-tag-names": "error", - "jsdoc/check-types": "error", + "jsdoc/check-types": "off", "jsdoc/newline-after-description": "error", "jsdoc/no-undefined-types": "off", "jsdoc/require-description-complete-sentence": "off", @@ -15,9 +21,9 @@ "jsdoc/require-param": "error", "jsdoc/require-param-description": "off", "jsdoc/require-param-name": "error", - "jsdoc/require-param-type": "error", + "jsdoc/require-param-type": "off", "jsdoc/require-returns-description": "off", - "jsdoc/require-returns-type": "error", + "jsdoc/require-returns-type": "off", "jsdoc/valid-types": "error", // style @@ -34,11 +40,14 @@ } ], "semi": ["error", "always"], - "space-before-function-paren": ["error", { - "named": "never", - "anonymous": "never", - "asyncArrow": "always" - }], + "space-before-function-paren": [ + "error", + { + "named": "never", + "anonymous": "never", + "asyncArrow": "always" + } + ], "space-before-blocks": "error", "space-infix-ops": "error", "no-multi-spaces": "error", @@ -66,7 +75,6 @@ // functional "valid-jsdoc": "off", - "strict": ["error", "global"], "no-var": "error", "prefer-const": "error", "prefer-arrow-callback": "error", @@ -97,6 +105,19 @@ "no-case-declarations": "off", "prefer-object-spread": "error" }, + "overrides": [ + { + "files": ["**/*.js"], + "rules": { + "@typescript-eslint/no-var-requires": "off", + "@typescript-eslint/no-empty-function": "off", + "@typescript-eslint/no-this-alias": "off", + "jsdoc/require-param-type": "error", + "jsdoc/check-types": "error", + "jsdoc/require-returns-type": "error" + } + } + ], "settings": { "jsdoc": { "tagNamePreference": { @@ -108,7 +129,8 @@ "ecmaVersion": 2020, "sourceType": "script" }, - "plugins": ["mocha", "jsdoc"], + "ignorePatterns": ["dist/**/*", "types/**/*"], + "plugins": ["mocha", "jsdoc", "@typescript-eslint"], "env": { "node": true, "mocha": true, diff --git a/.gitignore b/.gitignore index 3c8f2947202c..f2551fe6573f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ test/binary/tmp/* .vscode/ esdoc node_modules +dist/* diff --git a/build.js b/build.js new file mode 100644 index 000000000000..00cfc4588053 --- /dev/null +++ b/build.js @@ -0,0 +1,87 @@ +'use strict'; + +const glob = require('fast-glob'); +const { promisify } = require('util'); +const { build } = require('esbuild'); +const fs = require('fs'); +const copyFiles = promisify( require('copyfiles')); +const path = require('path'); +const exec = promisify(require('child_process').exec); + +const rmdir = promisify(fs.rmdir); +const stat = promisify(fs.stat); + +// if this script is moved, this will need to be adjusted +const rootDir = __dirname; +const outdir = path.join(rootDir, 'dist'); + +const nodeMajorVersion = Number(process.version.match(/(?<=^v)\d+/)); + +async function rmDistDir() { + try { + await stat(outdir); + if (nodeMajorVersion >= 12) { + await rmdir(outdir, { recursive: true }); + } else { + await rmdir(outdir); + } + } catch { + /* no-op */ + } +} + +async function main() { + console.log('Compiling sequelize...'); + const [declarationFiles, filesToCompile] = await Promise.all([ + // Find all .d.ts files from types/ + glob('./types/**/*.d.ts', { onlyFiles: true, absolute: false }), + // Find all .js and .ts files from lib/ + glob('./lib/**/*.[tj]s', { onlyFiles: true, absolute: false }), + // Delete dist/ for a full rebuild. + rmDistDir() + ]); + + // copy .d.ts files prior to generating them from the .ts files + // so the .ts files in lib/ will take priority.. + await copyFiles( + // The last path in the list is the output directory + declarationFiles.concat(outdir), + { up: 1 } + ); + + await Promise.all([ + build({ + // Adds source mapping + sourcemap: true, + // The compiled code should be usable in node v10 + target: 'node10', + // The source code's format is commonjs. + format: 'cjs', + + outdir, + entryPoints: filesToCompile + .concat('./index.js') + .map(file => path.resolve(file)), + + // minify the compiled code + minify: true, + // Keep `constructor.name` the same (used for associations) + keepNames: true + }), + + exec('tsc', { + env: { + // binaries installed from modules have symlinks in + // /node_modules/.bin. + PATH: `${process.env.PATH || ''}:${path.join( + rootDir, + 'node_modules/.bin' + )}` + }, + cwd: rootDir + }) + ]); +} + +main().catch(console.error).finally(process.exit); + diff --git a/lib/sequelize.js b/lib/sequelize.js index 3aa6cb9cd54e..2dcac640cc65 100644 --- a/lib/sequelize.js +++ b/lib/sequelize.js @@ -1267,7 +1267,15 @@ Sequelize.prototype.validate = Sequelize.prototype.authenticate; /** * Sequelize version number. */ -Sequelize.version = require('../package.json').version; +// To avoid any errors on startup when this field is unused, only resolve it as needed. +// this is to prevent any potential issues on startup with unusual environments (eg, bundled code) +// where relative paths may fail that are unnecessary. +Object.defineProperty(Sequelize, 'version', { + enumerable: true, + get() { + return require('../../package.json').version; + } +}); Sequelize.options = { hooks: {} }; diff --git a/lib/utils/logger.js b/lib/utils/logger.js deleted file mode 100644 index 35944c806fec..000000000000 --- a/lib/utils/logger.js +++ /dev/null @@ -1,40 +0,0 @@ -'use strict'; - -/** - * Sequelize module for debug and deprecation messages. - * It require a `context` for which messages will be printed. - * - * @module logging - * @private - */ - -const debug = require('debug'); -const util = require('util'); - -class Logger { - constructor(config) { - - this.config = { - context: 'sequelize', - debug: true, - ...config - }; - } - - warn(message) { - // eslint-disable-next-line no-console - console.warn(`(${this.config.context}) Warning: ${message}`); - } - - inspect(value) { - return util.inspect(value, false, 1); - } - - debugContext(name) { - return debug(`${this.config.context}:${name}`); - } -} - -exports.logger = new Logger(); - -exports.Logger = Logger; diff --git a/lib/utils/logger.ts b/lib/utils/logger.ts new file mode 100644 index 000000000000..2e14f81d53e8 --- /dev/null +++ b/lib/utils/logger.ts @@ -0,0 +1,68 @@ +/** + * @file Sequelize module for debug and deprecation messages. + * It require a `context` for which messages will be printed. + * + * @module logging + * @access package + */ +import nodeDebug from 'debug'; +import util from 'util'; + +/** + * The configuration for sequelize's logging interface. + * + * @access package + */ +export interface LoggerConfig { + /** + * The context which the logger should log in. + * + * @default 'sequelize' + */ + context?: string; +} + +export class Logger { + protected config: LoggerConfig; + + constructor({ context = 'sequelize', ...rest }: Partial = {}) { + this.config = { + context, + ...rest + }; + } + + /** + * Logs a warning in the logger's context. + * + * @param message The message of the warning. + */ + warn(message: string): void { + console.warn(`(${this.config.context}) Warning: ${message}`); + } + + /** + * Uses node's util.inspect to stringify a value. + * + * @param value The value which should be inspected. + * @returns The string of the inspected value. + */ + inspect(value: unknown): string { + return util.inspect(value, { + showHidden: false, + depth: 1 + }); + } + + /** + * Gets a debugger for a context. + * + * @param name The name of the context. + * @returns A debugger interace which can be used to debug. + */ + debugContext(name: string): nodeDebug.Debugger { + return nodeDebug(`${this.config.context}:${name}`); + } +} + +export const logger = new Logger(); diff --git a/package.json b/package.json index 18cd5fce87a6..383f7d52cd75 100644 --- a/package.json +++ b/package.json @@ -13,19 +13,22 @@ "url": "https://github.com/sequelize/sequelize/issues" }, "homepage": "https://sequelize.org/", - "main": "index.js", - "types": "types", + "main": "./dist/index.js", + "types": "./dist", "engines": { "node": ">=10.0.0" }, "files": [ + "dist", "lib", + "index.js", "types/index.d.ts", "types/lib", "types/type-helpers" ], "license": "MIT", "dependencies": { + "@types/debug": "^4.1.7", "debug": "^4.1.1", "dottie": "^2.0.0", "inflection": "1.13.1", @@ -44,8 +47,13 @@ "devDependencies": { "@commitlint/cli": "^11.0.0", "@commitlint/config-angular": "^11.0.0", + "@types/chai": "^4.2.22", + "@types/mocha": "^9.0.0", "@types/node": "^12.12.42", + "@types/sinon": "^10.0.6", "@types/validator": "^13.1.4", + "@typescript-eslint/eslint-plugin": "^5.3.0", + "@typescript-eslint/parser": "^5.3.0", "acorn": "^8.0.4", "axios": ">=0.21.2", "chai": "^4.x", @@ -53,8 +61,10 @@ "chai-datetime": "^1.6.0", "cheerio": "^1.0.0-rc.3", "cls-hooked": "^4.2.2", + "copyfiles": "^2.4.1", "cross-env": "^7.0.2", "delay": "^4.3.0", + "esbuild": "^0.13.12", "esdoc": "^1.1.0", "esdoc-ecmascript-proposal-plugin": "^1.0.0", "esdoc-inject-style-plugin": "^1.0.0", @@ -63,6 +73,7 @@ "eslint-plugin-jsdoc": "^20.4.0", "eslint-plugin-mocha": "^6.2.2", "expect-type": "^0.11.0", + "fast-glob": "^3.2.7", "fs-jetpack": "^4.1.0", "husky": "^4.2.5", "js-combinatorics": "^0.5.5", @@ -72,7 +83,9 @@ "markdownlint-cli": "^0.26.0", "marked": "^1.1.0", "mocha": "^7.1.2", + "module-alias": "^2.2.2", "mysql2": "^2.1.0", + "node-hook": "^1.0.0", "nth-check": ">=2.0.1", "nyc": "^15.0.0", "p-map": "^4.0.0", @@ -88,6 +101,7 @@ "semver-regex": ">=3.1.3", "sinon": "^9.0.2", "sinon-chai": "^3.3.0", + "source-map-support": "^0.5.20", "sqlite3": "^4.2.0", "tar": ">=4.4.18", "tedious": "8.3.0", @@ -154,7 +168,7 @@ } }, "lint-staged": { - "*.js": "eslint" + "*!(d).[tj]s": "eslint" }, "husky": { "hooks": { @@ -181,18 +195,19 @@ "----------------------------------------- static analysis -----------------------------------------": "", "lint": "eslint lib test --quiet --fix", "lint-docs": "markdownlint docs", - "test-typings": "tsc -b types/tsconfig.json && tsc -b types/test/tsconfig.json", + "test-typings": "tsc -b types/tsconfig.json && tsc -b types/test/tsconfig.json && tsc --noEmit --emitDeclarationOnly false && tsc -b test/tsconfig.json", "----------------------------------------- documentation -------------------------------------------": "", "docs": "rimraf esdoc && esdoc -c docs/esdoc-config.js && cp docs/favicon.ico esdoc/favicon.ico && cp docs/ROUTER.txt esdoc/ROUTER && node docs/run-docs-transforms.js && node docs/redirects/create-redirects.js && rimraf esdoc/file esdoc/source.html", "----------------------------------------- tests ---------------------------------------------------": "", - "test-unit": "mocha \"test/unit/**/*.test.js\"", - "test-integration": "mocha \"test/integration/**/*.test.js\"", + "mocha": "mocha -r ./test/requireHook", + "test-unit": "yarn mocha \"test/unit/**/*.test.[tj]s\"", + "test-integration": "yarn mocha \"test/integration/**/*.test.[tj]s\"", "teaser": "node test/teaser.js", - "test": "npm run teaser && npm run test-unit && npm run test-integration", + "test": "npm run prepare && npm run test-typings && npm run teaser && npm run test-unit && npm run test-integration", "----------------------------------------- coverage ------------------------------------------------": "", "cover": "rimraf coverage && npm run teaser && npm run cover-integration && npm run cover-unit && npm run merge-coverage", - "cover-integration": "cross-env COVERAGE=true nyc --reporter=lcovonly mocha \"test/integration/**/*.test.js\" && node -e \"require('fs').renameSync('coverage/lcov.info', 'coverage/integration.info')\"", - "cover-unit": "cross-env COVERAGE=true nyc --reporter=lcovonly mocha \"test/unit/**/*.test.js\" && node -e \"require('fs').renameSync('coverage/lcov.info', 'coverage/unit.info')\"", + "cover-integration": "cross-env COVERAGE=true nyc --reporter=lcovonly yarn mocha \"test/integration/**/*.test.[tj]s\" && node -e \"require('fs').renameSync('coverage/lcov.info', 'coverage/integration.info')\"", + "cover-unit": "cross-env COVERAGE=true nyc --reporter=lcovonly yarn mocha \"test/unit/**/*.test.[tj]s\" && node -e \"require('fs').renameSync('coverage/lcov.info', 'coverage/unit.info')\"", "merge-coverage": "lcov-result-merger \"coverage/*.info\" \"coverage/lcov.info\"", "----------------------------------------- local test dbs ------------------------------------------": "", "start-mariadb": "bash dev/mariadb/10.3/start.sh", @@ -235,6 +250,7 @@ "sscce-postgres-native": "cross-env DIALECT=postgres-native node sscce.js", "sscce-sqlite": "cross-env DIALECT=sqlite node sscce.js", "sscce-mssql": "cross-env DIALECT=mssql node sscce.js", + "prepare": "node ./build.js", "---------------------------------------------------------------------------------------------------": "" } } diff --git a/test/integration/associations/belongs-to-many.test.js b/test/integration/associations/belongs-to-many.test.js index 03725fea1528..0a82207e0656 100644 --- a/test/integration/associations/belongs-to-many.test.js +++ b/test/integration/associations/belongs-to-many.test.js @@ -3,8 +3,8 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), - Sequelize = require('../../../index'), + DataTypes = require('sequelize/lib/data-types'), + Sequelize = require('sequelize'), _ = require('lodash'), sinon = require('sinon'), Op = Sequelize.Op, diff --git a/test/integration/associations/belongs-to.test.js b/test/integration/associations/belongs-to.test.js index e9cbaeaacb31..02acd3ba79f2 100644 --- a/test/integration/associations/belongs-to.test.js +++ b/test/integration/associations/belongs-to.test.js @@ -4,8 +4,8 @@ const chai = require('chai'), sinon = require('sinon'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), - Sequelize = require('../../../index'), + DataTypes = require('sequelize/lib/data-types'), + Sequelize = require('sequelize'), current = Support.sequelize, dialect = Support.getTestDialect(); diff --git a/test/integration/associations/has-many.test.js b/test/integration/associations/has-many.test.js index 1a566847ffaf..0f9cfbf3e3df 100644 --- a/test/integration/associations/has-many.test.js +++ b/test/integration/associations/has-many.test.js @@ -3,8 +3,8 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), - Sequelize = require('../../../index'), + DataTypes = require('sequelize/lib/data-types'), + Sequelize = require('sequelize'), moment = require('moment'), sinon = require('sinon'), Op = Sequelize.Op, diff --git a/test/integration/associations/has-one.test.js b/test/integration/associations/has-one.test.js index 99697f7a86af..2ffd7369bebe 100644 --- a/test/integration/associations/has-one.test.js +++ b/test/integration/associations/has-one.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), current = Support.sequelize, dialect = Support.getTestDialect(); diff --git a/test/integration/associations/multiple-level-filters.test.js b/test/integration/associations/multiple-level-filters.test.js index 267cbbe6249a..6c32ca71079b 100644 --- a/test/integration/associations/multiple-level-filters.test.js +++ b/test/integration/associations/multiple-level-filters.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Multiple Level Filters'), () => { it('can filter through belongsTo', async function() { diff --git a/test/integration/associations/scope.test.js b/test/integration/associations/scope.test.js index bbf2a178ef00..6c1d9378ce7e 100644 --- a/test/integration/associations/scope.test.js +++ b/test/integration/associations/scope.test.js @@ -3,8 +3,8 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), - Sequelize = require('../../../index'), + DataTypes = require('sequelize/lib/data-types'), + Sequelize = require('sequelize'), Op = Sequelize.Op; describe(Support.getTestDialectTeaser('associations'), () => { diff --git a/test/integration/associations/self.test.js b/test/integration/associations/self.test.js index dc6a094039d3..fd08746cc6e4 100644 --- a/test/integration/associations/self.test.js +++ b/test/integration/associations/self.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Self'), () => { it('supports freezeTableName', async function() { diff --git a/test/integration/data-types.test.js b/test/integration/data-types.test.js index ddd8e3a5b52d..a2764fd19b27 100644 --- a/test/integration/data-types.test.js +++ b/test/integration/data-types.test.js @@ -1,7 +1,7 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Support = require('./support'), sinon = require('sinon'), @@ -10,7 +10,7 @@ const chai = require('chai'), current = Support.sequelize, Op = Sequelize.Op, uuid = require('uuid'), - DataTypes = require('../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), dialect = Support.getTestDialect(), semver = require('semver'); diff --git a/test/integration/dialects/abstract/connection-manager.test.js b/test/integration/dialects/abstract/connection-manager.test.js index 05214e9d8608..2699763fcc6a 100644 --- a/test/integration/dialects/abstract/connection-manager.test.js +++ b/test/integration/dialects/abstract/connection-manager.test.js @@ -2,11 +2,11 @@ const chai = require('chai'), expect = chai.expect, - deprecations = require('../../../../lib/utils/deprecations'), + deprecations = require('sequelize/lib/utils/deprecations'), Support = require('../../support'), sinon = require('sinon'), Config = require('../../../config/config'), - ConnectionManager = require('../../../../lib/dialects/abstract/connection-manager'), + ConnectionManager = require('sequelize/lib/dialects/abstract/connection-manager'), Pool = require('sequelize-pool').Pool; const baseConf = Config[Support.getTestDialect()]; diff --git a/test/integration/dialects/mariadb/associations.test.js b/test/integration/dialects/mariadb/associations.test.js index 0256e4387f83..d88735d8a1d9 100644 --- a/test/integration/dialects/mariadb/associations.test.js +++ b/test/integration/dialects/mariadb/associations.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../../support'), dialect = Support.getTestDialect(), - DataTypes = require('../../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); if (dialect !== 'mariadb') return; diff --git a/test/integration/dialects/mariadb/dao-factory.test.js b/test/integration/dialects/mariadb/dao-factory.test.js index e2fd3f589630..f5432ede9714 100644 --- a/test/integration/dialects/mariadb/dao-factory.test.js +++ b/test/integration/dialects/mariadb/dao-factory.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../../support'), dialect = Support.getTestDialect(), - DataTypes = require('../../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); if (dialect !== 'mariadb') return; describe('[MariaDB Specific] DAOFactory', () => { diff --git a/test/integration/dialects/mariadb/dao.test.js b/test/integration/dialects/mariadb/dao.test.js index 1bfc543aab2f..474069e0f8d5 100644 --- a/test/integration/dialects/mariadb/dao.test.js +++ b/test/integration/dialects/mariadb/dao.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../../support'), dialect = Support.getTestDialect(), - DataTypes = require('../../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); if (dialect !== 'mariadb') return; describe('[MariaDB Specific] DAO', () => { diff --git a/test/integration/dialects/mariadb/errors.test.js b/test/integration/dialects/mariadb/errors.test.js index 33b2b62042da..432d36a7cf51 100644 --- a/test/integration/dialects/mariadb/errors.test.js +++ b/test/integration/dialects/mariadb/errors.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../../support'), dialect = Support.getTestDialect(), - DataTypes = require('../../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); if (dialect !== 'mariadb') return; describe('[MariaDB Specific] Errors', () => { diff --git a/test/integration/dialects/mssql/query-queue.test.js b/test/integration/dialects/mssql/query-queue.test.js index d757dedfe201..4e0fbccab257 100644 --- a/test/integration/dialects/mssql/query-queue.test.js +++ b/test/integration/dialects/mssql/query-queue.test.js @@ -2,11 +2,11 @@ const chai = require('chai'), expect = chai.expect, - DataTypes = require('../../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), Support = require('../../support'), - Sequelize = require('../../../../lib/sequelize'), - ConnectionError = require('../../../../lib/errors/connection-error'), - { AsyncQueueError } = require('../../../../lib/dialects/mssql/async-queue'), + Sequelize = require('sequelize/lib/sequelize'), + ConnectionError = require('sequelize/lib/errors/connection-error'), + { AsyncQueueError } = require('sequelize/lib/dialects/mssql/async-queue'), dialect = Support.getTestDialect(); if (dialect.match(/^mssql/)) { @@ -46,7 +46,7 @@ if (dialect.match(/^mssql/)) { await expect(User.findOne({ transaction: t })).not.to.be.rejected; - })).not.to.be.rejected; + })).not.to.be.rejected; }); it('closing the connection should reject pending requests', async function() { @@ -66,7 +66,7 @@ if (dialect.match(/^mssql/)) { })).to.be.eventually.rejectedWith(ConnectionError, 'the connection was closed before this query could be executed') .and.have.property('parent').that.instanceOf(AsyncQueueError) ]) - )).to.be.rejectedWith(ConnectionError, 'the connection was closed before this query could be executed'); + )).to.be.rejectedWith(ConnectionError, 'the connection was closed before this query could be executed'); await expect(promise).not.to.be.rejected; }); diff --git a/test/integration/dialects/mysql/associations.test.js b/test/integration/dialects/mysql/associations.test.js index 0c16f6219fa5..18ffceeee7c8 100644 --- a/test/integration/dialects/mysql/associations.test.js +++ b/test/integration/dialects/mysql/associations.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../../support'), dialect = Support.getTestDialect(), - DataTypes = require('../../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); if (dialect === 'mysql') { describe('[MYSQL Specific] Associations', () => { diff --git a/test/integration/dialects/mysql/connector-manager.test.js b/test/integration/dialects/mysql/connector-manager.test.js index ec0d1549ca24..847542460452 100644 --- a/test/integration/dialects/mysql/connector-manager.test.js +++ b/test/integration/dialects/mysql/connector-manager.test.js @@ -4,7 +4,7 @@ const chai = require('chai'); const expect = chai.expect; const Support = require('../../support'); const dialect = Support.getTestDialect(); -const DataTypes = require('../../../../lib/data-types'); +const DataTypes = require('sequelize/lib/data-types'); if (dialect === 'mysql') { describe('[MYSQL Specific] Connection Manager', () => { diff --git a/test/integration/dialects/mysql/dao-factory.test.js b/test/integration/dialects/mysql/dao-factory.test.js index e6215c00da7b..eeab0cad57c1 100644 --- a/test/integration/dialects/mysql/dao-factory.test.js +++ b/test/integration/dialects/mysql/dao-factory.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../../support'), dialect = Support.getTestDialect(), - DataTypes = require('../../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); if (dialect === 'mysql') { describe('[MYSQL Specific] DAOFactory', () => { diff --git a/test/integration/dialects/mysql/errors.test.js b/test/integration/dialects/mysql/errors.test.js index 13b7ff376488..ff7719766cab 100644 --- a/test/integration/dialects/mysql/errors.test.js +++ b/test/integration/dialects/mysql/errors.test.js @@ -4,8 +4,8 @@ const chai = require('chai'); const expect = chai.expect; const Support = require('../../support'); const dialect = Support.getTestDialect(); -const Sequelize = require('../../../../index'); -const DataTypes = require('../../../../lib/data-types'); +const Sequelize = require('sequelize'); +const DataTypes = require('sequelize/lib/data-types'); if (dialect === 'mysql') { describe('[MYSQL Specific] Errors', () => { diff --git a/test/integration/dialects/postgres/associations.test.js b/test/integration/dialects/postgres/associations.test.js index d2fdd1ea5651..fc9c3ae89077 100644 --- a/test/integration/dialects/postgres/associations.test.js +++ b/test/integration/dialects/postgres/associations.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../../support'), dialect = Support.getTestDialect(), - DataTypes = require('../../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); if (dialect.match(/^postgres/)) { describe('[POSTGRES Specific] associations', () => { diff --git a/test/integration/dialects/postgres/connection-manager.test.js b/test/integration/dialects/postgres/connection-manager.test.js index 67778d8e8a04..787433554568 100644 --- a/test/integration/dialects/postgres/connection-manager.test.js +++ b/test/integration/dialects/postgres/connection-manager.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../../support'), dialect = Support.getTestDialect(), - DataTypes = require('../../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); if (dialect.match(/^postgres/)) { describe('[POSTGRES] Sequelize', () => { @@ -39,7 +39,7 @@ if (dialect.match(/^postgres/)) { // `notice` is Postgres's default expect(result[0].client_min_messages).to.equal('notice'); }); - + it('should time out the query request when the query runs beyond the configured query_timeout', async () => { const sequelize = Support.createSequelizeInstance({ dialectOptions: { query_timeout: 100 } diff --git a/test/integration/dialects/postgres/dao.test.js b/test/integration/dialects/postgres/dao.test.js index 39eb80ad50ee..c47e39629dee 100644 --- a/test/integration/dialects/postgres/dao.test.js +++ b/test/integration/dialects/postgres/dao.test.js @@ -6,8 +6,8 @@ const chai = require('chai'), Sequelize = Support.Sequelize, Op = Sequelize.Op, dialect = Support.getTestDialect(), - DataTypes = require('../../../../lib/data-types'), - sequelize = require('../../../../lib/sequelize'); + DataTypes = require('sequelize/lib/data-types'), + sequelize = require('sequelize/lib/sequelize'); if (dialect.match(/^postgres/)) { describe('[POSTGRES Specific] DAO', () => { diff --git a/test/integration/dialects/postgres/data-types.test.js b/test/integration/dialects/postgres/data-types.test.js index 17de0200af52..17cafeb87b3e 100644 --- a/test/integration/dialects/postgres/data-types.test.js +++ b/test/integration/dialects/postgres/data-types.test.js @@ -4,7 +4,7 @@ const chai = require('chai'); const expect = chai.expect; const Support = require('../../support'); const dialect = Support.getTestDialect(); -const DataTypes = require('../../../../lib/data-types'); +const DataTypes = require('sequelize/lib/data-types'); if (dialect === 'postgres') { diff --git a/test/integration/dialects/postgres/error.test.js b/test/integration/dialects/postgres/error.test.js index 425a599cbb2d..19332d17ce98 100644 --- a/test/integration/dialects/postgres/error.test.js +++ b/test/integration/dialects/postgres/error.test.js @@ -2,7 +2,7 @@ const chai = require('chai'), expect = chai.expect, - DataTypes = require('../../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), Support = require('../../support'), Sequelize = Support.Sequelize, dialect = Support.getTestDialect(), diff --git a/test/integration/dialects/postgres/hstore.test.js b/test/integration/dialects/postgres/hstore.test.js index ae81d459438d..3d96cc2b4f0a 100644 --- a/test/integration/dialects/postgres/hstore.test.js +++ b/test/integration/dialects/postgres/hstore.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../../support'), dialect = Support.getTestDialect(), - hstore = require('../../../../lib/dialects/postgres/hstore'); + hstore = require('sequelize/lib/dialects/postgres/hstore'); if (dialect.match(/^postgres/)) { describe('[POSTGRES Specific] hstore', () => { diff --git a/test/integration/dialects/postgres/query-interface.test.js b/test/integration/dialects/postgres/query-interface.test.js index 066f684f03d8..6f031ac51f4c 100644 --- a/test/integration/dialects/postgres/query-interface.test.js +++ b/test/integration/dialects/postgres/query-interface.test.js @@ -4,7 +4,7 @@ const chai = require('chai'); const expect = chai.expect; const Support = require('../../support'); const dialect = Support.getTestDialect(); -const DataTypes = require('../../../../lib/data-types'); +const DataTypes = require('sequelize/lib/data-types'); const _ = require('lodash'); diff --git a/test/integration/dialects/postgres/query.test.js b/test/integration/dialects/postgres/query.test.js index 5f4265653a6e..55085a6ccf6a 100644 --- a/test/integration/dialects/postgres/query.test.js +++ b/test/integration/dialects/postgres/query.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../../support'), dialect = Support.getTestDialect(), - DataTypes = require('../../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); if (dialect.match(/^postgres/)) { describe('[POSTGRES] Query', () => { @@ -103,4 +103,4 @@ if (dialect.match(/^postgres/)) { }); }); }); -} \ No newline at end of file +} diff --git a/test/integration/dialects/postgres/range.test.js b/test/integration/dialects/postgres/range.test.js index c7e7268f1ec2..6ab12f31587e 100644 --- a/test/integration/dialects/postgres/range.test.js +++ b/test/integration/dialects/postgres/range.test.js @@ -3,9 +3,9 @@ const chai = require('chai'), expect = chai.expect, Support = require('../../support'), - DataTypes = require('../../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), dialect = Support.getTestDialect(), - range = require('../../../../lib/dialects/postgres/range'); + range = require('sequelize/lib/dialects/postgres/range'); if (dialect.match(/^postgres/)) { // Don't try to load pg until we know we're running on postgres. diff --git a/test/integration/dialects/sqlite/connection-manager.test.js b/test/integration/dialects/sqlite/connection-manager.test.js index 064fa12a3921..4ae92190c884 100644 --- a/test/integration/dialects/sqlite/connection-manager.test.js +++ b/test/integration/dialects/sqlite/connection-manager.test.js @@ -5,7 +5,7 @@ const jetpack = require('fs-jetpack').cwd(__dirname); const expect = chai.expect; const Support = require('../../support'); const dialect = Support.getTestDialect(); -const DataTypes = require('../../../../lib/data-types'); +const DataTypes = require('sequelize/lib/data-types'); const fileName = `${Math.random()}_test.sqlite`; const directoryName = `${Math.random()}_test_directory`; diff --git a/test/integration/dialects/sqlite/dao-factory.test.js b/test/integration/dialects/sqlite/dao-factory.test.js index c73030137f0d..0c46ee80c340 100644 --- a/test/integration/dialects/sqlite/dao-factory.test.js +++ b/test/integration/dialects/sqlite/dao-factory.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../../support'), - DataTypes = require('../../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), dialect = Support.getTestDialect(), dbFile = 'test.sqlite', storages = [dbFile]; diff --git a/test/integration/dialects/sqlite/dao.test.js b/test/integration/dialects/sqlite/dao.test.js index 47eb3d286ead..6c1e79e0bc32 100644 --- a/test/integration/dialects/sqlite/dao.test.js +++ b/test/integration/dialects/sqlite/dao.test.js @@ -6,7 +6,7 @@ const chai = require('chai'), Sequelize = Support.Sequelize, Op = Sequelize.Op, dialect = Support.getTestDialect(), - DataTypes = require('../../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); if (dialect === 'sqlite') { describe('[SQLITE Specific] DAO', () => { diff --git a/test/integration/dialects/sqlite/sqlite-master.test.js b/test/integration/dialects/sqlite/sqlite-master.test.js index ced16581138a..1d23f5a02108 100644 --- a/test/integration/dialects/sqlite/sqlite-master.test.js +++ b/test/integration/dialects/sqlite/sqlite-master.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../../support'), dialect = Support.getTestDialect(), - DataTypes = require('../../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); if (dialect === 'sqlite') { describe('[SQLITE Specific] sqlite_master raw queries', () => { diff --git a/test/integration/hooks/associations.test.js b/test/integration/hooks/associations.test.js index 9140abb762d4..e02e503725dd 100644 --- a/test/integration/hooks/associations.test.js +++ b/test/integration/hooks/associations.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), sinon = require('sinon'), dialect = Support.getTestDialect(); diff --git a/test/integration/hooks/bulkOperation.test.js b/test/integration/hooks/bulkOperation.test.js index 040955024d80..61b718b2ffe9 100644 --- a/test/integration/hooks/bulkOperation.test.js +++ b/test/integration/hooks/bulkOperation.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), sinon = require('sinon'); describe(Support.getTestDialectTeaser('Hooks'), () => { diff --git a/test/integration/hooks/count.test.js b/test/integration/hooks/count.test.js index a97a2084c0fc..0ae96392272a 100644 --- a/test/integration/hooks/count.test.js +++ b/test/integration/hooks/count.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Hooks'), () => { beforeEach(async function() { diff --git a/test/integration/hooks/create.test.js b/test/integration/hooks/create.test.js index da684deff9f6..abd9f5bae16b 100644 --- a/test/integration/hooks/create.test.js +++ b/test/integration/hooks/create.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), Sequelize = Support.Sequelize, sinon = require('sinon'); diff --git a/test/integration/hooks/destroy.test.js b/test/integration/hooks/destroy.test.js index 6dfa3e7f61c3..69053a2148a2 100644 --- a/test/integration/hooks/destroy.test.js +++ b/test/integration/hooks/destroy.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), sinon = require('sinon'); describe(Support.getTestDialectTeaser('Hooks'), () => { diff --git a/test/integration/hooks/find.test.js b/test/integration/hooks/find.test.js index e0e87a68dfc3..ea6e678a1379 100644 --- a/test/integration/hooks/find.test.js +++ b/test/integration/hooks/find.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Hooks'), () => { beforeEach(async function() { diff --git a/test/integration/hooks/hooks.test.js b/test/integration/hooks/hooks.test.js index 5314bcc5687a..d205ccb51776 100644 --- a/test/integration/hooks/hooks.test.js +++ b/test/integration/hooks/hooks.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), Sequelize = Support.Sequelize, dialect = Support.getTestDialect(), sinon = require('sinon'); diff --git a/test/integration/hooks/restore.test.js b/test/integration/hooks/restore.test.js index c1665d774f59..c47d3e493e18 100644 --- a/test/integration/hooks/restore.test.js +++ b/test/integration/hooks/restore.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), sinon = require('sinon'); describe(Support.getTestDialectTeaser('Hooks'), () => { diff --git a/test/integration/hooks/updateAttributes.test.js b/test/integration/hooks/updateAttributes.test.js index eec8ec895fac..958930ea271a 100644 --- a/test/integration/hooks/updateAttributes.test.js +++ b/test/integration/hooks/updateAttributes.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), sinon = require('sinon'); describe(Support.getTestDialectTeaser('Hooks'), () => { diff --git a/test/integration/hooks/upsert.test.js b/test/integration/hooks/upsert.test.js index dd7b2cb0f51c..1259d03f40dd 100644 --- a/test/integration/hooks/upsert.test.js +++ b/test/integration/hooks/upsert.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), sinon = require('sinon'); if (Support.sequelize.dialect.supports.upserts) { diff --git a/test/integration/hooks/validate.test.js b/test/integration/hooks/validate.test.js index d3a6d301eb80..4ee5b0429900 100644 --- a/test/integration/hooks/validate.test.js +++ b/test/integration/hooks/validate.test.js @@ -4,7 +4,7 @@ const chai = require('chai'); const sinon = require('sinon'); const expect = chai.expect; const Support = require('../support'); -const DataTypes = require('../../../lib/data-types'); +const DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Hooks'), () => { beforeEach(async function() { diff --git a/test/integration/include.test.js b/test/integration/include.test.js index 7b049f9e2124..9a39d9446faf 100644 --- a/test/integration/include.test.js +++ b/test/integration/include.test.js @@ -1,10 +1,10 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Support = require('./support'), - DataTypes = require('../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), _ = require('lodash'), dialect = Support.getTestDialect(), current = Support.sequelize, diff --git a/test/integration/include/findAll.test.js b/test/integration/include/findAll.test.js index 0ce86e1eb222..29d9e062a24f 100644 --- a/test/integration/include/findAll.test.js +++ b/test/integration/include/findAll.test.js @@ -1,11 +1,11 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), Op = Sequelize.Op, expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), _ = require('lodash'), promiseProps = require('p-props'); diff --git a/test/integration/include/findAndCountAll.test.js b/test/integration/include/findAndCountAll.test.js index 22597038719e..4cc5f5f877bd 100644 --- a/test/integration/include/findAndCountAll.test.js +++ b/test/integration/include/findAndCountAll.test.js @@ -5,7 +5,7 @@ const chai = require('chai'), sinon = require('sinon'), Support = require('../support'), Op = Support.Sequelize.Op, - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Include'), () => { before(function() { diff --git a/test/integration/include/findOne.test.js b/test/integration/include/findOne.test.js index 7ea0dcb18cdd..f29fb507cbc5 100644 --- a/test/integration/include/findOne.test.js +++ b/test/integration/include/findOne.test.js @@ -3,16 +3,16 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - Sequelize = require('../../../index'), - DataTypes = require('../../../lib/data-types'), + Sequelize = require('sequelize'), + DataTypes = require('sequelize/lib/data-types'), _ = require('lodash'); describe(Support.getTestDialectTeaser('Include'), () => { describe('findOne', () => { it('should include a non required model, with conditions and two includes N:M 1:M', async function() { - const A = this.sequelize.define('A', { name: DataTypes.STRING(40) }, { paranoid: true }), - B = this.sequelize.define('B', { name: DataTypes.STRING(40) }, { paranoid: true }), - C = this.sequelize.define('C', { name: DataTypes.STRING(40) }, { paranoid: true }), + const A = this.sequelize.define('A', { name: DataTypes.STRING(40) }, { paranoid: true }), + B = this.sequelize.define('B', { name: DataTypes.STRING(40) }, { paranoid: true }), + C = this.sequelize.define('C', { name: DataTypes.STRING(40) }, { paranoid: true }), D = this.sequelize.define('D', { name: DataTypes.STRING(40) }, { paranoid: true }); // Associations diff --git a/test/integration/include/limit.test.js b/test/integration/include/limit.test.js index 9ff45e10009a..e845187d4c24 100644 --- a/test/integration/include/limit.test.js +++ b/test/integration/include/limit.test.js @@ -1,10 +1,10 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), Op = Sequelize.Op; describe(Support.getTestDialectTeaser('Include'), () => { diff --git a/test/integration/include/paranoid.test.js b/test/integration/include/paranoid.test.js index 9f88e8baf1f6..ba8d4fa68ace 100644 --- a/test/integration/include/paranoid.test.js +++ b/test/integration/include/paranoid.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), expect = chai.expect, sinon = require('sinon'), Support = require('../support'), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Paranoid'), () => { diff --git a/test/integration/include/schema.test.js b/test/integration/include/schema.test.js index bfffa78f80f0..7db23df577d0 100644 --- a/test/integration/include/schema.test.js +++ b/test/integration/include/schema.test.js @@ -1,11 +1,11 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), Op = Sequelize.Op, expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), dialect = Support.getTestDialect(), _ = require('lodash'), promiseProps = require('p-props'); diff --git a/test/integration/include/separate.test.js b/test/integration/include/separate.test.js index aea667455c47..3cc9bec25bd6 100644 --- a/test/integration/include/separate.test.js +++ b/test/integration/include/separate.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), expect = chai.expect, sinon = require('sinon'), Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), current = Support.sequelize, dialect = Support.getTestDialect(); diff --git a/test/integration/instance.test.js b/test/integration/instance.test.js index d7d16c7dba4b..ba5e17a5b679 100644 --- a/test/integration/instance.test.js +++ b/test/integration/instance.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('./support'), - DataTypes = require('../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), dialect = Support.getTestDialect(), sinon = require('sinon'), isUUID = require('validator').isUUID; diff --git a/test/integration/instance.validations.test.js b/test/integration/instance.validations.test.js index 69cf060739eb..c09ca473f9df 100644 --- a/test/integration/instance.validations.test.js +++ b/test/integration/instance.validations.test.js @@ -2,7 +2,7 @@ const chai = require('chai'), expect = chai.expect, - Sequelize = require('../../index'), + Sequelize = require('sequelize'), Support = require('./support'); describe(Support.getTestDialectTeaser('InstanceValidator'), () => { diff --git a/test/integration/instance/decrement.test.js b/test/integration/instance/decrement.test.js index a38397066c35..11eb8a7487f4 100644 --- a/test/integration/instance/decrement.test.js +++ b/test/integration/instance/decrement.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), sinon = require('sinon'), current = Support.sequelize; diff --git a/test/integration/instance/increment.test.js b/test/integration/instance/increment.test.js index a50aba8fe9f6..ab1b15224823 100644 --- a/test/integration/instance/increment.test.js +++ b/test/integration/instance/increment.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), sinon = require('sinon'), current = Support.sequelize; diff --git a/test/integration/instance/reload.test.js b/test/integration/instance/reload.test.js index 8b9566d82140..894e4be934f8 100644 --- a/test/integration/instance/reload.test.js +++ b/test/integration/instance/reload.test.js @@ -2,9 +2,9 @@ const chai = require('chai'), expect = chai.expect, - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), sinon = require('sinon'), current = Support.sequelize; diff --git a/test/integration/instance/save.test.js b/test/integration/instance/save.test.js index 0ab42dda82aa..79cbcb9e555a 100644 --- a/test/integration/instance/save.test.js +++ b/test/integration/instance/save.test.js @@ -2,9 +2,9 @@ const chai = require('chai'), expect = chai.expect, - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), sinon = require('sinon'), current = Support.sequelize; diff --git a/test/integration/instance/to-json.test.js b/test/integration/instance/to-json.test.js index cd904747facd..e29a6c4c1b70 100644 --- a/test/integration/instance/to-json.test.js +++ b/test/integration/instance/to-json.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Instance'), () => { describe('toJSON', () => { diff --git a/test/integration/instance/update.test.js b/test/integration/instance/update.test.js index c3f17aefeac8..1b5a6212ae4d 100644 --- a/test/integration/instance/update.test.js +++ b/test/integration/instance/update.test.js @@ -2,10 +2,10 @@ const chai = require('chai'), sinon = require('sinon'), - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), current = Support.sequelize; describe(Support.getTestDialectTeaser('Instance'), () => { diff --git a/test/integration/instance/values.test.js b/test/integration/instance/values.test.js index 6995eff1cebd..14f24151adc0 100644 --- a/test/integration/instance/values.test.js +++ b/test/integration/instance/values.test.js @@ -1,11 +1,11 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Support = require('../support'), dialect = Support.getTestDialect(), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('DAO'), () => { describe('Values', () => { diff --git a/test/integration/model.test.js b/test/integration/model.test.js index d6020747b468..d6aa15cb86e8 100644 --- a/test/integration/model.test.js +++ b/test/integration/model.test.js @@ -1,12 +1,12 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Support = require('./support'), - DataTypes = require('../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), dialect = Support.getTestDialect(), - errors = require('../../lib/errors'), + errors = require('sequelize/lib/errors'), sinon = require('sinon'), _ = require('lodash'), moment = require('moment'), diff --git a/test/integration/model/attributes.test.js b/test/integration/model/attributes.test.js index 99dd66e07ebc..82e3287de3d5 100644 --- a/test/integration/model/attributes.test.js +++ b/test/integration/model/attributes.test.js @@ -1,7 +1,7 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Support = require('../support'); diff --git a/test/integration/model/attributes/field.test.js b/test/integration/model/attributes/field.test.js index e03aebfe4ee2..b5da466f7d31 100644 --- a/test/integration/model/attributes/field.test.js +++ b/test/integration/model/attributes/field.test.js @@ -2,10 +2,10 @@ const chai = require('chai'), sinon = require('sinon'), - Sequelize = require('../../../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Support = require('../../support'), - DataTypes = require('../../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), dialect = Support.getTestDialect(); describe(Support.getTestDialectTeaser('Model'), () => { diff --git a/test/integration/model/attributes/types.test.js b/test/integration/model/attributes/types.test.js index 8da3d1235ddb..bd6fa22cef16 100644 --- a/test/integration/model/attributes/types.test.js +++ b/test/integration/model/attributes/types.test.js @@ -1,7 +1,7 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Support = require('../../support'), dialect = Support.getTestDialect(); diff --git a/test/integration/model/bulk-create.test.js b/test/integration/model/bulk-create.test.js index e0af4fea371b..9194c9fd7625 100644 --- a/test/integration/model/bulk-create.test.js +++ b/test/integration/model/bulk-create.test.js @@ -1,12 +1,12 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../index'), - AggregateError = require('../../../lib/errors/aggregate-error'), + Sequelize = require('sequelize'), + AggregateError = require('sequelize/lib/errors/aggregate-error'), Op = Sequelize.Op, expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), dialect = Support.getTestDialect(), current = Support.sequelize; diff --git a/test/integration/model/bulk-create/include.test.js b/test/integration/model/bulk-create/include.test.js index 34d24fe12fdd..ca5a3c480d94 100644 --- a/test/integration/model/bulk-create/include.test.js +++ b/test/integration/model/bulk-create/include.test.js @@ -1,10 +1,10 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Support = require('../../support'), - DataTypes = require('../../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Model'), () => { describe('bulkCreate', () => { diff --git a/test/integration/model/count.test.js b/test/integration/model/count.test.js index f10257e956e2..f6e89466c35e 100644 --- a/test/integration/model/count.test.js +++ b/test/integration/model/count.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Model'), () => { describe('count', () => { diff --git a/test/integration/model/create.test.js b/test/integration/model/create.test.js index a5a417f69e35..3f2b5b2a8532 100644 --- a/test/integration/model/create.test.js +++ b/test/integration/model/create.test.js @@ -2,10 +2,10 @@ const chai = require('chai'), sinon = require('sinon'), - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), dialect = Support.getTestDialect(), Op = Sequelize.Op, _ = require('lodash'), diff --git a/test/integration/model/create/include.test.js b/test/integration/model/create/include.test.js index 01b651523d6d..f78e3d70a8d9 100644 --- a/test/integration/model/create/include.test.js +++ b/test/integration/model/create/include.test.js @@ -1,10 +1,10 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Support = require('../../support'), - DataTypes = require('../../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Model'), () => { describe('create', () => { diff --git a/test/integration/model/findAll.test.js b/test/integration/model/findAll.test.js index 380a92e3f23d..5a4aa748547d 100644 --- a/test/integration/model/findAll.test.js +++ b/test/integration/model/findAll.test.js @@ -2,11 +2,11 @@ const chai = require('chai'), sinon = require('sinon'), - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Support = require('../support'), Op = Sequelize.Op, - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), dialect = Support.getTestDialect(), _ = require('lodash'), moment = require('moment'), diff --git a/test/integration/model/findAll/group.test.js b/test/integration/model/findAll/group.test.js index fac604072b5a..dcc2fedda078 100644 --- a/test/integration/model/findAll/group.test.js +++ b/test/integration/model/findAll/group.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../../support'), Sequelize = Support.Sequelize, - DataTypes = require('../../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), current = Support.sequelize; describe(Support.getTestDialectTeaser('Model'), () => { diff --git a/test/integration/model/findAll/groupedLimit.test.js b/test/integration/model/findAll/groupedLimit.test.js index 0385c7464c23..76760d25b7f4 100644 --- a/test/integration/model/findAll/groupedLimit.test.js +++ b/test/integration/model/findAll/groupedLimit.test.js @@ -5,7 +5,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../../support'), Sequelize = Support.Sequelize, - DataTypes = require('../../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), current = Support.sequelize, _ = require('lodash'); diff --git a/test/integration/model/findAll/order.test.js b/test/integration/model/findAll/order.test.js index 35bfd50523c0..73af8a7a2988 100644 --- a/test/integration/model/findAll/order.test.js +++ b/test/integration/model/findAll/order.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../../support'), - DataTypes = require('../../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), current = Support.sequelize; describe(Support.getTestDialectTeaser('Model'), () => { diff --git a/test/integration/model/findAll/separate.test.js b/test/integration/model/findAll/separate.test.js index d81a848fcf89..df616e934adf 100644 --- a/test/integration/model/findAll/separate.test.js +++ b/test/integration/model/findAll/separate.test.js @@ -3,7 +3,7 @@ const chai = require('chai'); const expect = chai.expect; const Support = require('../../support'); -const DataTypes = require('../../../../lib/data-types'); +const DataTypes = require('sequelize/lib/data-types'); const current = Support.sequelize; describe(Support.getTestDialectTeaser('Model'), () => { diff --git a/test/integration/model/findOne.test.js b/test/integration/model/findOne.test.js index 6f1dcc07b327..76e982ffe095 100644 --- a/test/integration/model/findOne.test.js +++ b/test/integration/model/findOne.test.js @@ -2,11 +2,11 @@ const chai = require('chai'), sinon = require('sinon'), - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Support = require('../support'), dialect = Support.getTestDialect(), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), current = Support.sequelize; describe(Support.getTestDialectTeaser('Model'), () => { diff --git a/test/integration/model/findOrBuild.test.js b/test/integration/model/findOrBuild.test.js index 25d9eff089a1..55ba56dbf79f 100644 --- a/test/integration/model/findOrBuild.test.js +++ b/test/integration/model/findOrBuild.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Model'), () => { beforeEach(async function() { diff --git a/test/integration/model/geography.test.js b/test/integration/model/geography.test.js index 168f8cfbc9a3..eb3f6c5fe56a 100644 --- a/test/integration/model/geography.test.js +++ b/test/integration/model/geography.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); const current = Support.sequelize; diff --git a/test/integration/model/geometry.test.js b/test/integration/model/geometry.test.js index dea09c8d4ec1..c711760eb5cd 100644 --- a/test/integration/model/geometry.test.js +++ b/test/integration/model/geometry.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), dialect = Support.getTestDialect(), semver = require('semver'); @@ -104,7 +104,7 @@ describe(Support.getTestDialectTeaser('Model'), () => { const user = await User.findOne({ where: { username: props.username } }); expect(user.geometry).to.be.deep.eql(point2); }); - + it('works with crs field', async function() { const User = this.User; const point = { type: 'Point', coordinates: [39.807222, -76.984722], @@ -161,7 +161,7 @@ describe(Support.getTestDialectTeaser('Model'), () => { properties: { name: 'EPSG:4326' } - } + } }; const newUser = await User.create({ username: 'username', geometry: point }); @@ -203,7 +203,7 @@ describe(Support.getTestDialectTeaser('Model'), () => { properties: { name: 'EPSG:4326' } - } + } }; const newUser = await User.create({ username: 'username', geometry: point }); diff --git a/test/integration/model/increment.test.js b/test/integration/model/increment.test.js index dd52ac549e51..97466b6eba99 100644 --- a/test/integration/model/increment.test.js +++ b/test/integration/model/increment.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), sinon = require('sinon'); describe(Support.getTestDialectTeaser('Model'), () => { diff --git a/test/integration/model/json.test.js b/test/integration/model/json.test.js index d4828e72f2f3..3eb69501d9fd 100644 --- a/test/integration/model/json.test.js +++ b/test/integration/model/json.test.js @@ -1,12 +1,12 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), Op = Sequelize.Op, moment = require('moment'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), current = Support.sequelize; describe(Support.getTestDialectTeaser('Model'), () => { diff --git a/test/integration/model/notExist.test.js b/test/integration/model/notExist.test.js index e85c736e4ad2..b4b6de0100f2 100644 --- a/test/integration/model/notExist.test.js +++ b/test/integration/model/notExist.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Model'), () => { beforeEach(async function() { diff --git a/test/integration/model/optimistic_locking.test.js b/test/integration/model/optimistic_locking.test.js index b58282bfc9b3..1dddf963374b 100644 --- a/test/integration/model/optimistic_locking.test.js +++ b/test/integration/model/optimistic_locking.test.js @@ -1,7 +1,7 @@ 'use strict'; const Support = require('../support'); -const DataTypes = require('../../../lib/data-types'); +const DataTypes = require('sequelize/lib/data-types'); const chai = require('chai'); const expect = chai.expect; diff --git a/test/integration/model/paranoid.test.js b/test/integration/model/paranoid.test.js index 9033ad795d52..2a03f762aed3 100644 --- a/test/integration/model/paranoid.test.js +++ b/test/integration/model/paranoid.test.js @@ -1,7 +1,7 @@ 'use strict'; const Support = require('../support'); -const DataTypes = require('../../../lib/data-types'); +const DataTypes = require('sequelize/lib/data-types'); const chai = require('chai'); const expect = chai.expect; const sinon = require('sinon'); diff --git a/test/integration/model/schema.test.js b/test/integration/model/schema.test.js index 376ea9758bde..5f4e98ae08c0 100644 --- a/test/integration/model/schema.test.js +++ b/test/integration/model/schema.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), dialect = Support.getTestDialect(), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), current = Support.sequelize, Op = Support.Sequelize.Op; diff --git a/test/integration/model/scope.test.js b/test/integration/model/scope.test.js index aa2db393ffb8..fd756e0bc090 100644 --- a/test/integration/model/scope.test.js +++ b/test/integration/model/scope.test.js @@ -1,7 +1,7 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), Op = Sequelize.Op, expect = chai.expect, Support = require('../support'); diff --git a/test/integration/model/scope/aggregate.test.js b/test/integration/model/scope/aggregate.test.js index 620fea0b650b..bc1a1b2a2e6d 100644 --- a/test/integration/model/scope/aggregate.test.js +++ b/test/integration/model/scope/aggregate.test.js @@ -1,7 +1,7 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../../index'), + Sequelize = require('sequelize'), Op = Sequelize.Op, expect = chai.expect, Support = require('../../support'); diff --git a/test/integration/model/scope/associations.test.js b/test/integration/model/scope/associations.test.js index a004489ab0af..63589943b9bb 100644 --- a/test/integration/model/scope/associations.test.js +++ b/test/integration/model/scope/associations.test.js @@ -1,7 +1,7 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../../index'), + Sequelize = require('sequelize'), Op = Sequelize.Op, expect = chai.expect, Support = require('../../support'); diff --git a/test/integration/model/scope/count.test.js b/test/integration/model/scope/count.test.js index cc08fcd17af0..d55f3f205d80 100644 --- a/test/integration/model/scope/count.test.js +++ b/test/integration/model/scope/count.test.js @@ -1,7 +1,7 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../../index'), + Sequelize = require('sequelize'), Op = Sequelize.Op, expect = chai.expect, Support = require('../../support'); diff --git a/test/integration/model/scope/destroy.test.js b/test/integration/model/scope/destroy.test.js index ce66450c505a..645238f49b25 100644 --- a/test/integration/model/scope/destroy.test.js +++ b/test/integration/model/scope/destroy.test.js @@ -1,7 +1,7 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../../index'), + Sequelize = require('sequelize'), Op = Sequelize.Op, expect = chai.expect, Support = require('../../support'); diff --git a/test/integration/model/scope/find.test.js b/test/integration/model/scope/find.test.js index 49604344dcf5..41dc0d2f1b6e 100644 --- a/test/integration/model/scope/find.test.js +++ b/test/integration/model/scope/find.test.js @@ -1,7 +1,7 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Op = Sequelize.Op, Support = require('../../support'); diff --git a/test/integration/model/scope/findAndCountAll.test.js b/test/integration/model/scope/findAndCountAll.test.js index 529fa64993ea..0645794b14eb 100644 --- a/test/integration/model/scope/findAndCountAll.test.js +++ b/test/integration/model/scope/findAndCountAll.test.js @@ -1,7 +1,7 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../../index'), + Sequelize = require('sequelize'), Op = Sequelize.Op, expect = chai.expect, Support = require('../../support'); diff --git a/test/integration/model/scope/merge.test.js b/test/integration/model/scope/merge.test.js index 45e840a70789..adcde1ebe107 100644 --- a/test/integration/model/scope/merge.test.js +++ b/test/integration/model/scope/merge.test.js @@ -1,7 +1,7 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Support = require('../../support'), combinatorics = require('js-combinatorics'); diff --git a/test/integration/model/scope/update.test.js b/test/integration/model/scope/update.test.js index 50a3d339d6b9..2bb96d4f1702 100644 --- a/test/integration/model/scope/update.test.js +++ b/test/integration/model/scope/update.test.js @@ -1,7 +1,7 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Op = Sequelize.Op, Support = require('../../support'); diff --git a/test/integration/model/searchPath.test.js b/test/integration/model/searchPath.test.js index 8f8a41d4600f..0e6ddebb8a0c 100644 --- a/test/integration/model/searchPath.test.js +++ b/test/integration/model/searchPath.test.js @@ -3,7 +3,7 @@ const chai = require('chai'); const expect = chai.expect; const Support = require('../support'); -const DataTypes = require('../../../lib/data-types'); +const DataTypes = require('sequelize/lib/data-types'); const Op = Support.Sequelize.Op; const SEARCH_PATH_ONE = 'schema_one,public'; diff --git a/test/integration/model/sum.test.js b/test/integration/model/sum.test.js index 081592e3a94f..744a5815bcf4 100644 --- a/test/integration/model/sum.test.js +++ b/test/integration/model/sum.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Model'), () => { beforeEach(async function() { diff --git a/test/integration/model/sync.test.js b/test/integration/model/sync.test.js index c615efc78595..09450be58f8d 100644 --- a/test/integration/model/sync.test.js +++ b/test/integration/model/sync.test.js @@ -1,7 +1,7 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Support = require('../support'), dialect = Support.getTestDialect(); diff --git a/test/integration/model/update.test.js b/test/integration/model/update.test.js index fda69409baff..4bdff3eb7430 100644 --- a/test/integration/model/update.test.js +++ b/test/integration/model/update.test.js @@ -1,7 +1,7 @@ 'use strict'; const Support = require('../support'); -const DataTypes = require('../../../lib/data-types'); +const DataTypes = require('sequelize/lib/data-types'); const chai = require('chai'); const sinon = require('sinon'); const expect = chai.expect; diff --git a/test/integration/model/upsert.test.js b/test/integration/model/upsert.test.js index 26e51c7bbc26..bfbab5e27e13 100644 --- a/test/integration/model/upsert.test.js +++ b/test/integration/model/upsert.test.js @@ -2,10 +2,10 @@ const chai = require('chai'), sinon = require('sinon'), - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), dialect = Support.getTestDialect(), current = Support.sequelize; diff --git a/test/integration/operators.test.js b/test/integration/operators.test.js index 46baf746cdea..7d104c7bd6d0 100644 --- a/test/integration/operators.test.js +++ b/test/integration/operators.test.js @@ -1,11 +1,11 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../index'), + Sequelize = require('sequelize'), Op = Sequelize.Op, expect = chai.expect, Support = require('../support'), - DataTypes = require('../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), dialect = Support.getTestDialect(); describe(Support.getTestDialectTeaser('Operators'), () => { diff --git a/test/integration/query-interface.test.js b/test/integration/query-interface.test.js index d37481c147fb..73cc1cc5fab9 100644 --- a/test/integration/query-interface.test.js +++ b/test/integration/query-interface.test.js @@ -3,7 +3,7 @@ const chai = require('chai'); const expect = chai.expect; const Support = require('./support'); -const DataTypes = require('../../lib/data-types'); +const DataTypes = require('sequelize/lib/data-types'); const dialect = Support.getTestDialect(); const Sequelize = Support.Sequelize; const current = Support.sequelize; diff --git a/test/integration/query-interface/changeColumn.test.js b/test/integration/query-interface/changeColumn.test.js index 7bc12b77a2d8..2df81c8d522f 100644 --- a/test/integration/query-interface/changeColumn.test.js +++ b/test/integration/query-interface/changeColumn.test.js @@ -3,7 +3,7 @@ const chai = require('chai'); const expect = chai.expect; const Support = require('../support'); -const DataTypes = require('../../../lib/data-types'); +const DataTypes = require('sequelize/lib/data-types'); const dialect = Support.getTestDialect(); describe(Support.getTestDialectTeaser('QueryInterface'), () => { diff --git a/test/integration/query-interface/createTable.test.js b/test/integration/query-interface/createTable.test.js index 31f2af637138..ee7e3211f702 100644 --- a/test/integration/query-interface/createTable.test.js +++ b/test/integration/query-interface/createTable.test.js @@ -3,7 +3,7 @@ const chai = require('chai'); const expect = chai.expect; const Support = require('../support'); -const DataTypes = require('../../../lib/data-types'); +const DataTypes = require('sequelize/lib/data-types'); const dialect = Support.getTestDialect(); describe(Support.getTestDialectTeaser('QueryInterface'), () => { diff --git a/test/integration/query-interface/describeTable.test.js b/test/integration/query-interface/describeTable.test.js index 5785a8ba5e6e..318b142322b4 100644 --- a/test/integration/query-interface/describeTable.test.js +++ b/test/integration/query-interface/describeTable.test.js @@ -3,7 +3,7 @@ const chai = require('chai'); const expect = chai.expect; const Support = require('../support'); -const DataTypes = require('../../../lib/data-types'); +const DataTypes = require('sequelize/lib/data-types'); const dialect = Support.getTestDialect(); describe(Support.getTestDialectTeaser('QueryInterface'), () => { diff --git a/test/integration/query-interface/dropEnum.test.js b/test/integration/query-interface/dropEnum.test.js index 136e30331a5c..0da41079744d 100644 --- a/test/integration/query-interface/dropEnum.test.js +++ b/test/integration/query-interface/dropEnum.test.js @@ -3,7 +3,7 @@ const chai = require('chai'); const expect = chai.expect; const Support = require('../support'); -const DataTypes = require('../../../lib/data-types'); +const DataTypes = require('sequelize/lib/data-types'); const dialect = Support.getTestDialect(); describe(Support.getTestDialectTeaser('QueryInterface'), () => { diff --git a/test/integration/query-interface/removeColumn.test.js b/test/integration/query-interface/removeColumn.test.js index 983d7a9d8ace..a7aa7f21c2bd 100644 --- a/test/integration/query-interface/removeColumn.test.js +++ b/test/integration/query-interface/removeColumn.test.js @@ -3,7 +3,7 @@ const chai = require('chai'); const expect = chai.expect; const Support = require('../support'); -const DataTypes = require('../../../lib/data-types'); +const DataTypes = require('sequelize/lib/data-types'); const dialect = Support.getTestDialect(); describe(Support.getTestDialectTeaser('QueryInterface'), () => { diff --git a/test/integration/replication.test.js b/test/integration/replication.test.js index 1ba98bb12912..cd3107688fee 100644 --- a/test/integration/replication.test.js +++ b/test/integration/replication.test.js @@ -3,7 +3,7 @@ const chai = require('chai'); const expect = chai.expect; const Support = require('./support'); -const DataTypes = require('../../lib/data-types'); +const DataTypes = require('sequelize/lib/data-types'); const dialect = Support.getTestDialect(); const sinon = require('sinon'); diff --git a/test/integration/schema.test.js b/test/integration/schema.test.js index 4bfe96b97a80..15787b621433 100644 --- a/test/integration/schema.test.js +++ b/test/integration/schema.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('./support'), - DataTypes = require('../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Schema'), () => { beforeEach(async function() { diff --git a/test/integration/sequelize.test.js b/test/integration/sequelize.test.js index 78a404bb9e0e..6139899ff5b6 100644 --- a/test/integration/sequelize.test.js +++ b/test/integration/sequelize.test.js @@ -2,12 +2,12 @@ const { expect, assert } = require('chai'); const Support = require('./support'); -const DataTypes = require('../../lib/data-types'); +const DataTypes = require('sequelize/lib/data-types'); const dialect = Support.getTestDialect(); const _ = require('lodash'); -const Sequelize = require('../../index'); +const Sequelize = require('sequelize'); const config = require('../config/config'); -const Transaction = require('../../lib/transaction'); +const Transaction = require('sequelize/lib/transaction'); const sinon = require('sinon'); const current = Support.sequelize; diff --git a/test/integration/sequelize.transaction.test.js b/test/integration/sequelize.transaction.test.js index 86feee7f1793..8b032934598e 100644 --- a/test/integration/sequelize.transaction.test.js +++ b/test/integration/sequelize.transaction.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('./support'), - Transaction = require('../../lib/transaction'), + Transaction = require('sequelize/lib/transaction'), current = Support.sequelize, delay = require('delay'); diff --git a/test/integration/sequelize/deferrable.test.js b/test/integration/sequelize/deferrable.test.js index 332baf4b2779..82597ac1b7a1 100644 --- a/test/integration/sequelize/deferrable.test.js +++ b/test/integration/sequelize/deferrable.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - Sequelize = require('../../../index'); + Sequelize = require('sequelize'); if (!Support.sequelize.dialect.supports.deferrableConstraints) { return; diff --git a/test/integration/transaction.test.js b/test/integration/transaction.test.js index d4605dca3caf..0bceb3378096 100644 --- a/test/integration/transaction.test.js +++ b/test/integration/transaction.test.js @@ -4,7 +4,7 @@ const chai = require('chai'); const expect = chai.expect; const Support = require('./support'); const dialect = Support.getTestDialect(); -const { Sequelize, QueryTypes, DataTypes, Transaction } = require('../../index'); +const { Sequelize, QueryTypes, DataTypes, Transaction } = require('sequelize'); const sinon = require('sinon'); const current = Support.sequelize; const delay = require('delay'); diff --git a/test/integration/trigger.test.js b/test/integration/trigger.test.js index 6877fbdd8841..3e62f1023b78 100644 --- a/test/integration/trigger.test.js +++ b/test/integration/trigger.test.js @@ -1,7 +1,7 @@ 'use strict'; const chai = require('chai'), - Sequelize = require('../../index'), + Sequelize = require('sequelize'), expect = chai.expect, Support = require('../support'), current = Support.sequelize; diff --git a/test/integration/utils.test.js b/test/integration/utils.test.js index 622047e61b21..0b65c75f4dbe 100644 --- a/test/integration/utils.test.js +++ b/test/integration/utils.test.js @@ -2,10 +2,10 @@ const chai = require('chai'), expect = chai.expect, - Utils = require('../../lib/utils'), + Utils = require('sequelize/lib/utils'), Support = require('./support'), - DataTypes = require('../../lib/data-types'), - Sequelize = require('../../index'), + DataTypes = require('sequelize/lib/data-types'), + Sequelize = require('sequelize'), Op = Sequelize.Op; describe(Support.getTestDialectTeaser('Utils'), () => { diff --git a/test/integration/vectors.test.js b/test/integration/vectors.test.js index e604d57a4267..3a3b406750e7 100644 --- a/test/integration/vectors.test.js +++ b/test/integration/vectors.test.js @@ -2,7 +2,7 @@ const chai = require('chai'), expect = chai.expect, - Sequelize = require('../../index'), + Sequelize = require('sequelize'), Support = require('./support'); chai.should(); diff --git a/test/registerEsbuild.js b/test/registerEsbuild.js new file mode 100644 index 000000000000..82f12561c148 --- /dev/null +++ b/test/registerEsbuild.js @@ -0,0 +1,53 @@ +'use strict'; +const path = require('path'); +const hook = require('node-hook'); +const esbuild = require('esbuild'); +const moduleAlias = require('module-alias'); +const sourceMapSupport = require('source-map-support'); + +const distDir = path.join(__dirname, '../dist'); +// make imports from `sequelize/` go to `../dist/` +moduleAlias.addAlias('sequelize', distDir); + +const maps = {}; + +// This logic is sourced from https://github.com/babel/babel/blob/39ba1ff300a5c9448ccd40a50a017e7f24e5cd56/packages/babel-register/src/node.js#L15-L31 +function installSourceMapSupport() { + sourceMapSupport.install({ + handleUncaughtExceptions: false, + environment: 'node', + retrieveSourceMap(source) { + const map = maps && maps[source]; + if (map) { + return { + url: null, + map + }; + } + + return null; + } + }); +} + +function compileFor(loader) { + return (source, sourcefile) => { + const { code, map } = esbuild.transformSync(source, { + sourcemap: true, + target: 'node10', + format: 'cjs', + sourcefile, + loader + }); + + if (Object.keys(maps).length === 0) { + installSourceMapSupport(); + } + + maps[sourcefile] = map; + + return code; + }; +} + +hook.hook('.ts', compileFor('ts')); diff --git a/test/support.js b/test/support.js index 57b351a8d984..220100284d4c 100644 --- a/test/support.js +++ b/test/support.js @@ -4,11 +4,13 @@ const fs = require('fs'); const path = require('path'); const { isDeepStrictEqual } = require('util'); const _ = require('lodash'); -const Sequelize = require('../index'); + +const Sequelize = require('sequelize'); const Config = require('./config/config'); const chai = require('chai'); const expect = chai.expect; -const AbstractQueryGenerator = require('../lib/dialects/abstract/query-generator'); +const AbstractQueryGenerator = require('sequelize/lib/dialects/abstract/query-generator'); +const distDir = path.resolve(__dirname, '../dist'); chai.use(require('chai-datetime')); chai.use(require('chai-as-promised')); @@ -164,7 +166,7 @@ const Support = { }, getSupportedDialects() { - return fs.readdirSync(`${__dirname}/../lib/dialects`) + return fs.readdirSync(path.join(distDir, 'lib/dialects')) .filter(file => !file.includes('.js') && !file.includes('abstract')); }, diff --git a/test/tsconfig.json b/test/tsconfig.json new file mode 100644 index 000000000000..c11e94933cbd --- /dev/null +++ b/test/tsconfig.json @@ -0,0 +1,14 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "baseUrl": ".", + "paths": { + "sequelize/*": ["../dist/*"] + }, + "types": ["node", "mocha", "sinon", "chai"], + + "emitDeclarationOnly": false, + "noEmit": true + }, + "include": ["./**/*"], +} diff --git a/test/unit/associations/association.test.js b/test/unit/associations/association.test.js index 5cc04391bb3d..00172bf6de52 100644 --- a/test/unit/associations/association.test.js +++ b/test/unit/associations/association.test.js @@ -4,7 +4,7 @@ const chai = require('chai'); const expect = chai.expect; const Support = require('../support'); const current = Support.sequelize; -const AssociationError = require('../../../lib/errors').AssociationError; +const AssociationError = require('sequelize/lib/errors').AssociationError; describe(Support.getTestDialectTeaser('belongsTo'), () => { it('should throw an AssociationError when two associations have the same alias', () => { diff --git a/test/unit/associations/belongs-to-many.test.js b/test/unit/associations/belongs-to-many.test.js index c3b12ab6d3e3..bf83f011b4e9 100644 --- a/test/unit/associations/belongs-to-many.test.js +++ b/test/unit/associations/belongs-to-many.test.js @@ -6,12 +6,12 @@ const expect = chai.expect; const stub = sinon.stub; const _ = require('lodash'); const Support = require('../support'); -const DataTypes = require('../../../lib/data-types'); -const BelongsTo = require('../../../lib/associations/belongs-to'); -const HasMany = require('../../../lib/associations/has-many'); -const HasOne = require('../../../lib/associations/has-one'); +const DataTypes = require('sequelize/lib/data-types'); +const BelongsTo = require('sequelize/lib/associations/belongs-to'); +const HasMany = require('sequelize/lib/associations/has-many'); +const HasOne = require('sequelize/lib/associations/has-one'); const current = Support.sequelize; -const AssociationError = require('../../../lib/errors').AssociationError; +const AssociationError = require('sequelize/lib/errors').AssociationError; describe(Support.getTestDialectTeaser('belongsToMany'), () => { it('throws when invalid model is passed', () => { diff --git a/test/unit/associations/belongs-to.test.js b/test/unit/associations/belongs-to.test.js index a431edfc0aa8..8baa903c2b43 100644 --- a/test/unit/associations/belongs-to.test.js +++ b/test/unit/associations/belongs-to.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), expect = chai.expect, sinon = require('sinon'), _ = require('lodash'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), Support = require('../support'), current = Support.sequelize; diff --git a/test/unit/associations/dont-modify-options.test.js b/test/unit/associations/dont-modify-options.test.js index 8712dc4b181f..52e7533eb4ed 100644 --- a/test/unit/associations/dont-modify-options.test.js +++ b/test/unit/associations/dont-modify-options.test.js @@ -3,8 +3,8 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), - Sequelize = require('../../../index'); + DataTypes = require('sequelize/lib/data-types'), + Sequelize = require('sequelize'); describe(Support.getTestDialectTeaser('associations'), () => { describe('Test options.foreignKey', () => { diff --git a/test/unit/associations/has-many.test.js b/test/unit/associations/has-many.test.js index 6cadab6f330f..873dce4ed187 100644 --- a/test/unit/associations/has-many.test.js +++ b/test/unit/associations/has-many.test.js @@ -6,9 +6,9 @@ const chai = require('chai'), stub = sinon.stub, _ = require('lodash'), Support = require('../support'), - DataTypes = require('../../../lib/data-types'), - HasMany = require('../../../lib/associations/has-many'), - Op = require('../../../lib/operators'), + DataTypes = require('sequelize/lib/data-types'), + HasMany = require('sequelize/lib/associations/has-many'), + Op = require('sequelize/lib/operators'), current = Support.sequelize; describe(Support.getTestDialectTeaser('hasMany'), () => { diff --git a/test/unit/associations/has-one.test.js b/test/unit/associations/has-one.test.js index de3f11c5ed62..86ed2ef82f91 100644 --- a/test/unit/associations/has-one.test.js +++ b/test/unit/associations/has-one.test.js @@ -5,7 +5,7 @@ const chai = require('chai'), sinon = require('sinon'), _ = require('lodash'), Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), current = Support.sequelize; describe(Support.getTestDialectTeaser('hasOne'), () => { diff --git a/test/unit/connection-manager.test.js b/test/unit/connection-manager.test.js index 0b55ae53a6e4..58ecef2cbba3 100644 --- a/test/unit/connection-manager.test.js +++ b/test/unit/connection-manager.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), sinon = require('sinon'), expect = chai.expect, Support = require('./support'), - ConnectionManager = require('../../lib/dialects/abstract/connection-manager'); + ConnectionManager = require('sequelize/lib/dialects/abstract/connection-manager'); describe('connection manager', () => { describe('_connect', () => { diff --git a/test/unit/dialects/abstract/query-generator.test.js b/test/unit/dialects/abstract/query-generator.test.js index 6a216cec5af5..7a274d605e0b 100644 --- a/test/unit/dialects/abstract/query-generator.test.js +++ b/test/unit/dialects/abstract/query-generator.test.js @@ -2,7 +2,7 @@ const chai = require('chai'), expect = chai.expect, - Op = require('../../../../lib/operators'), + Op = require('sequelize/lib/operators'), getAbstractQueryGenerator = require('../../support').getAbstractQueryGenerator; describe('QueryGenerator', () => { diff --git a/test/unit/dialects/abstract/query.test.js b/test/unit/dialects/abstract/query.test.js index 81c71e9e99c0..e01c326b8014 100644 --- a/test/unit/dialects/abstract/query.test.js +++ b/test/unit/dialects/abstract/query.test.js @@ -1,7 +1,7 @@ 'use strict'; const path = require('path'); -const Query = require(path.resolve('./lib/dialects/abstract/query.js')); +const Query = require('sequelize/lib/dialects/abstract/query.js'); const Support = require(path.join(__dirname, './../../support')); const chai = require('chai'); const { stub, match } = require('sinon'); diff --git a/test/unit/dialects/abstract/quote-identifier.test.js b/test/unit/dialects/abstract/quote-identifier.test.js index 974919df6272..b662776369f8 100644 --- a/test/unit/dialects/abstract/quote-identifier.test.js +++ b/test/unit/dialects/abstract/quote-identifier.test.js @@ -2,7 +2,7 @@ const chai = require('chai'), expect = chai.expect, - QuoteHelper = require('../../../../lib/dialects/abstract/query-generator/helpers/quote'); + QuoteHelper = require('sequelize/lib/dialects/abstract/query-generator/helpers/quote'); describe('QuoteIdentifier', () => { it('unknown dialect', () => { diff --git a/test/unit/dialects/mariadb/query-generator.test.js b/test/unit/dialects/mariadb/query-generator.test.js index b320c10d5d38..4622add40a58 100644 --- a/test/unit/dialects/mariadb/query-generator.test.js +++ b/test/unit/dialects/mariadb/query-generator.test.js @@ -5,9 +5,9 @@ const chai = require('chai'), Support = require('../../support'), dialect = Support.getTestDialect(), _ = require('lodash'), - Op = require('../../../../lib/operators'), - IndexHints = require('../../../../lib/index-hints'), - QueryGenerator = require('../../../../lib/dialects/mariadb/query-generator'); + Op = require('sequelize/lib/operators'), + IndexHints = require('sequelize/lib/index-hints'), + QueryGenerator = require('sequelize/lib/dialects/mariadb/query-generator'); if (dialect === 'mariadb') { describe('[MARIADB Specific] QueryGenerator', () => { diff --git a/test/unit/dialects/mssql/connection-manager.test.js b/test/unit/dialects/mssql/connection-manager.test.js index f9ec050586a9..751928b2a02e 100644 --- a/test/unit/dialects/mssql/connection-manager.test.js +++ b/test/unit/dialects/mssql/connection-manager.test.js @@ -2,7 +2,7 @@ const chai = require('chai'), expect = chai.expect, - Sequelize = require('../../../../index'), + Sequelize = require('sequelize'), Support = require('../../support'), dialect = Support.getTestDialect(), sinon = require('sinon'); diff --git a/test/unit/dialects/mssql/query-generator.test.js b/test/unit/dialects/mssql/query-generator.test.js index 71fb0b11ddf4..4c30fa045f27 100644 --- a/test/unit/dialects/mssql/query-generator.test.js +++ b/test/unit/dialects/mssql/query-generator.test.js @@ -3,10 +3,10 @@ const Support = require('../../support'); const expectsql = Support.expectsql; const current = Support.sequelize; -const DataTypes = require('../../../../lib/data-types'); -const Op = require('../../../../lib/operators'); -const TableHints = require('../../../../lib/table-hints'); -const QueryGenerator = require('../../../../lib/dialects/mssql/query-generator'); +const DataTypes = require('sequelize/lib/data-types'); +const Op = require('sequelize/lib/operators'); +const TableHints = require('sequelize/lib/table-hints'); +const QueryGenerator = require('sequelize/lib/dialects/mssql/query-generator'); if (current.dialect.name === 'mssql') { describe('[MSSQL Specific] QueryGenerator', () => { diff --git a/test/unit/dialects/mssql/query.test.js b/test/unit/dialects/mssql/query.test.js index 5487f5057458..d2e9be0799e4 100644 --- a/test/unit/dialects/mssql/query.test.js +++ b/test/unit/dialects/mssql/query.test.js @@ -1,7 +1,7 @@ 'use strict'; const path = require('path'); -const Query = require(path.resolve('./lib/dialects/mssql/query.js')); +const Query = require('sequelize/lib/dialects/mssql/query.js'); const Support = require('../../support'); const dialect = Support.getTestDialect(); const sequelize = Support.sequelize; diff --git a/test/unit/dialects/mysql/query-generator.test.js b/test/unit/dialects/mysql/query-generator.test.js index fb57dd7e895b..29a1fab1a5ab 100644 --- a/test/unit/dialects/mysql/query-generator.test.js +++ b/test/unit/dialects/mysql/query-generator.test.js @@ -5,9 +5,9 @@ const chai = require('chai'), Support = require('../../support'), dialect = Support.getTestDialect(), _ = require('lodash'), - Op = require('../../../../lib/operators'), - IndexHints = require('../../../../lib/index-hints'), - QueryGenerator = require('../../../../lib/dialects/mysql/query-generator'); + Op = require('sequelize/lib/operators'), + IndexHints = require('sequelize/lib/index-hints'), + QueryGenerator = require('sequelize/lib/dialects/mysql/query-generator'); if (dialect === 'mysql') { describe('[MYSQL Specific] QueryGenerator', () => { diff --git a/test/unit/dialects/mysql/query.test.js b/test/unit/dialects/mysql/query.test.js index 2f0465c55541..c6478c944f0f 100644 --- a/test/unit/dialects/mysql/query.test.js +++ b/test/unit/dialects/mysql/query.test.js @@ -1,7 +1,7 @@ 'use strict'; const path = require('path'); -const Query = require(path.resolve('./lib/dialects/mysql/query.js')); +const Query = require('sequelize/lib/dialects/mysql/query.js'); const Support = require(path.join(__dirname, './../../support')); const chai = require('chai'); const sinon = require('sinon'); diff --git a/test/unit/dialects/postgres/data-types.test.js b/test/unit/dialects/postgres/data-types.test.js index 64660ec5d8c4..715c4810759e 100644 --- a/test/unit/dialects/postgres/data-types.test.js +++ b/test/unit/dialects/postgres/data-types.test.js @@ -4,9 +4,9 @@ const chai = require('chai'), expect = chai.expect, Support = require('../../support'), dialect = Support.getTestDialect(), - BaseTypes = require('../../../../lib/data-types'), - DataTypes = require('../../../../lib/dialects/postgres/data-types')(BaseTypes), - QueryGenerator = require('../../../../lib/dialects/postgres/query-generator'); + BaseTypes = require('sequelize/lib/data-types'), + DataTypes = require('sequelize/lib/dialects/postgres/data-types')(BaseTypes), + QueryGenerator = require('sequelize/lib/dialects/postgres/query-generator'); if (dialect.match(/^postgres/)) { describe('[POSTGRES Specific] DataTypes', () => { diff --git a/test/unit/dialects/postgres/query-generator.test.js b/test/unit/dialects/postgres/query-generator.test.js index e7b085d6db16..5f56e99129e3 100644 --- a/test/unit/dialects/postgres/query-generator.test.js +++ b/test/unit/dialects/postgres/query-generator.test.js @@ -2,11 +2,11 @@ const chai = require('chai'), expect = chai.expect, - Op = require('../../../../lib/operators'), - QueryGenerator = require('../../../../lib/dialects/postgres/query-generator'), + Op = require('sequelize/lib/operators'), + QueryGenerator = require('sequelize/lib/dialects/postgres/query-generator'), Support = require('../../support'), dialect = Support.getTestDialect(), - DataTypes = require('../../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), moment = require('moment'), current = Support.sequelize, _ = require('lodash'); diff --git a/test/unit/dialects/sqlite/query-generator.test.js b/test/unit/dialects/sqlite/query-generator.test.js index 3e5b66797063..3ef8d5305d29 100644 --- a/test/unit/dialects/sqlite/query-generator.test.js +++ b/test/unit/dialects/sqlite/query-generator.test.js @@ -3,12 +3,12 @@ const chai = require('chai'), expect = chai.expect, Support = require('../../support'), - DataTypes = require('../../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), dialect = Support.getTestDialect(), _ = require('lodash'), moment = require('moment'), - Op = require('../../../../lib/operators'), - QueryGenerator = require('../../../../lib/dialects/sqlite/query-generator'); + Op = require('sequelize/lib/operators'), + QueryGenerator = require('sequelize/lib/dialects/sqlite/query-generator'); if (dialect === 'sqlite') { describe('[SQLITE Specific] QueryGenerator', () => { diff --git a/test/unit/errors.test.js b/test/unit/errors.test.js index b8a7c1e12186..76790b3b23ea 100644 --- a/test/unit/errors.test.js +++ b/test/unit/errors.test.js @@ -1,6 +1,6 @@ 'use strict'; -const errors = require('../../lib/errors'); +const errors = require('sequelize/lib/errors'); const expect = require('chai').expect; describe('errors', () => { diff --git a/test/unit/instance-validator.test.js b/test/unit/instance-validator.test.js index 590d3ef7dc10..c45799497e12 100644 --- a/test/unit/instance-validator.test.js +++ b/test/unit/instance-validator.test.js @@ -3,9 +3,9 @@ const chai = require('chai'); const expect = chai.expect; const Support = require('./support'); -const InstanceValidator = require('../../lib/instance-validator'); +const InstanceValidator = require('sequelize/lib/instance-validator'); const sinon = require('sinon'); -const SequelizeValidationError = require('../../lib/errors').ValidationError; +const SequelizeValidationError = require('sequelize/lib/errors').ValidationError; describe(Support.getTestDialectTeaser('InstanceValidator'), () => { beforeEach(function() { diff --git a/test/unit/instance/build.test.js b/test/unit/instance/build.test.js index f2d671c98e77..4359c42f0d98 100644 --- a/test/unit/instance/build.test.js +++ b/test/unit/instance/build.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), current = Support.sequelize; describe(Support.getTestDialectTeaser('Instance'), () => { diff --git a/test/unit/instance/changed.test.js b/test/unit/instance/changed.test.js index a44ae2047093..8d104c0cfe20 100644 --- a/test/unit/instance/changed.test.js +++ b/test/unit/instance/changed.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), current = Support.sequelize; describe(Support.getTestDialectTeaser('Instance'), () => { diff --git a/test/unit/instance/get.test.js b/test/unit/instance/get.test.js index 516c5a0763a5..0f6e94f7aa52 100644 --- a/test/unit/instance/get.test.js +++ b/test/unit/instance/get.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), sinon = require('sinon'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), current = Support.sequelize; describe(Support.getTestDialectTeaser('Instance'), () => { diff --git a/test/unit/instance/is-soft-deleted.test.js b/test/unit/instance/is-soft-deleted.test.js index 6f49a1b63088..152d4a652055 100644 --- a/test/unit/instance/is-soft-deleted.test.js +++ b/test/unit/instance/is-soft-deleted.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), current = Support.sequelize, - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), Sequelize = Support.Sequelize, moment = require('moment'); diff --git a/test/unit/instance/previous.test.js b/test/unit/instance/previous.test.js index 6b468a53414b..aa860db91a96 100644 --- a/test/unit/instance/previous.test.js +++ b/test/unit/instance/previous.test.js @@ -3,7 +3,7 @@ const chai = require('chai'); const expect = chai.expect; const Support = require('../support'); -const DataTypes = require('../../../lib/data-types'); +const DataTypes = require('sequelize/lib/data-types'); const current = Support.sequelize; describe(Support.getTestDialectTeaser('Instance'), () => { diff --git a/test/unit/instance/set.test.js b/test/unit/instance/set.test.js index dc2ef6056ee7..21026547a85a 100644 --- a/test/unit/instance/set.test.js +++ b/test/unit/instance/set.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), current = Support.sequelize, sinon = require('sinon'); diff --git a/test/unit/instance/to-json.test.js b/test/unit/instance/to-json.test.js index ef84e93388ff..efecb4709411 100644 --- a/test/unit/instance/to-json.test.js +++ b/test/unit/instance/to-json.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), current = Support.sequelize; describe(Support.getTestDialectTeaser('Instance'), () => { diff --git a/test/unit/logger.test.ts b/test/unit/logger.test.ts new file mode 100644 index 000000000000..3332ebd54c34 --- /dev/null +++ b/test/unit/logger.test.ts @@ -0,0 +1,70 @@ +/* eslint-env mocha */ + +import sinon from 'sinon'; +import { expect } from 'chai'; +import { Logger, logger as defaultLogger } from 'sequelize/lib/utils/logger'; +import { inspect as nodeInspect } from 'util'; + +describe('logger', () => { + let oldWarn: typeof console.warn; + let fakeWarn: sinon.SinonSpy; + + beforeEach(() => { + oldWarn = console.warn; + fakeWarn = sinon.fake(); + console.warn = fakeWarn; + }); + + afterEach(() => { + console.warn = oldWarn; + }); + + it('creates a default logger in the sequelize context', () => { + defaultLogger.warn('abc'); + + expect(fakeWarn.calledOnceWithExactly('(sequelize) Warning: abc')).to.equal( + true + ); + }); + + it("defaults the context of new loggers to 'sequelize'", () => { + const logger = new Logger(); + + logger.warn('oh no'); + expect( + fakeWarn.calledOnceWithExactly('(sequelize) Warning: oh no') + ).to.equal(true); + }); + + it('respects specified context in new loggers', () => { + const logger = new Logger({ context: 'query-generator' }); + + logger.warn('This feature is not supported for this dialect.'); + + expect( + fakeWarn.calledOnceWithExactly( + '(query-generator) Warning: This feature is not supported for this dialect.' + ) + ).to.equal(true); + }); + + it('inspects a value', () => { + const obj = { + a: 1, + b: 2, + c() { + /* no-op */ + } + }; + + expect(defaultLogger.inspect(obj)).to.equal( + nodeInspect(obj, { showHidden: false, depth: 3 }) + ); + }); + + it('creates a debugger in the correct namespace', () => { + const contextDebugger = defaultLogger.debugContext('query-generator'); + + expect(contextDebugger.namespace).to.equal('sequelize:query-generator'); + }); +}); diff --git a/test/unit/model/bulkcreate.test.js b/test/unit/model/bulkcreate.test.js index 81a8bb403b12..e7cfa83b0370 100644 --- a/test/unit/model/bulkcreate.test.js +++ b/test/unit/model/bulkcreate.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), expect = chai.expect, sinon = require('sinon'), Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), current = Support.sequelize; describe(Support.getTestDialectTeaser('Model'), () => { diff --git a/test/unit/model/count.test.js b/test/unit/model/count.test.js index 08838b351057..e6d5e4cff306 100644 --- a/test/unit/model/count.test.js +++ b/test/unit/model/count.test.js @@ -6,7 +6,7 @@ const chai = require('chai'), Sequelize = Support.Sequelize, current = Support.sequelize, sinon = require('sinon'), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Model'), () => { describe('method count', () => { diff --git a/test/unit/model/define.test.js b/test/unit/model/define.test.js index 7f387649d7e6..6ee8358cdb5c 100644 --- a/test/unit/model/define.test.js +++ b/test/unit/model/define.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), sinon = require('sinon'), current = Support.sequelize, dialect = Support.getTestDialect(); diff --git a/test/unit/model/destroy.test.js b/test/unit/model/destroy.test.js index 8cd1233ffbc8..268f8f9b4314 100644 --- a/test/unit/model/destroy.test.js +++ b/test/unit/model/destroy.test.js @@ -5,7 +5,7 @@ const chai = require('chai'), Support = require('../support'), current = Support.sequelize, sinon = require('sinon'), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Model'), () => { diff --git a/test/unit/model/find-and-count-all.test.js b/test/unit/model/find-and-count-all.test.js index 0cf1b2e8c17e..6f2319949d55 100644 --- a/test/unit/model/find-and-count-all.test.js +++ b/test/unit/model/find-and-count-all.test.js @@ -5,7 +5,7 @@ const chai = require('chai'), Support = require('../support'), current = Support.sequelize, sinon = require('sinon'), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Model'), () => { describe('findAndCountAll', () => { diff --git a/test/unit/model/find-create-find.test.js b/test/unit/model/find-create-find.test.js index 521dfa2116be..7612b7362380 100644 --- a/test/unit/model/find-create-find.test.js +++ b/test/unit/model/find-create-find.test.js @@ -2,7 +2,7 @@ const chai = require('chai'), expect = chai.expect, - { EmptyResultError, UniqueConstraintError } = require('../../../lib/errors'), + { EmptyResultError, UniqueConstraintError } = require('sequelize/lib/errors'), Support = require('../support'), current = Support.sequelize, sinon = require('sinon'); diff --git a/test/unit/model/findall.test.js b/test/unit/model/findall.test.js index ed01ea620e04..f07ecd19968c 100644 --- a/test/unit/model/findall.test.js +++ b/test/unit/model/findall.test.js @@ -5,9 +5,9 @@ const expect = chai.expect; const Support = require('../support'); const current = Support.sequelize; const sinon = require('sinon'); -const DataTypes = require('../../../lib/data-types'); -const { Logger } = require('../../../lib/utils/logger'); -const sequelizeErrors = require('../../../lib/errors'); +const DataTypes = require('sequelize/lib/data-types'); +const { Logger } = require('sequelize/lib/utils/logger'); +const sequelizeErrors = require('sequelize/lib/errors'); describe(Support.getTestDialectTeaser('Model'), () => { describe('warnOnInvalidOptions', () => { diff --git a/test/unit/model/findone.test.js b/test/unit/model/findone.test.js index 93ebe7d21080..a4ce8358cb94 100644 --- a/test/unit/model/findone.test.js +++ b/test/unit/model/findone.test.js @@ -7,7 +7,7 @@ const chai = require('chai'), Op = Sequelize.Op, current = Support.sequelize, sinon = require('sinon'), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Model'), () => { describe('method findOne', () => { diff --git a/test/unit/model/include.test.js b/test/unit/model/include.test.js index 6fc39725f795..01caf0198ffb 100644 --- a/test/unit/model/include.test.js +++ b/test/unit/model/include.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), current = Support.sequelize; describe(Support.getTestDialectTeaser('Model'), () => { diff --git a/test/unit/model/indexes.test.js b/test/unit/model/indexes.test.js index 76d0c1cec2f4..d361ff5f9735 100644 --- a/test/unit/model/indexes.test.js +++ b/test/unit/model/indexes.test.js @@ -4,7 +4,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), current = Support.sequelize, - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Model'), () => { describe('indexes', () => { diff --git a/test/unit/model/overwriting-builtins.test.js b/test/unit/model/overwriting-builtins.test.js index c547bb9b09a9..e871a5b88574 100644 --- a/test/unit/model/overwriting-builtins.test.js +++ b/test/unit/model/overwriting-builtins.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), expect = chai.expect, Support = require('../../support'), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Model'), () => { diff --git a/test/unit/model/removeAttribute.test.js b/test/unit/model/removeAttribute.test.js index 918f834ccd6f..2d0d0286bb75 100644 --- a/test/unit/model/removeAttribute.test.js +++ b/test/unit/model/removeAttribute.test.js @@ -5,7 +5,7 @@ const chai = require('chai'), Support = require('../support'), current = Support.sequelize, _ = require('lodash'), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Model'), () => { describe('removeAttribute', () => { diff --git a/test/unit/model/scope.test.js b/test/unit/model/scope.test.js index c479cc19de7e..5af39e2e4ebc 100644 --- a/test/unit/model/scope.test.js +++ b/test/unit/model/scope.test.js @@ -2,10 +2,10 @@ const chai = require('chai'), expect = chai.expect, - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), Op = Sequelize.Op, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), current = Support.sequelize; describe(Support.getTestDialectTeaser('Model'), () => { diff --git a/test/unit/model/underscored.test.js b/test/unit/model/underscored.test.js index f9c53dcac9fd..3e7963466d33 100644 --- a/test/unit/model/underscored.test.js +++ b/test/unit/model/underscored.test.js @@ -3,8 +3,8 @@ const chai = require('chai'), expect = chai.expect, Support = require('../support'), - DataTypes = require('../../../lib/data-types'), - Sequelize = require('../../../index'); + DataTypes = require('sequelize/lib/data-types'), + Sequelize = require('sequelize'); describe(Support.getTestDialectTeaser('Model'), () => { describe('options.underscored', () => { diff --git a/test/unit/model/update.test.js b/test/unit/model/update.test.js index 042b53faaa7e..f11c554cf057 100644 --- a/test/unit/model/update.test.js +++ b/test/unit/model/update.test.js @@ -5,7 +5,7 @@ const chai = require('chai'), Support = require('../support'), current = Support.sequelize, sinon = require('sinon'), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Model'), () => { describe('method update', () => { diff --git a/test/unit/model/upsert.test.js b/test/unit/model/upsert.test.js index 85e42bbd8784..3cf91bb2d4d8 100644 --- a/test/unit/model/upsert.test.js +++ b/test/unit/model/upsert.test.js @@ -2,11 +2,11 @@ const chai = require('chai'), expect = chai.expect, - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), Support = require('../support'), current = Support.sequelize, sinon = require('sinon'), - DataTypes = require('../../../lib/data-types'); + DataTypes = require('sequelize/lib/data-types'); describe(Support.getTestDialectTeaser('Model'), () => { if (current.dialect.supports.upserts) { diff --git a/test/unit/model/validation.test.js b/test/unit/model/validation.test.js index 56942e7f281e..69ced482b18d 100644 --- a/test/unit/model/validation.test.js +++ b/test/unit/model/validation.test.js @@ -3,7 +3,7 @@ const chai = require('chai'), sinon = require('sinon'), expect = chai.expect, - Sequelize = require('../../../index'), + Sequelize = require('sequelize'), Op = Sequelize.Op, Support = require('../support'), current = Support.sequelize; diff --git a/test/unit/sql/add-column.test.js b/test/unit/sql/add-column.test.js index b4179ed427d4..a13f4d7f077d 100644 --- a/test/unit/sql/add-column.test.js +++ b/test/unit/sql/add-column.test.js @@ -1,7 +1,7 @@ 'use strict'; const Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), expectsql = Support.expectsql, current = Support.sequelize, sql = current.dialect.queryGenerator; diff --git a/test/unit/sql/change-column.test.js b/test/unit/sql/change-column.test.js index 00e2f568cf93..bc67524811fa 100644 --- a/test/unit/sql/change-column.test.js +++ b/test/unit/sql/change-column.test.js @@ -2,7 +2,7 @@ const sinon = require('sinon'), Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), expectsql = Support.expectsql, current = Support.sequelize; diff --git a/test/unit/sql/create-table.test.js b/test/unit/sql/create-table.test.js index 53fa2623482a..2a896b465b6a 100644 --- a/test/unit/sql/create-table.test.js +++ b/test/unit/sql/create-table.test.js @@ -1,7 +1,7 @@ 'use strict'; const Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), expectsql = Support.expectsql, current = Support.sequelize, sql = current.dialect.queryGenerator, diff --git a/test/unit/sql/data-types.test.js b/test/unit/sql/data-types.test.js index 5737ef30e962..6c2f2a73a644 100644 --- a/test/unit/sql/data-types.test.js +++ b/test/unit/sql/data-types.test.js @@ -1,7 +1,7 @@ 'use strict'; const Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), Sequelize = Support.Sequelize, chai = require('chai'), util = require('util'), diff --git a/test/unit/sql/delete.test.js b/test/unit/sql/delete.test.js index 7c671eda050e..9e3e47230f8f 100644 --- a/test/unit/sql/delete.test.js +++ b/test/unit/sql/delete.test.js @@ -1,7 +1,7 @@ 'use strict'; const Support = require('../support'), - QueryTypes = require('../../../lib/query-types'), + QueryTypes = require('sequelize/lib/query-types'), util = require('util'), _ = require('lodash'), expectsql = Support.expectsql, diff --git a/test/unit/sql/enum.test.js b/test/unit/sql/enum.test.js index d9edb6fa4587..a6e13a23d32f 100644 --- a/test/unit/sql/enum.test.js +++ b/test/unit/sql/enum.test.js @@ -1,7 +1,7 @@ 'use strict'; const Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), expectsql = Support.expectsql, current = Support.sequelize, sql = current.dialect.queryGenerator, diff --git a/test/unit/sql/generateJoin.test.js b/test/unit/sql/generateJoin.test.js index ba29f63a5924..5283d048ba14 100644 --- a/test/unit/sql/generateJoin.test.js +++ b/test/unit/sql/generateJoin.test.js @@ -1,8 +1,8 @@ 'use strict'; const Support = require('../support'), - DataTypes = require('../../../lib/data-types'), - Sequelize = require('../../../lib/sequelize'), + DataTypes = require('sequelize/lib/data-types'), + Sequelize = require('sequelize/lib/sequelize'), util = require('util'), _ = require('lodash'), expectsql = Support.expectsql, diff --git a/test/unit/sql/group.test.js b/test/unit/sql/group.test.js index 4059c6477350..76320220d2f0 100644 --- a/test/unit/sql/group.test.js +++ b/test/unit/sql/group.test.js @@ -1,7 +1,7 @@ 'use strict'; const Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), util = require('util'), expectsql = Support.expectsql, current = Support.sequelize, diff --git a/test/unit/sql/insert.test.js b/test/unit/sql/insert.test.js index c9ba66b98e9e..13c269f21161 100644 --- a/test/unit/sql/insert.test.js +++ b/test/unit/sql/insert.test.js @@ -1,7 +1,7 @@ 'use strict'; const Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), expectsql = Support.expectsql, current = Support.sequelize, sql = current.dialect.queryGenerator; diff --git a/test/unit/sql/json.test.js b/test/unit/sql/json.test.js index ac092134f1b7..1e874a411ad0 100644 --- a/test/unit/sql/json.test.js +++ b/test/unit/sql/json.test.js @@ -1,7 +1,7 @@ 'use strict'; const Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), expect = require('chai').expect, expectsql = Support.expectsql, Sequelize = Support.Sequelize, diff --git a/test/unit/sql/order.test.js b/test/unit/sql/order.test.js index 355c5e599b5c..fc79a7ec6ee9 100644 --- a/test/unit/sql/order.test.js +++ b/test/unit/sql/order.test.js @@ -4,8 +4,8 @@ const util = require('util'); const chai = require('chai'); const expect = chai.expect; const Support = require('../support'); -const DataTypes = require('../../../lib/data-types'); -const Model = require('../../../lib/model'); +const DataTypes = require('sequelize/lib/data-types'); +const Model = require('sequelize/lib/model'); const expectsql = Support.expectsql; const current = Support.sequelize; const sql = current.dialect.queryGenerator; diff --git a/test/unit/sql/select.test.js b/test/unit/sql/select.test.js index 6aa33a5d8efe..107bb79596c4 100644 --- a/test/unit/sql/select.test.js +++ b/test/unit/sql/select.test.js @@ -1,8 +1,8 @@ 'use strict'; const Support = require('../support'), - DataTypes = require('../../../lib/data-types'), - Model = require('../../../lib/model'), + DataTypes = require('sequelize/lib/data-types'), + Model = require('sequelize/lib/model'), util = require('util'), chai = require('chai'), expect = chai.expect, diff --git a/test/unit/sql/update.test.js b/test/unit/sql/update.test.js index 71f99050b380..28a9050f1bd7 100644 --- a/test/unit/sql/update.test.js +++ b/test/unit/sql/update.test.js @@ -1,7 +1,7 @@ 'use strict'; const Support = require('../support'), - DataTypes = require('../../../lib/data-types'), + DataTypes = require('sequelize/lib/data-types'), expectsql = Support.expectsql, current = Support.sequelize, sql = current.dialect.queryGenerator; diff --git a/test/unit/sql/where.test.js b/test/unit/sql/where.test.js index 7739395f2d8e..71b27b456d34 100644 --- a/test/unit/sql/where.test.js +++ b/test/unit/sql/where.test.js @@ -1,8 +1,8 @@ 'use strict'; const Support = require('../support'), - DataTypes = require('../../../lib/data-types'), - QueryTypes = require('../../../lib/query-types'), + DataTypes = require('sequelize/lib/data-types'), + QueryTypes = require('sequelize/lib/query-types'), util = require('util'), _ = require('lodash'), expectsql = Support.expectsql, @@ -1263,11 +1263,11 @@ describe(Support.getTestDialectTeaser('SQL'), () => { current.where(current.fn('lower', current.col('name')), null)], { default: '(SUM([hours]) > 0 AND lower([name]) IS NULL)' }); - + testsql(current.where(current.col('hours'), Op.between, [0, 5]), { default: '[hours] BETWEEN 0 AND 5' }); - + testsql(current.where(current.col('hours'), Op.notBetween, [0, 5]), { default: '[hours] NOT BETWEEN 0 AND 5' }); diff --git a/test/unit/utils.test.js b/test/unit/utils.test.js index 3258834234c7..5f921deab56b 100644 --- a/test/unit/utils.test.js +++ b/test/unit/utils.test.js @@ -3,9 +3,9 @@ const chai = require('chai'); const expect = chai.expect; const Support = require('./support'); -const DataTypes = require('../../lib/data-types'); -const Utils = require('../../lib/utils'); -const { logger } = require('../../lib/utils/logger'); +const DataTypes = require('sequelize/lib/data-types'); +const Utils = require('sequelize/lib/utils'); +const { logger } = require('sequelize/lib/utils/logger'); const Op = Support.Sequelize.Op; describe(Support.getTestDialectTeaser('Utils'), () => { @@ -258,23 +258,4 @@ describe(Support.getTestDialectTeaser('Utils'), () => { }); }); }); - - describe('Logger', () => { - it('debug', () => { - expect(logger.debugContext).to.be.a('function'); - logger.debugContext('test debug'); - }); - - it('warn', () => { - expect(logger.warn).to.be.a('function'); - logger.warn('test warning'); - }); - - it('debugContext', () => { - expect(logger.debugContext).to.be.a('function'); - const testLogger = logger.debugContext('test'); - - expect(testLogger).to.be.a('function'); - }); - }); }); diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 000000000000..6bfd52628733 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,22 @@ +{ + "compilerOptions": { + "target": "esnext", + "module": "commonjs", + "moduleResolution": "node", + "allowJs": true, + "declaration": true, + "emitDeclarationOnly": true, + "sourceRoot": "", + "outDir": "./dist/", + "strict": true, + "baseUrl": "./", + "rootDir": "./", + "types": ["node"], + "allowSyntheticDefaultImports": true, + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "checkJs": false, + "removeComments": false + }, + "include": ["./lib/**/*.ts"] +} diff --git a/types/lib/utils/logger.d.ts b/types/lib/utils/logger.d.ts deleted file mode 100644 index 2ad866819fa6..000000000000 --- a/types/lib/utils/logger.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -export interface LoggerConfig { - /** - * @default `sequelize` - */ - context?: string; - /** - * @default `true` - */ - debug?: boolean; -} - -export class Logger { - constructor(config: LoggerConfig) - public debug(message: string): void; - public warn(message: string): void; -} - -export const logger: Logger; diff --git a/types/test/e2e/docs-example.ts b/types/test/e2e/docs-example.ts index 0840e5a6a0f7..a57936976467 100644 --- a/types/test/e2e/docs-example.ts +++ b/types/test/e2e/docs-example.ts @@ -8,8 +8,8 @@ import { HasManyCreateAssociationMixin, HasManyGetAssociationsMixin, HasManyHasAssociationMixin -} from '../../lib/associations'; -import QueryTypes = require("../../lib/query-types"); +} from 'sequelize/lib/associations'; +import QueryTypes = require("sequelize/lib/query-types"); class User extends Model { public id!: number; // Note that the `null assertion` `!` is required in strict mode. diff --git a/types/test/errors.ts b/types/test/errors.ts index 0a938a37f264..253a379b4d59 100644 --- a/types/test/errors.ts +++ b/types/test/errors.ts @@ -1,6 +1,6 @@ import { expectTypeOf } from "expect-type"; import { BaseError, EmptyResultError, Error as AliasedBaseError, UniqueConstraintError } from 'sequelize'; -import { OptimisticLockError } from '../lib/errors'; +import { OptimisticLockError } from 'sequelize/lib/errors'; expectTypeOf().toEqualTypeOf(); expectTypeOf().toHaveProperty('sql').toBeString(); diff --git a/types/test/hooks.ts b/types/test/hooks.ts index 8bc11bde189a..474c149b599c 100644 --- a/types/test/hooks.ts +++ b/types/test/hooks.ts @@ -1,9 +1,9 @@ import { expectTypeOf } from "expect-type"; import { FindOptions, Model, QueryOptions, SaveOptions, Sequelize, UpsertOptions } from "sequelize"; -import { ModelHooks } from "../lib/hooks"; -import { AbstractQuery } from "../lib/query"; -import { Config } from '../lib/sequelize'; -import { DeepWriteable } from '../lib/utils'; +import { ModelHooks } from "sequelize/lib/hooks"; +import { AbstractQuery } from "sequelize/lib/query"; +import { Config } from 'sequelize/lib/sequelize'; +import { DeepWriteable } from 'sequelize/lib/utils'; import { SemiDeepWritable } from "./type-helpers/deep-writable"; { diff --git a/types/test/model.ts b/types/test/model.ts index 0eb206404244..a1bc9ea67c92 100644 --- a/types/test/model.ts +++ b/types/test/model.ts @@ -1,6 +1,6 @@ import { expectTypeOf } from "expect-type"; import { Association, BelongsToManyGetAssociationsMixin, DataTypes, HasOne, Model, Optional, Sequelize } from 'sequelize'; -import { ModelDefined } from '../lib/model'; +import { ModelDefined } from 'sequelize/lib/model'; expectTypeOf().toMatchTypeOf(); class MyModel extends Model { diff --git a/types/test/sequelize.ts b/types/test/sequelize.ts index 2b5af1c5dfb4..150b61449e67 100644 --- a/types/test/sequelize.ts +++ b/types/test/sequelize.ts @@ -1,5 +1,5 @@ import { Config, Sequelize, Model, QueryTypes, ModelCtor } from 'sequelize'; -import { Fn } from '../lib/utils'; +import { Fn } from 'sequelize/lib/utils'; Sequelize.useCLS({ }); diff --git a/types/test/tsconfig.json b/types/test/tsconfig.json index 843200282732..0d4f95ea960f 100644 --- a/types/test/tsconfig.json +++ b/types/test/tsconfig.json @@ -6,8 +6,8 @@ "strict": true, "baseUrl": ".", "paths": { - "sequelize": ["../"], - "sequelize/*": ["../"] + "sequelize": ["../../dist/"], + "sequelize/*": ["../../dist/*"] }, "lib": ["es2016"] }, diff --git a/types/test/where.ts b/types/test/where.ts index 037acbbe0b0b..cd178333f205 100644 --- a/types/test/where.ts +++ b/types/test/where.ts @@ -1,6 +1,6 @@ import { expectTypeOf } from "expect-type"; import { AndOperator, fn, Model, Op, OrOperator, Sequelize, WhereOperators, WhereOptions, literal, where as whereFn } from 'sequelize'; -import Transaction from '../lib/transaction'; +import Transaction from 'sequelize/lib/transaction'; class MyModel extends Model { public hi!: number; diff --git a/yarn.lock b/yarn.lock index 9ae66cb7e924..f5214447ba4c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -397,7 +397,7 @@ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210" integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw== -"@isaacs/string-locale-compare@*", "@isaacs/string-locale-compare@^1.0.1": +"@isaacs/string-locale-compare@^1.0.1", "@isaacs/string-locale-compare@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b" integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ== @@ -444,21 +444,21 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@npmcli/arborist@*", "@npmcli/arborist@^4.0.0": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-4.0.4.tgz#a532a7cc430ccbd87c0595a8828f9614f29d2dac" - integrity sha512-5hRkiHF9zu62z6a7CJqhVG5CFUVnbYqvrrcxxEmhxFgyH2ovICyULOrj7nF4VBlfzp7OPu/rveV2ts9iYrn74g== +"@npmcli/arborist@^2.3.0", "@npmcli/arborist@^2.5.0", "@npmcli/arborist@^2.9.0": + version "2.10.0" + resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-2.10.0.tgz#424c2d73a7ae59c960b0cc7f74fed043e4316c2c" + integrity sha512-CLnD+zXG9oijEEzViimz8fbOoFVb7hoypiaf7p6giJhvYtrxLAyY3cZAMPIFQvsG731+02eMDp3LqVBNo7BaZA== dependencies: "@isaacs/string-locale-compare" "^1.0.1" "@npmcli/installed-package-contents" "^1.0.7" - "@npmcli/map-workspaces" "^2.0.0" - "@npmcli/metavuln-calculator" "^2.0.0" + "@npmcli/map-workspaces" "^1.0.2" + "@npmcli/metavuln-calculator" "^1.1.0" "@npmcli/move-file" "^1.1.0" "@npmcli/name-from-folder" "^1.0.1" "@npmcli/node-gyp" "^1.0.1" "@npmcli/package-json" "^1.0.1" - "@npmcli/run-script" "^2.0.0" - bin-links "^2.3.0" + "@npmcli/run-script" "^1.8.2" + bin-links "^2.2.1" cacache "^15.0.3" common-ancestor-path "^1.0.1" json-parse-even-better-errors "^2.3.1" @@ -469,7 +469,7 @@ npm-package-arg "^8.1.5" npm-pick-manifest "^6.1.0" npm-registry-fetch "^11.0.0" - pacote "^12.0.0" + pacote "^11.3.5" parse-conflict-json "^1.1.1" proc-log "^1.0.0" promise-all-reject-late "^1.0.0" @@ -482,12 +482,12 @@ treeverse "^1.0.4" walk-up-path "^1.0.0" -"@npmcli/ci-detect@*", "@npmcli/ci-detect@^1.3.0": +"@npmcli/ci-detect@^1.2.0", "@npmcli/ci-detect@^1.3.0": version "1.4.0" resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-1.4.0.tgz#18478bbaa900c37bfbd8a2006a6262c62e8b0fe1" integrity sha512-3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q== -"@npmcli/config@*": +"@npmcli/config@^2.3.0": version "2.3.1" resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-2.3.1.tgz#41d80ce272831461b5cb158afa110525d4be0fed" integrity sha512-F/8R/Zqun8682TgaCILUNoaVfd1LVaYZ/jcVt9KWzfKpzcPus1zEApAl54PqVqVJbNq6f01QTDQHD6L/n56BXw== @@ -535,24 +535,23 @@ npm-bundled "^1.1.1" npm-normalize-package-bin "^1.0.1" -"@npmcli/map-workspaces@*", "@npmcli/map-workspaces@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-2.0.0.tgz#e342efbbdd0dad1bba5d7723b674ca668bf8ac5a" - integrity sha512-QBJfpCY1NOAkkW3lFfru9VTdqvMB2TN0/vrevl5xBCv5Fi0XDVcA6rqqSau4Ysi4Iw3fBzyXV7hzyTBDfadf7g== +"@npmcli/map-workspaces@^1.0.2", "@npmcli/map-workspaces@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-1.0.4.tgz#915708b55afa25e20bc2c14a766c124c2c5d4cab" + integrity sha512-wVR8QxhyXsFcD/cORtJwGQodeeaDf0OxcHie8ema4VgFeqwYkFsDPnSrIRSytX8xR6nKPAH89WnwTcaU608b/Q== dependencies: "@npmcli/name-from-folder" "^1.0.1" glob "^7.1.6" minimatch "^3.0.4" read-package-json-fast "^2.0.1" -"@npmcli/metavuln-calculator@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-2.0.0.tgz#70937b8b5a5cad5c588c8a7b38c4a8bd6f62c84c" - integrity sha512-VVW+JhWCKRwCTE+0xvD6p3uV4WpqocNYYtzyvenqL/u1Q3Xx6fGTJ+6UoIoii07fbuEO9U3IIyuGY0CYHDv1sg== +"@npmcli/metavuln-calculator@^1.1.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-1.1.1.tgz#2f95ff3c6d88b366dd70de1c3f304267c631b458" + integrity sha512-9xe+ZZ1iGVaUovBVFI9h3qW+UuECUzhvZPxK9RaEA2mjU26o5D0JloGYWwLYvQELJNmBdQB6rrpuN8jni6LwzQ== dependencies: cacache "^15.0.5" - json-parse-even-better-errors "^2.3.1" - pacote "^12.0.0" + pacote "^11.1.11" semver "^7.3.2" "@npmcli/move-file@^1.0.1", "@npmcli/move-file@^1.1.0": @@ -573,7 +572,7 @@ resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz#a912e637418ffc5f2db375e93b85837691a43a33" integrity sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA== -"@npmcli/package-json@*", "@npmcli/package-json@^1.0.1": +"@npmcli/package-json@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-1.0.1.tgz#1ed42f00febe5293c3502fd0ef785647355f6e89" integrity sha512-y6jnu76E9C23osz8gEMBayZmaZ69vFOIk8vR1FJL/wbEJ54+9aVG9rLTjQKSXfgYZEr50nw1txBBFfBZZe+bYg== @@ -587,17 +586,7 @@ dependencies: infer-owner "^1.0.4" -"@npmcli/run-script@*", "@npmcli/run-script@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-2.0.0.tgz#9949c0cab415b17aaac279646db4f027d6f1e743" - integrity sha512-fSan/Pu11xS/TdaTpTB0MRn9guwGU8dye+x56mEVgBEd/QsybBbYcAL0phPXi8SGWFEChkQd6M9qL4y6VOpFig== - dependencies: - "@npmcli/node-gyp" "^1.0.2" - "@npmcli/promise-spawn" "^1.3.2" - node-gyp "^8.2.0" - read-package-json-fast "^2.0.1" - -"@npmcli/run-script@^1.8.2": +"@npmcli/run-script@^1.8.2", "@npmcli/run-script@^1.8.3", "@npmcli/run-script@^1.8.4", "@npmcli/run-script@^1.8.6": version "1.8.6" resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.6.tgz#18314802a6660b0d4baa4c3afe7f1ad39d8c28b7" integrity sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g== @@ -797,6 +786,13 @@ dependencies: "@sinonjs/commons" "^1.7.0" +"@sinonjs/fake-timers@^7.1.0": + version "7.1.2" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz#2524eae70c4910edccf99b2f4e6efc5894aff7b5" + integrity sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg== + dependencies: + "@sinonjs/commons" "^1.7.0" + "@sinonjs/samsam@^5.3.1": version "5.3.1" resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.1.tgz#375a45fe6ed4e92fca2fb920e007c48232a6507f" @@ -816,16 +812,43 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== +"@types/chai@^4.2.22": + version "4.2.22" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.22.tgz#47020d7e4cf19194d43b5202f35f75bd2ad35ce7" + integrity sha512-tFfcE+DSTzWAgifkjik9AySNqIyNoYwmR+uecPwwD/XRNfvOjmC/FjCxpiUGDkDVDphPfCUecSQVFw+lN3M3kQ== + +"@types/debug@^4.1.7": + version "4.1.7" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" + integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg== + dependencies: + "@types/ms" "*" + "@types/geojson@^7946.0.7": version "7946.0.8" resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca" integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA== +"@types/json-schema@^7.0.9": + version "7.0.9" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== + "@types/minimist@^1.2.0": version "1.2.2" resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== +"@types/mocha@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.0.0.tgz#3205bcd15ada9bc681ac20bef64e9e6df88fd297" + integrity sha512-scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA== + +"@types/ms@*": + version "0.7.31" + resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" + integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== + "@types/node@*": version "16.11.6" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" @@ -861,11 +884,88 @@ resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g== +"@types/sinon@^10.0.6": + version "10.0.6" + resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-10.0.6.tgz#bc3faff5154e6ecb69b797d311b7cf0c1b523a1d" + integrity sha512-6EF+wzMWvBNeGrfP3Nx60hhx+FfwSg1JJBLAAP/IdIUq0EYkqCYf70VT3PhuhPX9eLD+Dp+lNdpb/ZeHG8Yezg== + dependencies: + "@sinonjs/fake-timers" "^7.1.0" + "@types/validator@^13.1.4": version "13.6.6" resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.6.6.tgz#6e6e2d086148db5ae14851614971b715670cbd52" integrity sha512-+qogUELb4gMhrMjSh/seKmGVvN+uQLfyqJAqYRWqVHsvBsUO2xDBCL8CJ/ZSukbd8vXaoYbpIssAmfLEzzBHEw== +"@typescript-eslint/eslint-plugin@^5.3.0": + version "5.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.3.0.tgz#a55ae72d28ffeb6badd817fe4566c9cced1f5e29" + integrity sha512-ARUEJHJrq85aaiCqez7SANeahDsJTD3AEua34EoQN9pHS6S5Bq9emcIaGGySt/4X2zSi+vF5hAH52sEen7IO7g== + dependencies: + "@typescript-eslint/experimental-utils" "5.3.0" + "@typescript-eslint/scope-manager" "5.3.0" + debug "^4.3.2" + functional-red-black-tree "^1.0.1" + ignore "^5.1.8" + regexpp "^3.2.0" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/experimental-utils@5.3.0": + version "5.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.3.0.tgz#ee56b4957547ed2b0fc7451205e41502e664f546" + integrity sha512-NFVxYTjKj69qB0FM+piah1x3G/63WB8vCBMnlnEHUsiLzXSTWb9FmFn36FD9Zb4APKBLY3xRArOGSMQkuzTF1w== + dependencies: + "@types/json-schema" "^7.0.9" + "@typescript-eslint/scope-manager" "5.3.0" + "@typescript-eslint/types" "5.3.0" + "@typescript-eslint/typescript-estree" "5.3.0" + eslint-scope "^5.1.1" + eslint-utils "^3.0.0" + +"@typescript-eslint/parser@^5.3.0": + version "5.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.3.0.tgz#7879f15e26d370ed3f653fb7dd06479531ed3ab9" + integrity sha512-rKu/yAReip7ovx8UwOAszJVO5MgBquo8WjIQcp1gx4pYQCwYzag+I5nVNHO4MqyMkAo0gWt2gWUi+36gWAVKcw== + dependencies: + "@typescript-eslint/scope-manager" "5.3.0" + "@typescript-eslint/types" "5.3.0" + "@typescript-eslint/typescript-estree" "5.3.0" + debug "^4.3.2" + +"@typescript-eslint/scope-manager@5.3.0": + version "5.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.3.0.tgz#97d0ccc7c9158e89e202d5e24ce6ba49052d432e" + integrity sha512-22Uic9oRlTsPppy5Tcwfj+QET5RWEnZ5414Prby465XxQrQFZ6nnm5KnXgnsAJefG4hEgMnaxTB3kNEyjdjj6A== + dependencies: + "@typescript-eslint/types" "5.3.0" + "@typescript-eslint/visitor-keys" "5.3.0" + +"@typescript-eslint/types@5.3.0": + version "5.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.3.0.tgz#af29fd53867c2df0028c57c36a655bd7e9e05416" + integrity sha512-fce5pG41/w8O6ahQEhXmMV+xuh4+GayzqEogN24EK+vECA3I6pUwKuLi5QbXO721EMitpQne5VKXofPonYlAQg== + +"@typescript-eslint/typescript-estree@5.3.0": + version "5.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.3.0.tgz#4f68ddd46dc2983182402d2ab21fb44ad94988cf" + integrity sha512-FJ0nqcaUOpn/6Z4Jwbtf+o0valjBLkqc3MWkMvrhA2TvzFXtcclIM8F4MBEmYa2kgcI8EZeSAzwoSrIC8JYkug== + dependencies: + "@typescript-eslint/types" "5.3.0" + "@typescript-eslint/visitor-keys" "5.3.0" + debug "^4.3.2" + globby "^11.0.4" + is-glob "^4.0.3" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/visitor-keys@5.3.0": + version "5.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.3.0.tgz#a6258790f3b7b2547f70ed8d4a1e0c3499994523" + integrity sha512-oVIAfIQuq0x2TFDNLVavUn548WL+7hdhxYn+9j3YdJJXB7mH9dAmZNJsPDa7Jc+B9WGqoiex7GUDbyMxV0a/aw== + dependencies: + "@typescript-eslint/types" "5.3.0" + eslint-visitor-keys "^3.0.0" + JSONStream@^1.0.4: version "1.3.5" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" @@ -879,7 +979,7 @@ abab@^1.0.0: resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e" integrity sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4= -abbrev@*, abbrev@1: +abbrev@1, abbrev@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== @@ -1016,12 +1116,12 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0, ansi-styles@^4.3.0: dependencies: color-convert "^2.0.1" -ansicolors@*, ansicolors@~0.3.2: +ansicolors@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979" integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk= -ansistyles@*: +ansistyles@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539" integrity sha1-XeYEFb2gcbs3EnhUyGT0GyMlRTk= @@ -1063,7 +1163,7 @@ aproba@^1.0.3: resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== -archy@*, archy@^1.0.0: +archy@^1.0.0, archy@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA= @@ -1291,7 +1391,7 @@ before-after-hook@^2.2.0: resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e" integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ== -bin-links@^2.3.0: +bin-links@^2.2.1: version "2.3.0" resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-2.3.0.tgz#1ff241c86d2c29b24ae52f49544db5d78a4eb967" integrity sha512-JzrOLHLwX2zMqKdyYZjkDgQGT+kHDkIhv2/IK2lJ00qLxV4TmFoHi8drDBb6H5Zrz1YfgHkai4e2MGPqnoUhqA== @@ -1366,6 +1466,11 @@ buffer-equal@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74= +buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + buffer-writer@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04" @@ -1376,7 +1481,7 @@ builtins@^1.0.3: resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88" integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og= -cacache@*, cacache@^15.0.3, cacache@^15.0.5, cacache@^15.2.0: +cacache@^15.0.3, cacache@^15.0.5, cacache@^15.2.0, cacache@^15.3.0: version "15.3.0" resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb" integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ== @@ -1481,14 +1586,6 @@ chai@>1.9.0, chai@^4.x: pathval "^1.1.1" type-detect "^4.0.5" -chalk@*, chalk@^4.0.0, chalk@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - chalk@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" @@ -1517,6 +1614,14 @@ chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.2, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -1613,16 +1718,16 @@ chokidar@3.3.0: optionalDependencies: fsevents "~2.1.1" -chownr@*, chownr@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" - integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== - chownr@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== + ci-info@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" @@ -1640,13 +1745,13 @@ clean-stack@^2.0.0: resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== -cli-columns@*: - version "4.0.0" - resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-4.0.0.tgz#9fe4d65975238d55218c41bd2ed296a7fa555646" - integrity sha512-XW2Vg+w+L9on9wtwKpyzluIPCWXjaBahI7mTcYjx+BVIYD9c3yqcv/yKC7CmdCZat4rq2yiE1UMSJC5ivKfMtQ== +cli-columns@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-3.1.2.tgz#6732d972979efc2ae444a1f08e08fa139c96a18e" + integrity sha1-ZzLZcpee/CrkRKHwjgj6E5yWoY4= dependencies: - string-width "^4.2.3" - strip-ansi "^6.0.1" + string-width "^2.0.0" + strip-ansi "^3.0.1" cli-cursor@^3.1.0: version "3.1.0" @@ -1655,7 +1760,7 @@ cli-cursor@^3.1.0: dependencies: restore-cursor "^3.1.0" -cli-table3@*, cli-table3@^0.6.0: +cli-table3@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.0.tgz#b7b1bc65ca8e7b5cef9124e13dc2b21e2ce4faee" integrity sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ== @@ -1804,7 +1909,7 @@ colors@^1.1.2: resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== -columnify@*: +columnify@~1.5.4: version "1.5.4" resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb" integrity sha1-Rzfd8ce2mop8NAVweC6UfuyOeLs= @@ -1913,6 +2018,19 @@ convert-source-map@^1.5.0, convert-source-map@^1.7.0: dependencies: safe-buffer "~5.1.1" +copyfiles@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.4.1.tgz#d2dcff60aaad1015f09d0b66e7f0f1c5cd3c5da5" + integrity sha512-fereAvAvxDrQDOXybk3Qu3dPbOoKoysFMWtkY3mv5BsL8//OSZVL5DCLYqgRfY5cWirgRzlC+WSrxp6Bo3eNZg== + dependencies: + glob "^7.0.5" + minimatch "^3.0.3" + mkdirp "^1.0.4" + noms "0.0.0" + through2 "^2.0.1" + untildify "^4.0.0" + yargs "^16.1.0" + core-js@^2.4.0: version "2.6.12" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" @@ -2048,7 +2166,7 @@ debug@3.2.6: dependencies: ms "^2.1.1" -debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1: +debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== @@ -2496,6 +2614,114 @@ es6-error@^4.0.1: resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== +esbuild-android-arm64@0.13.12: + version "0.13.12" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.13.12.tgz#e1f199dc05405cdc6670c00fb6c793822bf8ae4c" + integrity sha512-TSVZVrb4EIXz6KaYjXfTzPyyRpXV5zgYIADXtQsIenjZ78myvDGaPi11o4ZSaHIwFHsuwkB6ne5SZRBwAQ7maw== + +esbuild-darwin-64@0.13.12: + version "0.13.12" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.13.12.tgz#f5c59e622955c01f050e5a7ac9c1d41db714b94d" + integrity sha512-c51C+N+UHySoV2lgfWSwwmlnLnL0JWj/LzuZt9Ltk9ub1s2Y8cr6SQV5W3mqVH1egUceew6KZ8GyI4nwu+fhsw== + +esbuild-darwin-arm64@0.13.12: + version "0.13.12" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.12.tgz#8abae74c2956a8aa568fc52c78829338c4a4b988" + integrity sha512-JvAMtshP45Hd8A8wOzjkY1xAnTKTYuP/QUaKp5eUQGX+76GIie3fCdUUr2ZEKdvpSImNqxiZSIMziEiGB5oUmQ== + +esbuild-freebsd-64@0.13.12: + version "0.13.12" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.12.tgz#6ad2ab8c0364ee7dd2d6e324d876a8e60ae75d12" + integrity sha512-r6On/Skv9f0ZjTu6PW5o7pdXr8aOgtFOEURJZYf1XAJs0IQ+gW+o1DzXjVkIoT+n1cm3N/t1KRJfX71MPg/ZUA== + +esbuild-freebsd-arm64@0.13.12: + version "0.13.12" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.12.tgz#6f38155f4c300ac4c8adde1fde3cc6a4440a8294" + integrity sha512-F6LmI2Q1gii073kmBE3NOTt/6zLL5zvZsxNLF8PMAwdHc+iBhD1vzfI8uQZMJA1IgXa3ocr3L3DJH9fLGXy6Yw== + +esbuild-linux-32@0.13.12: + version "0.13.12" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.13.12.tgz#b1d15e330188a8c21de75c3f0058628a3eefade7" + integrity sha512-U1UZwG3UIwF7/V4tCVAo/nkBV9ag5KJiJTt+gaCmLVWH3bPLX7y+fNlhIWZy8raTMnXhMKfaTvWZ9TtmXzvkuQ== + +esbuild-linux-64@0.13.12: + version "0.13.12" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.13.12.tgz#25bd64b66162b02348e32d8f12e4c9ee61f1d070" + integrity sha512-YpXSwtu2NxN3N4ifJxEdsgd6Q5d8LYqskrAwjmoCT6yQnEHJSF5uWcxv783HWN7lnGpJi9KUtDvYsnMdyGw71Q== + +esbuild-linux-arm64@0.13.12: + version "0.13.12" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.12.tgz#ba582298457cc5c9ac823a275de117620c06537f" + integrity sha512-sgDNb8kb3BVodtAlcFGgwk+43KFCYjnFOaOfJibXnnIojNWuJHpL6aQJ4mumzNWw8Rt1xEtDQyuGK9f+Y24jGA== + +esbuild-linux-arm@0.13.12: + version "0.13.12" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.13.12.tgz#6bc81c957bff22725688cc6359c29a25765be09b" + integrity sha512-SyiT/JKxU6J+DY2qUiSLZJqCAftIt3uoGejZ0HDnUM2MGJqEGSGh7p1ecVL2gna3PxS4P+j6WAehCwgkBPXNIw== + +esbuild-linux-mips64le@0.13.12: + version "0.13.12" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.12.tgz#ef3c4aba3e585d847cbade5945a8b4a5c62c7ce2" + integrity sha512-qQJHlZBG+QwVIA8AbTEtbvF084QgDi4DaUsUnA+EolY1bxrG+UyOuGflM2ZritGhfS/k7THFjJbjH2wIeoKA2g== + +esbuild-linux-ppc64le@0.13.12: + version "0.13.12" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.12.tgz#a21fb64e80c38bef06122e48283990fc6db578e1" + integrity sha512-2dSnm1ldL7Lppwlo04CGQUpwNn5hGqXI38OzaoPOkRsBRWFBozyGxTFSee/zHFS+Pdh3b28JJbRK3owrrRgWNw== + +esbuild-netbsd-64@0.13.12: + version "0.13.12" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.13.12.tgz#1ea7fc8cfce88a20a4047b867ef184049a6641ae" + integrity sha512-D4raxr02dcRiQNbxOLzpqBzcJNFAdsDNxjUbKkDMZBkL54Z0vZh4LRndycdZAMcIdizC/l/Yp/ZsBdAFxc5nbA== + +esbuild-openbsd-64@0.13.12: + version "0.13.12" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.12.tgz#adde32f2f1b05dc4bd4fc544d6ea5a4379f9ca4d" + integrity sha512-KuLCmYMb2kh05QuPJ+va60bKIH5wHL8ypDkmpy47lzwmdxNsuySeCMHuTv5o2Af1RUn5KLO5ZxaZeq4GEY7DaQ== + +esbuild-sunos-64@0.13.12: + version "0.13.12" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.13.12.tgz#a7ecaf52b7364fbee76dc8aa707fa3e1cff3342c" + integrity sha512-jBsF+e0woK3miKI8ufGWKG3o3rY9DpHvCVRn5eburMIIE+2c+y3IZ1srsthKyKI6kkXLvV4Cf/E7w56kLipMXw== + +esbuild-windows-32@0.13.12: + version "0.13.12" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.13.12.tgz#a8756033dc905c4b7bea19be69f7ee68809f8770" + integrity sha512-L9m4lLFQrFeR7F+eLZXG82SbXZfUhyfu6CexZEil6vm+lc7GDCE0Q8DiNutkpzjv1+RAbIGVva9muItQ7HVTkQ== + +esbuild-windows-64@0.13.12: + version "0.13.12" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.13.12.tgz#ae694aa66ca078acb8509b2da31197ed1f40f798" + integrity sha512-k4tX4uJlSbSkfs78W5d9+I9gpd+7N95W7H2bgOMFPsYREVJs31+Q2gLLHlsnlY95zBoPQMIzHooUIsixQIBjaQ== + +esbuild-windows-arm64@0.13.12: + version "0.13.12" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.12.tgz#782c5a8bd6d717ea55aaafe648f9926ca36a4a88" + integrity sha512-2tTv/BpYRIvuwHpp2M960nG7uvL+d78LFW/ikPItO+2GfK51CswIKSetSpDii+cjz8e9iSPgs+BU4o8nWICBwQ== + +esbuild@^0.13.12: + version "0.13.12" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.13.12.tgz#9cac641594bf03cf34145258c093d743ebbde7ca" + integrity sha512-vTKKUt+yoz61U/BbrnmlG9XIjwpdIxmHB8DlPR0AAW6OdS+nBQBci6LUHU2q9WbBobMEIQxxDpKbkmOGYvxsow== + optionalDependencies: + esbuild-android-arm64 "0.13.12" + esbuild-darwin-64 "0.13.12" + esbuild-darwin-arm64 "0.13.12" + esbuild-freebsd-64 "0.13.12" + esbuild-freebsd-arm64 "0.13.12" + esbuild-linux-32 "0.13.12" + esbuild-linux-64 "0.13.12" + esbuild-linux-arm "0.13.12" + esbuild-linux-arm64 "0.13.12" + esbuild-linux-mips64le "0.13.12" + esbuild-linux-ppc64le "0.13.12" + esbuild-netbsd-64 "0.13.12" + esbuild-openbsd-64 "0.13.12" + esbuild-sunos-64 "0.13.12" + esbuild-windows-32 "0.13.12" + esbuild-windows-64 "0.13.12" + esbuild-windows-arm64 "0.13.12" + escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" @@ -2659,7 +2885,7 @@ eslint-plugin-mocha@^6.2.2: eslint-utils "^2.0.0" ramda "^0.27.0" -eslint-scope@^5.0.0: +eslint-scope@^5.0.0, eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== @@ -2681,11 +2907,28 @@ eslint-utils@^2.0.0: dependencies: eslint-visitor-keys "^1.1.0" +eslint-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" + integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== + dependencies: + eslint-visitor-keys "^2.0.0" + eslint-visitor-keys@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== +eslint-visitor-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== + +eslint-visitor-keys@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz#e32e99c6cdc2eb063f204eda5db67bfe58bb4186" + integrity sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q== + eslint@^6.8.0: version "6.8.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb" @@ -2836,7 +3079,7 @@ fast-deep-equal@^3.1.1: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.1.1: +fast-glob@^3.1.1, fast-glob@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== @@ -2857,7 +3100,7 @@ fast-levenshtein@~2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= -fastest-levenshtein@*: +fastest-levenshtein@^1.0.12: version "1.0.12" resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow== @@ -3269,10 +3512,10 @@ glob-stream@^6.1.0: to-absolute-glob "^2.0.0" unique-stream "^2.0.2" -glob@*, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== +glob@7.1.3: + version "7.1.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" + integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -3281,10 +3524,10 @@ glob@*, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" -glob@7.1.3: - version "7.1.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" - integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ== +glob@^7.0.5, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -3329,7 +3572,7 @@ globals@^9.18.0: resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== -globby@^11.0.0, globby@^11.0.1: +globby@^11.0.0, globby@^11.0.1, globby@^11.0.4: version "11.0.4" resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== @@ -3341,7 +3584,7 @@ globby@^11.0.0, globby@^11.0.1: merge2 "^1.3.0" slash "^3.0.0" -graceful-fs@*, graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.6: +graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.8: version "4.2.8" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== @@ -3445,18 +3688,18 @@ hook-std@^2.0.0: resolved "https://registry.yarnpkg.com/hook-std/-/hook-std-2.0.0.tgz#ff9aafdebb6a989a354f729bb6445cf4a3a7077c" integrity sha512-zZ6T5WcuBMIUVh49iPQS9t977t7C0l7OtHrpeMb5uk48JdflRX0NSFvCekfYNmGQETnLq9W/isMyHl69kxGi8g== -hosted-git-info@*, hosted-git-info@^4.0.0, hosted-git-info@^4.0.1: +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" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== + +hosted-git-info@^4.0.0, hosted-git-info@^4.0.1, hosted-git-info@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== dependencies: lru-cache "^6.0.0" -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" - integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== - html-escaper@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" @@ -3595,19 +3838,12 @@ ignore-walk@^3.0.1, ignore-walk@^3.0.3: dependencies: minimatch "^3.0.4" -ignore-walk@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-4.0.1.tgz#fc840e8346cf88a3a9380c5b17933cd8f4d39fa3" - integrity sha512-rzDQLaW4jQbh2YrOFlJdCtX8qgJTehFRYiUB2r1osqTeDzV/3+Jh8fz1oAPzUThf3iku8Ds4IDqawI5d8mUiQw== - dependencies: - minimatch "^3.0.4" - ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.1.4, ignore@~5.1.8: +ignore@^5.1.4, ignore@^5.1.8, ignore@~5.1.8: version "5.1.9" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb" integrity sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ== @@ -3660,17 +3896,17 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -ini@*, ini@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" - integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== - ini@^1.3.4, ini@~1.3.0: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -init-package-json@*: +ini@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" + integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== + +init-package-json@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-2.0.5.tgz#78b85f3c36014db42d8f32117252504f68022646" integrity sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA== @@ -3786,7 +4022,7 @@ is-callable@^1.1.4, is-callable@^1.2.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== -is-cidr@*: +is-cidr@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-4.0.2.tgz#94c7585e4c6c77ceabf920f8cde51b8c0fda8814" integrity sha512-z4a1ENUajDbEl/Q6/pVBpTR1nBjjEE1X7qb7bmWYanNnPoKAvUCPFKeXV6Fe4mgTkWKBqiHIcwsI3SndiO5FeA== @@ -3841,7 +4077,7 @@ is-glob@^3.1.0: dependencies: is-extglob "^2.1.0" -is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== @@ -4179,7 +4415,7 @@ json-parse-better-errors@^1.0.1: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== -json-parse-even-better-errors@*, json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: +json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== @@ -4334,7 +4570,7 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -libnpmaccess@*: +libnpmaccess@^4.0.2: version "4.0.3" resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-4.0.3.tgz#dfb0e5b0a53c315a2610d300e46b4ddeb66e7eec" integrity sha512-sPeTSNImksm8O2b6/pf3ikv4N567ERYEpeKRPSmqlNt1dTZbvgpJIzg5vAhXHpw2ISBsELFRelk0jEahj1c6nQ== @@ -4344,7 +4580,7 @@ libnpmaccess@*: npm-package-arg "^8.1.2" npm-registry-fetch "^11.0.0" -libnpmdiff@*: +libnpmdiff@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-2.0.4.tgz#bb1687992b1a97a8ea4a32f58ad7c7f92de53b74" integrity sha512-q3zWePOJLHwsLEUjZw3Kyu/MJMYfl4tWCg78Vl6QGSfm4aXBUSVzMzjJ6jGiyarsT4d+1NH4B1gxfs62/+y9iQ== @@ -4358,31 +4594,31 @@ libnpmdiff@*: pacote "^11.3.0" tar "^6.1.0" -libnpmexec@*: - version "3.0.1" - resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-3.0.1.tgz#bc2fddf1b7bd2c1b2c43b4b726ec4cf11920ad0a" - integrity sha512-VUZTpkKBRPv3Z9DIjbsiHhEQXmQ+OwSQ/yLCY9i6CFE8UIczWyE6wVxP5sJ5NSGtSTUs6I98WewQOL45OKMyxA== +libnpmexec@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-2.0.1.tgz#729ae3e15a3ba225964ccf248117a75d311eeb73" + integrity sha512-4SqBB7eJvJWmUKNF42Q5qTOn20DRjEE4TgvEh2yneKlAiRlwlhuS9MNR45juWwmoURJlf2K43bozlVt7OZiIOw== dependencies: - "@npmcli/arborist" "^4.0.0" + "@npmcli/arborist" "^2.3.0" "@npmcli/ci-detect" "^1.3.0" - "@npmcli/run-script" "^2.0.0" + "@npmcli/run-script" "^1.8.4" chalk "^4.1.0" mkdirp-infer-owner "^2.0.0" npm-package-arg "^8.1.2" - pacote "^12.0.0" + pacote "^11.3.1" proc-log "^1.0.0" read "^1.0.7" read-package-json-fast "^2.0.2" walk-up-path "^1.0.0" -libnpmfund@*: - version "2.0.1" - resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-2.0.1.tgz#3c7e2be61e8c79e22c4918dde91ef57f64faf064" - integrity sha512-OhDbjB3gqdRyuQ56AhUtO49HZ7cZHSM7yCnhQa1lsNpmAmGPnjCImfx8SoWaAkUM7Ov8jngMR5JHKAr1ddjHTQ== +libnpmfund@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-1.1.0.tgz#ee91313905b3194b900530efa339bc3f9fc4e5c4" + integrity sha512-Kfmh3pLS5/RGKG5WXEig8mjahPVOxkik6lsbH4iX0si1xxNi6eeUh/+nF1MD+2cgalsQif3O5qyr6mNz2ryJrQ== dependencies: - "@npmcli/arborist" "^4.0.0" + "@npmcli/arborist" "^2.5.0" -libnpmhook@*: +libnpmhook@^6.0.2: version "6.0.3" resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-6.0.3.tgz#1d7f0d7e6a7932fbf7ce0881fdb0ed8bf8748a30" integrity sha512-3fmkZJibIybzmAvxJ65PeV3NzRc0m4xmYt6scui5msocThbEp4sKFT80FhgrCERYDjlUuFahU6zFNbJDHbQ++g== @@ -4390,7 +4626,7 @@ libnpmhook@*: aproba "^2.0.0" npm-registry-fetch "^11.0.0" -libnpmorg@*: +libnpmorg@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-2.0.3.tgz#4e605d4113dfa16792d75343824a0625c76703bc" integrity sha512-JSGl3HFeiRFUZOUlGdiNcUZOsUqkSYrg6KMzvPZ1WVZ478i47OnKSS0vkPmX45Pai5mTKuwIqBMcGWG7O8HfdA== @@ -4398,16 +4634,16 @@ libnpmorg@*: aproba "^2.0.0" npm-registry-fetch "^11.0.0" -libnpmpack@*: - version "3.0.0" - resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-3.0.0.tgz#b1cdf182106bc0d25910e79bb5c9b6c23cd71670" - integrity sha512-W6lt4blkR9YXu/qOrFknfnKBajz/1GvAc5q1XcWTGuBJn2DYKDWHtA7x1fuMQdn7hKDBOPlZ/Aqll+ZvAnrM6g== +libnpmpack@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-2.0.1.tgz#d3eac25cc8612f4e7cdeed4730eee339ba51c643" + integrity sha512-He4/jxOwlaQ7YG7sIC1+yNeXeUDQt8RLBvpI68R3RzPMZPa4/VpxhlDo8GtBOBDYoU8eq6v1wKL38sq58u4ibQ== dependencies: - "@npmcli/run-script" "^2.0.0" + "@npmcli/run-script" "^1.8.3" npm-package-arg "^8.1.0" - pacote "^12.0.0" + pacote "^11.2.6" -libnpmpublish@*: +libnpmpublish@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-4.0.2.tgz#be77e8bf5956131bcb45e3caa6b96a842dec0794" integrity sha512-+AD7A2zbVeGRCFI2aO//oUmapCwy7GHqPXFJh3qpToSRNU+tXKJ2YFUgjt04LPPAf2dlEH95s6EhIHM1J7bmOw== @@ -4418,14 +4654,14 @@ libnpmpublish@*: semver "^7.1.3" ssri "^8.0.1" -libnpmsearch@*: +libnpmsearch@^3.1.1: version "3.1.2" resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-3.1.2.tgz#aee81b9e4768750d842b627a3051abc89fdc15f3" integrity sha512-BaQHBjMNnsPYk3Bl6AiOeVuFgp72jviShNBw5aHaHNKWqZxNi38iVNoXbo6bG/Ccc/m1To8s0GtMdtn6xZ1HAw== dependencies: npm-registry-fetch "^11.0.0" -libnpmteam@*: +libnpmteam@^2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-2.0.4.tgz#9dbe2e18ae3cb97551ec07d2a2daf9944f3edc4c" integrity sha512-FPrVJWv820FZFXaflAEVTLRWZrerCvfe7ZHSMzJ/62EBlho2KFlYKjyNEsPW3JiV7TLSXi3vo8u0gMwIkXSMTw== @@ -4433,13 +4669,13 @@ libnpmteam@*: aproba "^2.0.0" npm-registry-fetch "^11.0.0" -libnpmversion@*: - version "2.0.1" - resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-2.0.1.tgz#20b1425d88cd99c66806a54b458d2d654066b550" - integrity sha512-uFGtNTe/m0GOIBQCE4ryIsgGNJdeShW+qvYtKNLCCuiG7JY3YEslL/maFFZbaO4wlQa/oj1t0Bm9TyjahvtgQQ== +libnpmversion@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-1.2.1.tgz#689aa7fe0159939b3cbbf323741d34976f4289e9" + integrity sha512-AA7x5CFgBFN+L4/JWobnY5t4OAHjQuPbAwUYJ7/NtHuyLut5meb+ne/aj0n7PWNiTGCJcRw/W6Zd2LoLT7EZuQ== dependencies: "@npmcli/git" "^2.0.7" - "@npmcli/run-script" "^2.0.0" + "@npmcli/run-script" "^1.8.4" json-parse-even-better-errors "^2.3.1" semver "^7.3.5" stringify-package "^1.0.1" @@ -4700,7 +4936,7 @@ make-dir@^3.0.0, make-dir@^3.0.2: dependencies: semver "^6.0.0" -make-fetch-happen@*, make-fetch-happen@^9.0.1, make-fetch-happen@^9.1.0: +make-fetch-happen@^9.0.1, make-fetch-happen@^9.1.0: version "9.1.0" resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968" integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg== @@ -4882,7 +5118,7 @@ min-indent@^1.0.0: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.4: +minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -4941,7 +5177,7 @@ minipass-json-stream@^1.0.1: jsonparse "^1.3.1" minipass "^3.0.0" -minipass-pipeline@*, minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4: +minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== @@ -4955,13 +5191,6 @@ minipass-sized@^1.0.3: dependencies: minipass "^3.0.0" -minipass@*, minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: - version "3.1.5" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz#71f6251b0a33a49c01b3cf97ff77eda030dff732" - integrity sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw== - dependencies: - yallist "^4.0.0" - minipass@^2.6.0, minipass@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" @@ -4970,6 +5199,13 @@ minipass@^2.6.0, minipass@^2.9.0: safe-buffer "^5.1.2" yallist "^3.0.0" +minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: + version "3.1.5" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz#71f6251b0a33a49c01b3cf97ff77eda030dff732" + integrity sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw== + dependencies: + yallist "^4.0.0" + minizlib@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" @@ -4985,7 +5221,7 @@ minizlib@^2.0.0, minizlib@^2.1.1: minipass "^3.0.0" yallist "^4.0.0" -mkdirp-infer-owner@*, mkdirp-infer-owner@^2.0.0: +mkdirp-infer-owner@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316" integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw== @@ -4994,11 +5230,6 @@ mkdirp-infer-owner@*, mkdirp-infer-owner@^2.0.0: infer-owner "^1.0.4" mkdirp "^1.0.3" -mkdirp@*, mkdirp@^1.0.3, mkdirp@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - mkdirp@0.5.5, mkdirp@^0.5.1, mkdirp@^0.5.5: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" @@ -5006,6 +5237,11 @@ mkdirp@0.5.5, mkdirp@^0.5.1, mkdirp@^0.5.5: dependencies: minimist "^1.2.5" +mkdirp@^1.0.3, mkdirp@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + mocha@^7.1.2: version "7.2.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.2.0.tgz#01cc227b00d875ab1eed03a75106689cfed5a604" @@ -5041,6 +5277,11 @@ modify-values@^1.0.0: resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw== +module-alias@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/module-alias/-/module-alias-2.2.2.tgz#151cdcecc24e25739ff0aa6e51e1c5716974c0e0" + integrity sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q== + moment-timezone@^0.5.31, moment-timezone@^0.5.33: version "0.5.33" resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz#b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c" @@ -5053,11 +5294,6 @@ moment-timezone@^0.5.31, moment-timezone@^0.5.33: resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== -ms@*, ms@^2.0.0, ms@^2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -5073,6 +5309,11 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@^2.0.0, ms@^2.1.1, ms@^2.1.2: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + mute-stream@0.0.8, mute-stream@~0.0.4: version "0.0.8" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" @@ -5176,23 +5417,7 @@ node-fetch@^2.6.1: dependencies: whatwg-url "^5.0.0" -node-gyp@*, node-gyp@^8.2.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.0.tgz#6e1112b10617f0f8559c64b3f737e8109e5a8338" - integrity sha512-Bi/oCm5bH6F+FmzfUxJpPaxMEyIhszULGR3TprmTeku8/dMFcdTcypk120NeZqEt54r1BrgEKtm2jJiuIKE28Q== - dependencies: - env-paths "^2.2.0" - glob "^7.1.4" - graceful-fs "^4.2.6" - make-fetch-happen "^9.1.0" - nopt "^5.0.0" - npmlog "^4.1.2" - rimraf "^3.0.2" - semver "^7.3.5" - tar "^6.1.2" - which "^2.0.2" - -node-gyp@^7.1.0: +node-gyp@^7.1.0, node-gyp@^7.1.2: version "7.1.2" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae" integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ== @@ -5208,6 +5433,11 @@ node-gyp@^7.1.0: tar "^6.0.2" which "^2.0.2" +node-hook@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/node-hook/-/node-hook-1.0.0.tgz#82ca39af991d726d5c7952e59c992378bb296f7e" + integrity sha1-gso5r5kdcm1ceVLlnJkjeLspb34= + node-pre-gyp@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz#db1f33215272f692cd38f03238e3e9b47c5dd054" @@ -5236,12 +5466,13 @@ node-releases@^2.0.1: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA== -nopt@*, nopt@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" - integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== +noms@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/noms/-/noms-0.0.0.tgz#da8ebd9f3af9d6760919b27d9cdc8092a7332859" + integrity sha1-2o69nzr51nYJGbJ9nNyAkqczKFk= dependencies: - abbrev "1" + inherits "^2.0.1" + readable-stream "~1.0.31" nopt@^4.0.1: version "4.0.3" @@ -5251,6 +5482,13 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" +nopt@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" + integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== + dependencies: + abbrev "1" + normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -5295,7 +5533,7 @@ now-and-later@^2.0.0: dependencies: once "^1.3.2" -npm-audit-report@*: +npm-audit-report@^2.1.5: version "2.1.5" resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-2.1.5.tgz#a5b8850abe2e8452fce976c8960dd432981737b5" integrity sha512-YB8qOoEmBhUH1UJgh1xFAv7Jg1d+xoNhsDYiFQlEFThEBui0W1vIz2ZK6FVg4WZjwEdl7uBQlm1jy3MUfyHeEw== @@ -5309,7 +5547,7 @@ npm-bundled@^1.0.1, npm-bundled@^1.1.1: dependencies: npm-normalize-package-bin "^1.0.1" -npm-install-checks@*, npm-install-checks@^4.0.0: +npm-install-checks@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4" integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w== @@ -5321,7 +5559,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== -npm-package-arg@*, npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.1, npm-package-arg@^8.1.2, npm-package-arg@^8.1.5: +npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.1, npm-package-arg@^8.1.2, npm-package-arg@^8.1.5: version "8.1.5" resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44" integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q== @@ -5349,17 +5587,7 @@ npm-packlist@^2.1.4: npm-bundled "^1.1.1" npm-normalize-package-bin "^1.0.1" -npm-packlist@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-3.0.0.tgz#0370df5cfc2fcc8f79b8f42b37798dd9ee32c2a9" - integrity sha512-L/cbzmutAwII5glUcf2DBRNY/d0TFd4e/FnaZigJV6JD85RHZXJFGwCndjMWiiViiWSsWt3tiOLpI3ByTnIdFQ== - dependencies: - glob "^7.1.6" - ignore-walk "^4.0.1" - npm-bundled "^1.1.1" - npm-normalize-package-bin "^1.0.1" - -npm-pick-manifest@*, npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.0, npm-pick-manifest@^6.1.1: +npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.0, npm-pick-manifest@^6.1.1: version "6.1.1" resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148" integrity sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA== @@ -5369,14 +5597,14 @@ npm-pick-manifest@*, npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.0, npm-pic npm-package-arg "^8.1.2" semver "^7.3.4" -npm-profile@*: +npm-profile@^5.0.3: version "5.0.4" resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-5.0.4.tgz#73e5bd1d808edc2c382d7139049cc367ac43161b" integrity sha512-OKtU7yoAEBOnc8zJ+/uo5E4ugPp09sopo+6y1njPp+W99P8DvQon3BJYmpvyK2Bf1+3YV5LN1bvgXRoZ1LUJBA== dependencies: npm-registry-fetch "^11.0.0" -npm-registry-fetch@*, npm-registry-fetch@^11.0.0: +npm-registry-fetch@^11.0.0: version "11.0.0" resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz#68c1bb810c46542760d62a6a965f85a702d43a76" integrity sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA== @@ -5395,7 +5623,7 @@ npm-run-path@^4.0.0, npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" -npm-user-validate@*: +npm-user-validate@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz#31428fc5475fe8416023f178c0ab47935ad8c561" integrity sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw== @@ -5476,16 +5704,6 @@ npm@^7.0.0: which "^2.0.2" write-file-atomic "^3.0.3" -npmlog@*: - version "5.0.1" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0" - integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw== - dependencies: - are-we-there-yet "^2.0.0" - console-control-strings "^1.1.0" - gauge "^3.0.0" - set-blocking "^2.0.0" - npmlog@^4.0.2, npmlog@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" @@ -5496,6 +5714,16 @@ npmlog@^4.0.2, npmlog@^4.1.2: gauge "~2.7.3" set-blocking "~2.0.0" +npmlog@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0" + integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw== + dependencies: + are-we-there-yet "^2.0.0" + console-control-strings "^1.1.0" + gauge "^3.0.0" + set-blocking "^2.0.0" + nth-check@>=2.0.1, nth-check@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" @@ -5626,7 +5854,7 @@ opencollective-postinstall@^2.0.2: resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259" integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q== -opener@*: +opener@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A== @@ -5816,32 +6044,7 @@ packet-reader@1.0.0: resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74" integrity sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ== -pacote@*, pacote@^12.0.0: - version "12.0.2" - resolved "https://registry.yarnpkg.com/pacote/-/pacote-12.0.2.tgz#14ae30a81fe62ec4fc18c071150e6763e932527c" - integrity sha512-Ar3mhjcxhMzk+OVZ8pbnXdb0l8+pimvlsqBGRNkble2NVgyqOGE3yrCGi/lAYq7E7NRDMz89R1Wx5HIMCGgeYg== - dependencies: - "@npmcli/git" "^2.1.0" - "@npmcli/installed-package-contents" "^1.0.6" - "@npmcli/promise-spawn" "^1.2.0" - "@npmcli/run-script" "^2.0.0" - cacache "^15.0.5" - chownr "^2.0.0" - fs-minipass "^2.1.0" - infer-owner "^1.0.4" - minipass "^3.1.3" - mkdirp "^1.0.3" - npm-package-arg "^8.0.1" - npm-packlist "^3.0.0" - npm-pick-manifest "^6.0.0" - npm-registry-fetch "^11.0.0" - promise-retry "^2.0.1" - read-package-json-fast "^2.0.1" - rimraf "^3.0.2" - ssri "^8.0.1" - tar "^6.1.0" - -pacote@^11.3.0: +pacote@^11.1.11, pacote@^11.2.6, pacote@^11.3.0, pacote@^11.3.1, pacote@^11.3.5: version "11.3.5" resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.3.5.tgz#73cf1fc3772b533f575e39efa96c50be8c3dc9d2" integrity sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg== @@ -5873,7 +6076,7 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" -parse-conflict-json@*, parse-conflict-json@^1.1.1: +parse-conflict-json@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-1.1.1.tgz#54ec175bde0f2d70abf6be79e0e042290b86701b" integrity sha512-4gySviBiW5TRl7XHvp1agcS7SOe0KZOjC//71dzZVWJrY9hCrgtvl5v3SyIxCZ4fZF47TxD9nfzmxcx76xmbUw== @@ -6207,7 +6410,7 @@ q@^1.5.1: resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= -qrcode-terminal@*: +qrcode-terminal@^0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz#bb5b699ef7f9f0505092a3748be4464fe71b5819" integrity sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ== @@ -6247,7 +6450,7 @@ read-cmd-shim@^2.0.0: resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz#4a50a71d6f0965364938e9038476f7eede3928d9" integrity sha512-HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw== -read-package-json-fast@*, read-package-json-fast@^2.0.1, read-package-json-fast@^2.0.2: +read-package-json-fast@^2.0.1, read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83" integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ== @@ -6255,7 +6458,7 @@ read-package-json-fast@*, read-package-json-fast@^2.0.1, read-package-json-fast@ json-parse-even-better-errors "^2.3.0" npm-normalize-package-bin "^1.0.1" -read-package-json@*, read-package-json@^4.1.1: +read-package-json@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-4.1.1.tgz#153be72fce801578c1c86b8ef2b21188df1b9eea" integrity sha512-P82sbZJ3ldDrWCOSKxJT0r/CXMWR0OR3KRh55SgKo3p91GSIEEC32v3lSHAvO/UcH3/IoL7uqhOFBduAnwdldw== @@ -6284,7 +6487,7 @@ read-pkg@^5.0.0, read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -read@*, read@1, read@^1.0.7, read@~1.0.1: +read@1, read@^1.0.7, read@~1.0.1, read@~1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4" integrity sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ= @@ -6323,7 +6526,17 @@ readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable string_decoder "~1.1.1" util-deprecate "~1.0.1" -readdir-scoped-modules@*, readdir-scoped-modules@^1.1.0: +readable-stream@~1.0.31: + version "1.0.34" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +readdir-scoped-modules@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309" integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw== @@ -6370,6 +6583,11 @@ regexpp@^2.0.1: resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== +regexpp@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== + regextras@^0.7.0: version "0.7.1" resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.7.1.tgz#be95719d5f43f9ef0b9fa07ad89b7c606995a3b2" @@ -6528,13 +6746,6 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rimraf@*, rimraf@^3.0.0, rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - rimraf@2.6.3: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" @@ -6549,6 +6760,13 @@ rimraf@^2.6.1, rimraf@^2.6.3: dependencies: glob "^7.1.3" +rimraf@^3.0.0, rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + run-async@^2.4.0: version "2.4.1" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" @@ -6656,13 +6874,6 @@ semver-regex@^3.1.2: resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.3.tgz#b2bcc6f97f63269f286994e297e229b6245d0dc3" integrity sha512-Aqi54Mk9uYTjVexLnR67rTyBusmwd04cLkHy9hNvk3+G3nT2Oyg7E0l4XVbOaNwIvQ3hHeYxGcyEy+mKreyBFQ== -semver@*, semver@^7.1.1, semver@^7.1.2, semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== - dependencies: - lru-cache "^6.0.0" - "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.7.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -6678,6 +6889,13 @@ semver@^6.0.0, semver@^6.1.2, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@^7.1.1, semver@^7.1.2, semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + seq-queue@^0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e" @@ -6816,12 +7034,20 @@ socks@^2.6.1: ip "^1.1.5" smart-buffer "^4.1.0" +source-map-support@^0.5.20: + version "0.5.20" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" + integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + source-map@^0.5.0, source-map@^0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= -source-map@^0.6.1, source-map@~0.6.1: +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== @@ -6928,7 +7154,7 @@ sshpk@^1.7.0: safer-buffer "^2.0.2" tweetnacl "~0.14.0" -ssri@*, ssri@^8.0.0, ssri@^8.0.1: +ssri@^8.0.0, ssri@^8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== @@ -6967,7 +7193,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.1 || ^2.0.0", "string-width@^1.0.2 || 2": +"string-width@^1.0.1 || ^2.0.0", "string-width@^1.0.2 || 2", string-width@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -6975,7 +7201,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -7161,7 +7387,7 @@ taffydb@2.7.3: resolved "https://registry.yarnpkg.com/taffydb/-/taffydb-2.7.3.tgz#2ad37169629498fca5bc84243096d3cde0ec3a34" integrity sha1-KtNxaWKUmPylvIQkMJbTzeDsOjQ= -tar@*, tar@>=4.4.18, tar@^6.0.2, tar@^6.1.0, tar@^6.1.2: +tar@>=4.4.18, tar@^6.0.2, tar@^6.1.0, tar@^6.1.11: version "6.1.11" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== @@ -7232,7 +7458,7 @@ text-extensions@^1.0.0: resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26" integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ== -text-table@*, text-table@^0.2.0: +text-table@^0.2.0, text-table@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= @@ -7245,7 +7471,7 @@ through2-filter@^3.0.0: through2 "~2.0.0" xtend "~4.0.0" -through2@^2.0.0, through2@^2.0.3, through2@~2.0.0: +through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== @@ -7265,7 +7491,7 @@ through@2, "through@>=2.2.7 <3", through@^2.3.6, through@^2.3.8: resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= -tiny-relative-date@*: +tiny-relative-date@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07" integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A== @@ -7332,7 +7558,7 @@ traverse@~0.6.6: resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137" integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc= -treeverse@*, treeverse@^1.0.4: +treeverse@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-1.0.4.tgz#a6b0ebf98a1bca6846ddc7ecbc900df08cb9cd5f" integrity sha512-whw60l7r+8ZU8Tu/Uc2yxtc4ZTZbR/PF3u1IPNKGQ6p8EICLb3Z2lAgoqw9bqYd8IkgnsaOcLzYHFckjqNsf0g== @@ -7347,7 +7573,7 @@ trim-right@^1.0.1: resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= -tslib@^1.9.0, tslib@^1.9.2: +tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.2: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== @@ -7362,6 +7588,13 @@ tslib@~2.1.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== +tsutils@^3.21.0: + version "3.21.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" + integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== + dependencies: + tslib "^1.8.1" + tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" @@ -7502,6 +7735,11 @@ universalify@^2.0.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== +untildify@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" + integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw== + uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -7542,7 +7780,7 @@ validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -validate-npm-package-name@*, validate-npm-package-name@^3.0.0: +validate-npm-package-name@^3.0.0, validate-npm-package-name@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e" integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34= @@ -7674,13 +7912,6 @@ which-pm-runs@^1.0.0: resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= -which@*, which@^2.0.1, which@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - which@1.3.1, which@^1.2.9: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -7688,6 +7919,13 @@ which@1.3.1, which@^1.2.9: dependencies: isexe "^2.0.0" +which@^2.0.1, which@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + wide-align@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" @@ -7751,7 +7989,7 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -write-file-atomic@*, write-file-atomic@^3.0.0, write-file-atomic@^3.0.3: +write-file-atomic@^3.0.0, write-file-atomic@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== @@ -7894,7 +8132,7 @@ yargs@^15.0.2, yargs@^15.1.0: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^16.2.0: +yargs@^16.1.0, yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==