diff --git a/packages/commonjs/src/helpers.js b/packages/commonjs/src/helpers.js index be25fbbd5..a795a8aae 100644 --- a/packages/commonjs/src/helpers.js +++ b/packages/commonjs/src/helpers.js @@ -40,10 +40,7 @@ export function getAugmentedNamespace(n) { if (typeof f == "function") { var a = function a () { if (this instanceof a) { - var args = [null]; - args.push.apply(args, arguments); - var Ctor = Function.bind.apply(f, args); - return new Ctor(); + return Reflect.construct(f, arguments, this.constructor); } return f.apply(this, arguments); }; diff --git a/packages/commonjs/test/fixtures/function/preserv-this-reference-in-the-child-class/dep.js b/packages/commonjs/test/fixtures/function/preserv-this-reference-in-the-child-class/dep.js new file mode 100644 index 000000000..57e2a0fb9 --- /dev/null +++ b/packages/commonjs/test/fixtures/function/preserv-this-reference-in-the-child-class/dep.js @@ -0,0 +1,2 @@ +function Dep(){}; +export default Dep; diff --git a/packages/commonjs/test/fixtures/function/preserv-this-reference-in-the-child-class/main.js b/packages/commonjs/test/fixtures/function/preserv-this-reference-in-the-child-class/main.js new file mode 100644 index 000000000..7a50cd598 --- /dev/null +++ b/packages/commonjs/test/fixtures/function/preserv-this-reference-in-the-child-class/main.js @@ -0,0 +1,11 @@ +const Dep = require('./dep'); + +class Main extends Dep { + constructor() { + super(); + this.name = this.constructor.name; + } + static name = "main"; +} + +t.is(new Main().name, "main"); diff --git a/packages/commonjs/test/snapshots/function.js.md b/packages/commonjs/test/snapshots/function.js.md index 4ca5ab0b8..34d524d8e 100644 --- a/packages/commonjs/test/snapshots/function.js.md +++ b/packages/commonjs/test/snapshots/function.js.md @@ -3543,10 +3543,7 @@ Generated by [AVA](https://avajs.dev). if (typeof f == "function") {␊ var a = function a () {␊ if (this instanceof a) {␊ - var args = [null];␊ - args.push.apply(args, arguments);␊ - var Ctor = Function.bind.apply(f, args);␊ - return new Ctor();␊ + return Reflect.construct(f, arguments, this.constructor);␊ }␊ return f.apply(this, arguments);␊ };␊ @@ -3630,10 +3627,7 @@ Generated by [AVA](https://avajs.dev). if (typeof f == "function") {␊ var a = function a () {␊ if (this instanceof a) {␊ - var args = [null];␊ - args.push.apply(args, arguments);␊ - var Ctor = Function.bind.apply(f, args);␊ - return new Ctor();␊ + return Reflect.construct(f, arguments, this.constructor);␊ }␊ return f.apply(this, arguments);␊ };␊ @@ -3711,10 +3705,7 @@ Generated by [AVA](https://avajs.dev). if (typeof f == "function") {␊ var a = function a () {␊ if (this instanceof a) {␊ - var args = [null];␊ - args.push.apply(args, arguments);␊ - var Ctor = Function.bind.apply(f, args);␊ - return new Ctor();␊ + return Reflect.construct(f, arguments, this.constructor);␊ }␊ return f.apply(this, arguments);␊ };␊ @@ -3822,10 +3813,7 @@ Generated by [AVA](https://avajs.dev). if (typeof f == "function") {␊ var a = function a () {␊ if (this instanceof a) {␊ - var args = [null];␊ - args.push.apply(args, arguments);␊ - var Ctor = Function.bind.apply(f, args);␊ - return new Ctor();␊ + return Reflect.construct(f, arguments, this.constructor);␊ }␊ return f.apply(this, arguments);␊ };␊ @@ -3915,10 +3903,7 @@ Generated by [AVA](https://avajs.dev). if (typeof f == "function") {␊ var a = function a () {␊ if (this instanceof a) {␊ - var args = [null];␊ - args.push.apply(args, arguments);␊ - var Ctor = Function.bind.apply(f, args);␊ - return new Ctor();␊ + return Reflect.construct(f, arguments, this.constructor);␊ }␊ return f.apply(this, arguments);␊ };␊ @@ -4104,10 +4089,7 @@ Generated by [AVA](https://avajs.dev). if (typeof f == "function") {␊ var a = function a () {␊ if (this instanceof a) {␊ - var args = [null];␊ - args.push.apply(args, arguments);␊ - var Ctor = Function.bind.apply(f, args);␊ - return new Ctor();␊ + return Reflect.construct(f, arguments, this.constructor);␊ }␊ return f.apply(this, arguments);␊ };␊ @@ -4341,10 +4323,7 @@ Generated by [AVA](https://avajs.dev). if (typeof f == "function") {␊ var a = function a () {␊ if (this instanceof a) {␊ - var args = [null];␊ - args.push.apply(args, arguments);␊ - var Ctor = Function.bind.apply(f, args);␊ - return new Ctor();␊ + return Reflect.construct(f, arguments, this.constructor);␊ }␊ return f.apply(this, arguments);␊ };␊ @@ -4444,10 +4423,7 @@ Generated by [AVA](https://avajs.dev). if (typeof f == "function") {␊ var a = function a () {␊ if (this instanceof a) {␊ - var args = [null];␊ - args.push.apply(args, arguments);␊ - var Ctor = Function.bind.apply(f, args);␊ - return new Ctor();␊ + return Reflect.construct(f, arguments, this.constructor);␊ }␊ return f.apply(this, arguments);␊ };␊ @@ -4638,10 +4614,7 @@ Generated by [AVA](https://avajs.dev). if (typeof f == "function") {␊ var a = function a () {␊ if (this instanceof a) {␊ - var args = [null];␊ - args.push.apply(args, arguments);␊ - var Ctor = Function.bind.apply(f, args);␊ - return new Ctor();␊ + return Reflect.construct(f, arguments, this.constructor);␊ }␊ return f.apply(this, arguments);␊ };␊ @@ -4917,10 +4890,7 @@ Generated by [AVA](https://avajs.dev). if (typeof f == "function") {␊ var a = function a () {␊ if (this instanceof a) {␊ - var args = [null];␊ - args.push.apply(args, arguments);␊ - var Ctor = Function.bind.apply(f, args);␊ - return new Ctor();␊ + return Reflect.construct(f, arguments, this.constructor);␊ }␊ return f.apply(this, arguments);␊ };␊ @@ -5012,10 +4982,7 @@ Generated by [AVA](https://avajs.dev). if (typeof f == "function") {␊ var a = function a () {␊ if (this instanceof a) {␊ - var args = [null];␊ - args.push.apply(args, arguments);␊ - var Ctor = Function.bind.apply(f, args);␊ - return new Ctor();␊ + return Reflect.construct(f, arguments, this.constructor);␊ }␊ return f.apply(this, arguments);␊ };␊ @@ -5899,6 +5866,65 @@ Generated by [AVA](https://avajs.dev). `, } +## preserv-this-reference-in-the-child-class + +> Snapshot 1 + + { + 'main.js': `'use strict';␊ + ␊ + function getAugmentedNamespace(n) {␊ + if (n.__esModule) return n;␊ + var f = n.default;␊ + if (typeof f == "function") {␊ + var a = function a () {␊ + if (this instanceof a) {␊ + return Reflect.construct(f, arguments, this.constructor);␊ + }␊ + return f.apply(this, arguments);␊ + };␊ + a.prototype = f.prototype;␊ + } else a = {};␊ + Object.defineProperty(a, '__esModule', {value: true});␊ + Object.keys(n).forEach(function (k) {␊ + var d = Object.getOwnPropertyDescriptor(n, k);␊ + Object.defineProperty(a, k, d.get ? d : {␊ + enumerable: true,␊ + get: function () {␊ + return n[k];␊ + }␊ + });␊ + });␊ + return a;␊ + }␊ + ␊ + var main = {};␊ + ␊ + function Dep$1(){}␊ + ␊ + var dep = /*#__PURE__*/Object.freeze({␊ + __proto__: null,␊ + default: Dep$1␊ + });␊ + ␊ + var require$$0 = /*@__PURE__*/getAugmentedNamespace(dep);␊ + ␊ + const Dep = require$$0;␊ + ␊ + class Main extends Dep {␊ + constructor() {␊ + super();␊ + this.name = this.constructor.name;␊ + }␊ + static name = "main";␊ + }␊ + ␊ + t.is(new Main().name, "main");␊ + ␊ + module.exports = main;␊ + `, + } + ## preserve-modules > Snapshot 1 @@ -6370,10 +6396,7 @@ Generated by [AVA](https://avajs.dev). if (typeof f == "function") {␊ var a = function a () {␊ if (this instanceof a) {␊ - var args = [null];␊ - args.push.apply(args, arguments);␊ - var Ctor = Function.bind.apply(f, args);␊ - return new Ctor();␊ + return Reflect.construct(f, arguments, this.constructor);␊ }␊ return f.apply(this, arguments);␊ };␊ @@ -6422,10 +6445,7 @@ Generated by [AVA](https://avajs.dev). if (typeof f == "function") {␊ var a = function a () {␊ if (this instanceof a) {␊ - var args = [null];␊ - args.push.apply(args, arguments);␊ - var Ctor = Function.bind.apply(f, args);␊ - return new Ctor();␊ + return Reflect.construct(f, arguments, this.constructor);␊ }␊ return f.apply(this, arguments);␊ };␊ @@ -7435,10 +7455,7 @@ Generated by [AVA](https://avajs.dev). if (typeof f == "function") {␊ var a = function a () {␊ if (this instanceof a) {␊ - var args = [null];␊ - args.push.apply(args, arguments);␊ - var Ctor = Function.bind.apply(f, args);␊ - return new Ctor();␊ + return Reflect.construct(f, arguments, this.constructor);␊ }␊ return f.apply(this, arguments);␊ };␊ @@ -7488,10 +7505,7 @@ Generated by [AVA](https://avajs.dev). if (typeof f == "function") {␊ var a = function a () {␊ if (this instanceof a) {␊ - var args = [null];␊ - args.push.apply(args, arguments);␊ - var Ctor = Function.bind.apply(f, args);␊ - return new Ctor();␊ + return Reflect.construct(f, arguments, this.constructor);␊ }␊ return f.apply(this, arguments);␊ };␊ diff --git a/packages/commonjs/test/snapshots/function.js.snap b/packages/commonjs/test/snapshots/function.js.snap index 031a6268c..5517bbaaa 100644 Binary files a/packages/commonjs/test/snapshots/function.js.snap and b/packages/commonjs/test/snapshots/function.js.snap differ diff --git a/packages/commonjs/test/snapshots/test.js.md b/packages/commonjs/test/snapshots/test.js.md index 12182bf66..623c31d80 100644 --- a/packages/commonjs/test/snapshots/test.js.md +++ b/packages/commonjs/test/snapshots/test.js.md @@ -39,10 +39,7 @@ Generated by [AVA](https://avajs.dev). if (typeof f == "function") {␊ var a = function a () {␊ if (this instanceof a) {␊ - var args = [null];␊ - args.push.apply(args, arguments);␊ - var Ctor = Function.bind.apply(f, args);␊ - return new Ctor();␊ + return Reflect.construct(f, arguments, this.constructor);␊ }␊ return f.apply(this, arguments);␊ };␊ @@ -199,10 +196,7 @@ Generated by [AVA](https://avajs.dev). if (typeof f == "function") {␊ var a = function a () {␊ if (this instanceof a) {␊ - var args = [null];␊ - args.push.apply(args, arguments);␊ - var Ctor = Function.bind.apply(f, args);␊ - return new Ctor();␊ + return Reflect.construct(f, arguments, this.constructor);␊ }␊ return f.apply(this, arguments);␊ };␊ @@ -294,10 +288,7 @@ Generated by [AVA](https://avajs.dev). if (typeof f == "function") {␊ var a = function a () {␊ if (this instanceof a) {␊ - var args = [null];␊ - args.push.apply(args, arguments);␊ - var Ctor = Function.bind.apply(f, args);␊ - return new Ctor();␊ + return Reflect.construct(f, arguments, this.constructor);␊ }␊ return f.apply(this, arguments);␊ };␊ diff --git a/packages/commonjs/test/snapshots/test.js.snap b/packages/commonjs/test/snapshots/test.js.snap index a6ea8ec68..7b12a2972 100644 Binary files a/packages/commonjs/test/snapshots/test.js.snap and b/packages/commonjs/test/snapshots/test.js.snap differ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b17e141fc..3a8230750 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: 5.4 +lockfileVersion: 5.3 importers: @@ -43,7 +43,7 @@ importers: '@types/semver': 7.3.12 '@types/source-map-support': 0.5.6 '@types/yargs-parser': 20.2.2 - '@typescript-eslint/eslint-plugin': 5.39.0_7dm4gihkjnuxbxl73rqy4xzt2m + '@typescript-eslint/eslint-plugin': 5.39.0_f8d9c320ea4b6970dd7fdc618e5f33d3 '@typescript-eslint/parser': 5.39.0_typescript@4.8.4 ava: 4.3.3 chalk: 4.1.2 @@ -61,7 +61,7 @@ importers: prettier-plugin-package: 1.3.0 semver: 7.3.8 source-map-support: 0.5.21 - ts-node: 10.9.1_monkgsxveuqszkft6gddtee5aa + ts-node: 10.9.1_639aa34af525212ca8b3f18639909d00 tsconfig-paths: 3.14.1 typescript: 4.8.4 write-pkg: 4.0.0 @@ -80,7 +80,7 @@ importers: slash: 4.0.0 devDependencies: '@rollup/plugin-node-resolve': 15.0.0_rollup@3.2.3 - '@rollup/plugin-typescript': 9.0.1_655ssj4e7sdqlljrreeiqtltve + '@rollup/plugin-typescript': 9.0.1_rollup@3.2.3+typescript@4.8.4 del-cli: 5.0.0 rollup: 3.2.3 typescript: 4.8.4 @@ -95,7 +95,7 @@ importers: typescript: ^4.8.3 devDependencies: '@rollup/plugin-node-resolve': 15.0.0_rollup@3.2.3 - '@rollup/plugin-typescript': 9.0.1_655ssj4e7sdqlljrreeiqtltve + '@rollup/plugin-typescript': 9.0.1_rollup@3.2.3+typescript@4.8.4 del: 6.1.1 node-noop: 1.0.0 rollup: 3.2.3 @@ -155,7 +155,7 @@ importers: '@types/buble': 0.19.2 buble: 0.20.0 devDependencies: - '@rollup/plugin-typescript': 9.0.1_655ssj4e7sdqlljrreeiqtltve + '@rollup/plugin-typescript': 9.0.1_rollup@3.2.3+typescript@4.8.4 del-cli: 5.0.0 rollup: 3.2.3 source-map: 0.7.4 @@ -205,7 +205,7 @@ importers: dependencies: '@rollup/pluginutils': 5.0.1_rollup@3.2.3 devDependencies: - '@rollup/plugin-typescript': 9.0.1_655ssj4e7sdqlljrreeiqtltve + '@rollup/plugin-typescript': 9.0.1_rollup@3.2.3+typescript@4.8.4 rollup: 3.2.3 typescript: 4.8.4 @@ -259,7 +259,7 @@ importers: eslint: 8.25.0 devDependencies: '@rollup/plugin-node-resolve': 15.0.0_rollup@3.2.3 - '@rollup/plugin-typescript': 9.0.1_655ssj4e7sdqlljrreeiqtltve + '@rollup/plugin-typescript': 9.0.1_rollup@3.2.3+typescript@4.8.4 '@types/eslint': 8.4.6 rollup: 3.2.3 typescript: 4.8.4 @@ -298,10 +298,10 @@ importers: rollup-plugin-postcss: ^4.0.2 typescript: ^4.8.3 devDependencies: - '@rollup/plugin-typescript': 9.0.1_655ssj4e7sdqlljrreeiqtltve + '@rollup/plugin-typescript': 9.0.1_rollup@3.2.3+typescript@4.8.4 postcss: 8.4.17 rollup: 3.2.3 - rollup-plugin-postcss: 4.0.2_postcss@8.4.17 + rollup-plugin-postcss: 4.0.2_postcss@8.4.17+ts-node@10.9.1 typescript: 4.8.4 packages/image: @@ -406,7 +406,7 @@ importers: devDependencies: '@babel/core': 7.19.3 '@babel/plugin-transform-typescript': 7.19.3_@babel+core@7.19.3 - '@rollup/plugin-babel': 6.0.0_t2lseskayu4pmjc4spb5q7neyq + '@rollup/plugin-babel': 6.0.0_@babel+core@7.19.3+rollup@3.2.3 '@rollup/plugin-commonjs': 23.0.0_rollup@3.2.3 '@rollup/plugin-json': 5.0.0_rollup@3.2.3 es5-ext: 0.10.62 @@ -434,7 +434,7 @@ importers: devDependencies: '@rollup/plugin-commonjs': 23.0.0_rollup@3.2.3 '@rollup/plugin-node-resolve': 15.0.0_rollup@3.2.3 - '@rollup/plugin-typescript': 9.0.1_655ssj4e7sdqlljrreeiqtltve + '@rollup/plugin-typescript': 9.0.1_rollup@3.2.3+typescript@4.8.4 '@types/node': 14.18.31 '@types/picomatch': 2.3.0 acorn: 8.8.0 @@ -473,7 +473,7 @@ importers: dependencies: '@types/node': 14.18.30 devDependencies: - '@rollup/plugin-typescript': 9.0.1_655ssj4e7sdqlljrreeiqtltve + '@rollup/plugin-typescript': 9.0.1_rollup@3.2.3+typescript@4.8.4 del: 6.1.1 rollup: 3.2.3 sinon: 14.0.1 @@ -585,7 +585,7 @@ importers: typescript: ^4.8.3 devDependencies: '@rollup/plugin-node-resolve': 15.0.0_rollup@3.2.3 - '@rollup/plugin-typescript': 9.0.1_655ssj4e7sdqlljrreeiqtltve + '@rollup/plugin-typescript': 9.0.1_rollup@3.2.3+typescript@4.8.4 rollup: 3.2.3 typescript: 4.8.4 @@ -597,7 +597,7 @@ importers: source-map: ^0.7.4 typescript: ^4.8.3 devDependencies: - '@rollup/plugin-typescript': 9.0.1_655ssj4e7sdqlljrreeiqtltve + '@rollup/plugin-typescript': 9.0.1_rollup@3.2.3+typescript@4.8.4 del-cli: 5.0.0 rollup: 3.2.3 source-map: 0.7.4 @@ -2025,7 +2025,7 @@ packages: slash: 4.0.0 dev: true - /@rollup/plugin-babel/6.0.0_t2lseskayu4pmjc4spb5q7neyq: + /@rollup/plugin-babel/6.0.0_@babel+core@7.19.3+rollup@3.2.3: resolution: {integrity: sha512-qM8YIt/2fVxw5O0wUgAeglyC+qx9mg3UtCCLoSqetmQOKipmnQ/X3I0L2sjjb6BswaYpv2tun25lHViU7JPxLQ==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2139,7 +2139,7 @@ packages: rollup: 3.20.2 dev: true - /@rollup/plugin-typescript/9.0.1_655ssj4e7sdqlljrreeiqtltve: + /@rollup/plugin-typescript/9.0.1_rollup@3.2.3+typescript@4.8.4: resolution: {integrity: sha512-fj+CTk8+HvFCEwwDQdNgWd0lIJVXtMQ0Z3vH/ZgzFSbK2s1zs5wjZrjzrhViTTN+UF49+P69/tybgKRdGHpj/Q==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2526,7 +2526,7 @@ packages: resolution: {integrity: sha512-sUWMriymrSqTvxCmCkf+7k392TNDcMJBHI1/rysWJxKnWAan/Zk4gZ/GEieSRo4EqIEPpbGU3Sd/0KTRoIA3pA==} dev: true - /@typescript-eslint/eslint-plugin/5.39.0_7dm4gihkjnuxbxl73rqy4xzt2m: + /@typescript-eslint/eslint-plugin/5.39.0_f8d9c320ea4b6970dd7fdc618e5f33d3: resolution: {integrity: sha512-xVfKOkBm5iWMNGKQ2fwX5GVgBuHmZBO1tCRwXmY5oAIsPscfwm2UADDuNB8ZVYCtpQvJK4xpjrK7jEhcJ0zY9A==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2551,7 +2551,7 @@ packages: - supports-color dev: true - /@typescript-eslint/eslint-plugin/5.44.0_xweyveqnfveccvpxdpbbnp7sza: + /@typescript-eslint/eslint-plugin/5.44.0_bd898a920d2d482155f71bc216bff2c8: resolution: {integrity: sha512-j5ULd7FmmekcyWeArx+i8x7sdRHzAtXTkmDPthE4amxZOWKFK7bomoJ4r7PJ8K7PoMzD16U8MmuZFAonr1ERvw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2562,10 +2562,10 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.44.0_zksrc6ykdxhogxjbhb5axiabwi + '@typescript-eslint/parser': 5.44.0_eslint@8.28.0+typescript@4.8.4 '@typescript-eslint/scope-manager': 5.44.0 - '@typescript-eslint/type-utils': 5.44.0_zksrc6ykdxhogxjbhb5axiabwi - '@typescript-eslint/utils': 5.44.0_zksrc6ykdxhogxjbhb5axiabwi + '@typescript-eslint/type-utils': 5.44.0_eslint@8.28.0+typescript@4.8.4 + '@typescript-eslint/utils': 5.44.0_eslint@8.28.0+typescript@4.8.4 debug: 4.3.4 eslint: 8.28.0 ignore: 5.2.0 @@ -2578,13 +2578,13 @@ packages: - supports-color dev: true - /@typescript-eslint/experimental-utils/5.39.0_zksrc6ykdxhogxjbhb5axiabwi: + /@typescript-eslint/experimental-utils/5.39.0_eslint@8.28.0+typescript@4.8.4: resolution: {integrity: sha512-n5N9kG/oGu2xXhHzsWzn94s6CWoiUj59FPU2dF2IQZxPftw+q6Jm5sV2vj5qTgAElRooHhrgtl2gxBQDCPt6WA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - '@typescript-eslint/utils': 5.39.0_zksrc6ykdxhogxjbhb5axiabwi + '@typescript-eslint/utils': 5.39.0_eslint@8.28.0+typescript@4.8.4 eslint: 8.28.0 transitivePeerDependencies: - supports-color @@ -2610,7 +2610,7 @@ packages: - supports-color dev: true - /@typescript-eslint/parser/5.44.0_zksrc6ykdxhogxjbhb5axiabwi: + /@typescript-eslint/parser/5.44.0_eslint@8.28.0+typescript@4.8.4: resolution: {integrity: sha512-H7LCqbZnKqkkgQHaKLGC6KUjt3pjJDx8ETDqmwncyb6PuoigYajyAwBGz08VU/l86dZWZgI4zm5k2VaKqayYyA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2665,7 +2665,7 @@ packages: - supports-color dev: true - /@typescript-eslint/type-utils/5.44.0_zksrc6ykdxhogxjbhb5axiabwi: + /@typescript-eslint/type-utils/5.44.0_eslint@8.28.0+typescript@4.8.4: resolution: {integrity: sha512-A1u0Yo5wZxkXPQ7/noGkRhV4J9opcymcr31XQtOzcc5nO/IHN2E2TPMECKWYpM3e6olWEM63fq/BaL1wEYnt/w==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2676,7 +2676,7 @@ packages: optional: true dependencies: '@typescript-eslint/typescript-estree': 5.44.0_typescript@4.8.4 - '@typescript-eslint/utils': 5.44.0_zksrc6ykdxhogxjbhb5axiabwi + '@typescript-eslint/utils': 5.44.0_eslint@8.28.0+typescript@4.8.4 debug: 4.3.4 eslint: 8.28.0 tsutils: 3.21.0_typescript@4.8.4 @@ -2737,7 +2737,7 @@ packages: - supports-color dev: true - /@typescript-eslint/utils/5.39.0_typescript@4.8.4: + /@typescript-eslint/utils/5.39.0_eslint@8.28.0+typescript@4.8.4: resolution: {integrity: sha512-+DnY5jkpOpgj+EBtYPyHRjXampJfC0yUZZzfzLuUWVZvCuKqSdJVC8UhdWipIw7VKNTfwfAPiOWzYkAwuIhiAg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2747,14 +2747,15 @@ packages: '@typescript-eslint/scope-manager': 5.39.0 '@typescript-eslint/types': 5.39.0 '@typescript-eslint/typescript-estree': 5.39.0_typescript@4.8.4 + eslint: 8.28.0 eslint-scope: 5.1.1 - eslint-utils: 3.0.0 + eslint-utils: 3.0.0_eslint@8.28.0 transitivePeerDependencies: - supports-color - typescript dev: true - /@typescript-eslint/utils/5.39.0_zksrc6ykdxhogxjbhb5axiabwi: + /@typescript-eslint/utils/5.39.0_typescript@4.8.4: resolution: {integrity: sha512-+DnY5jkpOpgj+EBtYPyHRjXampJfC0yUZZzfzLuUWVZvCuKqSdJVC8UhdWipIw7VKNTfwfAPiOWzYkAwuIhiAg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2764,15 +2765,14 @@ packages: '@typescript-eslint/scope-manager': 5.39.0 '@typescript-eslint/types': 5.39.0 '@typescript-eslint/typescript-estree': 5.39.0_typescript@4.8.4 - eslint: 8.28.0 eslint-scope: 5.1.1 - eslint-utils: 3.0.0_eslint@8.28.0 + eslint-utils: 3.0.0 transitivePeerDependencies: - supports-color - typescript dev: true - /@typescript-eslint/utils/5.44.0_zksrc6ykdxhogxjbhb5axiabwi: + /@typescript-eslint/utils/5.44.0_eslint@8.28.0+typescript@4.8.4: resolution: {integrity: sha512-fMzA8LLQ189gaBjS0MZszw5HBdZgVwxVFShCO3QN+ws3GlPkcy9YuS3U4wkT6su0w+Byjq3mS3uamy9HE4Yfjw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3483,8 +3483,8 @@ packages: engines: {node: '>=10'} hasBin: true dependencies: - JSONStream: 1.3.5 is-text-path: 1.0.1 + JSONStream: 1.3.5 lodash: 4.17.21 meow: 8.1.2 split2: 3.2.2 @@ -3673,22 +3673,12 @@ packages: /debug/2.6.9: resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true dependencies: ms: 2.0.0 dev: true /debug/3.2.7: resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true dependencies: ms: 2.1.3 dev: true @@ -4028,18 +4018,16 @@ packages: resolution: {integrity: sha512-MSz9Y01ovHekS4RkiY1F5RSO+KvM2CalOnBEFVxJ0yqBAlaAsq4YiaISIMe5C+SOHk/S7/KLmvio83m9i0aNZQ==} engines: {node: '>=14.0.0'} dependencies: - '@typescript-eslint/eslint-plugin': 5.44.0_xweyveqnfveccvpxdpbbnp7sza - '@typescript-eslint/parser': 5.44.0_zksrc6ykdxhogxjbhb5axiabwi + '@typescript-eslint/eslint-plugin': 5.44.0_bd898a920d2d482155f71bc216bff2c8 + '@typescript-eslint/parser': 5.44.0_eslint@8.28.0+typescript@4.8.4 eslint: 8.28.0 - eslint-plugin-import: 2.26.0_vfrilbydaxalswvos6uuh4sxs4 - eslint-plugin-prettier: 4.2.1_5qrnzwqb344w6up62gv3safeoi - eslint-plugin-typescript-sort-keys: 2.1.0_xweyveqnfveccvpxdpbbnp7sza + eslint-plugin-import: 2.26.0_eslint@8.28.0 + eslint-plugin-prettier: 4.2.1_eslint@8.28.0+prettier@2.8.0 + eslint-plugin-typescript-sort-keys: 2.1.0_bd898a920d2d482155f71bc216bff2c8 prettier: 2.8.0 prettier-plugin-package: 1.3.0_prettier@2.8.0 transitivePeerDependencies: - eslint-config-prettier - - eslint-import-resolver-typescript - - eslint-import-resolver-webpack - supports-color - typescript dev: true @@ -4049,57 +4037,34 @@ packages: dependencies: debug: 3.2.7 resolve: 1.22.1 - transitivePeerDependencies: - - supports-color dev: true - /eslint-module-utils/2.7.4_hohserqfhq4k7fjhuck6y26tu4: + /eslint-module-utils/2.7.4_eslint@8.28.0: resolution: {integrity: sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==} engines: {node: '>=4'} peerDependencies: - '@typescript-eslint/parser': '*' eslint: '*' - eslint-import-resolver-node: '*' - eslint-import-resolver-typescript: '*' - eslint-import-resolver-webpack: '*' peerDependenciesMeta: - '@typescript-eslint/parser': - optional: true eslint: optional: true - eslint-import-resolver-node: - optional: true - eslint-import-resolver-typescript: - optional: true - eslint-import-resolver-webpack: - optional: true dependencies: - '@typescript-eslint/parser': 5.44.0_zksrc6ykdxhogxjbhb5axiabwi debug: 3.2.7 eslint: 8.28.0 - eslint-import-resolver-node: 0.3.6 - transitivePeerDependencies: - - supports-color dev: true - /eslint-plugin-import/2.26.0_vfrilbydaxalswvos6uuh4sxs4: + /eslint-plugin-import/2.26.0_eslint@8.28.0: resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==} engines: {node: '>=4'} peerDependencies: - '@typescript-eslint/parser': '*' eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 - peerDependenciesMeta: - '@typescript-eslint/parser': - optional: true dependencies: - '@typescript-eslint/parser': 5.44.0_zksrc6ykdxhogxjbhb5axiabwi array-includes: 3.1.5 array.prototype.flat: 1.3.0 debug: 2.6.9 doctrine: 2.1.0 eslint: 8.28.0 eslint-import-resolver-node: 0.3.6 - eslint-module-utils: 2.7.4_hohserqfhq4k7fjhuck6y26tu4 + eslint-module-utils: 2.7.4_eslint@8.28.0 has: 1.0.3 is-core-module: 2.10.0 is-glob: 4.0.3 @@ -4107,13 +4072,9 @@ packages: object.values: 1.1.5 resolve: 1.22.1 tsconfig-paths: 3.14.1 - transitivePeerDependencies: - - eslint-import-resolver-typescript - - eslint-import-resolver-webpack - - supports-color dev: true - /eslint-plugin-prettier/4.2.1_5qrnzwqb344w6up62gv3safeoi: + /eslint-plugin-prettier/4.2.1_eslint@8.28.0+prettier@2.8.0: resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} engines: {node: '>=12.0.0'} peerDependencies: @@ -4129,7 +4090,7 @@ packages: prettier-linter-helpers: 1.0.0 dev: true - /eslint-plugin-typescript-sort-keys/2.1.0_xweyveqnfveccvpxdpbbnp7sza: + /eslint-plugin-typescript-sort-keys/2.1.0_bd898a920d2d482155f71bc216bff2c8: resolution: {integrity: sha512-ET7ABypdz19m47QnKynzNfWPi4CTNQ5jQQC1X5d0gojIwblkbGiCa5IilsqzBTmqxZ0yXDqKBO/GBkBFQCOFsg==} engines: {node: 10 - 12 || >= 13.9} peerDependencies: @@ -4137,8 +4098,8 @@ packages: eslint: ^5 || ^6 || ^7 || ^8 typescript: ^3 || ^4 dependencies: - '@typescript-eslint/experimental-utils': 5.39.0_zksrc6ykdxhogxjbhb5axiabwi - '@typescript-eslint/parser': 5.44.0_zksrc6ykdxhogxjbhb5axiabwi + '@typescript-eslint/experimental-utils': 5.39.0_eslint@8.28.0+typescript@4.8.4 + '@typescript-eslint/parser': 5.44.0_eslint@8.28.0+typescript@4.8.4 eslint: 8.28.0 json-schema: 0.4.0 natural-compare-lite: 1.4.0 @@ -4502,6 +4463,7 @@ packages: engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} os: [darwin] requiresBuild: true + dev: true optional: true /function-bind/1.1.1: @@ -4687,6 +4649,7 @@ packages: /graphql/16.6.0: resolution: {integrity: sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==} engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0} + dev: true /hard-rejection/2.1.0: resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==} @@ -6171,7 +6134,7 @@ packages: postcss: 8.4.17 dev: true - /postcss-load-config/3.1.4_postcss@8.4.17: + /postcss-load-config/3.1.4_postcss@8.4.17+ts-node@10.9.1: resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==} engines: {node: '>= 10'} peerDependencies: @@ -6185,6 +6148,7 @@ packages: dependencies: lilconfig: 2.0.6 postcss: 8.4.17 + ts-node: 10.9.1_639aa34af525212ca8b3f18639909d00 yaml: 1.10.2 dev: true @@ -6801,7 +6765,7 @@ packages: dependencies: glob: 7.2.3 - /rollup-plugin-postcss/4.0.2_postcss@8.4.17: + /rollup-plugin-postcss/4.0.2_postcss@8.4.17+ts-node@10.9.1: resolution: {integrity: sha512-05EaY6zvZdmvPUDi3uCcAQoESDcYnv8ogJJQRp6V5kZ6J6P7uAVJlrTZcaaA20wTH527YTnKfkAoPxWI/jPp4w==} engines: {node: '>=10'} peerDependencies: @@ -6814,7 +6778,7 @@ packages: p-queue: 6.6.2 pify: 5.0.0 postcss: 8.4.17 - postcss-load-config: 3.1.4_postcss@8.4.17 + postcss-load-config: 3.1.4_postcss@8.4.17+ts-node@10.9.1 postcss-modules: 4.3.1_postcss@8.4.17 promise.series: 0.2.0 resolve: 1.22.1 @@ -6845,6 +6809,7 @@ packages: hasBin: true optionalDependencies: fsevents: 2.3.2 + dev: true /rollup/3.20.2: resolution: {integrity: sha512-3zwkBQl7Ai7MFYQE0y1MeQ15+9jsi7XxfrqwTb/9EK8D9C9+//EBR4M+CuA1KODRaNbFez/lWxA5vhEGZp4MUg==} @@ -6852,6 +6817,7 @@ packages: hasBin: true optionalDependencies: fsevents: 2.3.2 + dev: true /run-parallel/1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} @@ -7015,10 +6981,6 @@ packages: is-fullwidth-code-point: 4.0.0 dev: true - /smob/0.0.6: - resolution: {integrity: sha512-V21+XeNni+tTyiST1MHsa84AQhT1aFZipzPpOFAVB8DkHzwJyjjAmt9bgwnuZiZWnIbMo2duE29wybxv/7HWUw==} - dev: false - /smob/1.0.0: resolution: {integrity: sha512-fnePEPpgGjAdBDk0nV7L9jcStbbcUsKS5TC+RYambCSU9Dm1k2rqDivdg5LBRVWF/NXe0Rq8yfnKKQI08kSXIg==} dev: false @@ -7387,7 +7349,7 @@ packages: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} dev: false - /ts-node/10.9.1_monkgsxveuqszkft6gddtee5aa: + /ts-node/10.9.1_639aa34af525212ca8b3f18639909d00: resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true peerDependencies: