Skip to content

Commit

Permalink
Fix double Pxth BrandKey declaration
Browse files Browse the repository at this point in the history
  • Loading branch information
ArtiomTr committed Nov 15, 2024
1 parent 26a4d43 commit 26ecf7d
Show file tree
Hide file tree
Showing 25 changed files with 46 additions and 37 deletions.
9 changes: 9 additions & 0 deletions .changeset/empty-beans-rule.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@reactive-forms/autosave': minor
'stocked': minor
'@reactive-forms/core': minor
'pxth': minor
'@reactive-forms/x': minor
---

Fix double Pxth BrandKey declaration
2 changes: 1 addition & 1 deletion packages/autosave/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"types": "./dist/index.d.ts",
"exports": {
"import": {
"types": "./dist/index.d.mts",
"types": "./dist/index.d.ts",
"import": "./dist/index.mjs"
},
"require": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"types": "./dist/index.d.ts",
"exports": {
"import": {
"types": "./dist/index.d.mts",
"types": "./dist/index.d.ts",
"import": "./dist/index.mjs"
},
"require": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/hooks/useFieldValidator.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useRef } from 'react';
import merge from 'lodash/merge';
import merge from 'lodash/merge.js';
import { Pxth } from 'pxth';
import type { BaseSchema } from 'yup';

Expand Down
8 changes: 4 additions & 4 deletions packages/core/src/hooks/useForm.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useCallback, useEffect, useMemo, useRef } from 'react';
import cloneDeep from 'lodash/cloneDeep';
import isEqual from 'lodash/isEqual';
import merge from 'lodash/merge';
import mergeWith from 'lodash/mergeWith';
import cloneDeep from 'lodash/cloneDeep.js';
import isEqual from 'lodash/isEqual.js';
import merge from 'lodash/merge.js';
import mergeWith from 'lodash/mergeWith.js';
import { createPxth, deepGet, deepSet, Pxth } from 'pxth';
import { BatchUpdate } from 'stocked';
import invariant from 'tiny-invariant';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/hooks/useValidationRegistry.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useCallback, useRef } from 'react';
import merge from 'lodash/merge';
import merge from 'lodash/merge.js';
import { createPxth, deepGet, deepSet, getPxthSegments, isInnerPxth, Pxth, samePxth } from 'pxth';
import { PxthMap } from 'stocked';
import invariant from 'tiny-invariant';
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/utils/deepRemoveEmpty.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import isEmpty from 'lodash/isEmpty';
import isNil from 'lodash/isNil';
import isEmpty from 'lodash/isEmpty.js';
import isNil from 'lodash/isNil.js';

export const deepRemoveEmpty = (obj: object): object | undefined => {
if (Array.isArray(obj)) {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/utils/excludeOverlaps.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import unset from 'lodash/unset';
import unset from 'lodash/unset.js';
import { RootPathToken } from 'pxth';

import { getDifferenceMap } from './getDifferenceMap';
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/utils/getDifferenceMap.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import isEqual from 'lodash/isEqual';
import uniq from 'lodash/uniq';
import isEqual from 'lodash/isEqual.js';
import uniq from 'lodash/uniq.js';
import { RootPath, RootPathToken } from 'pxth';

import { flattenObject } from './flattenObject';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/utils/joinPaths.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import isNil from 'lodash/isNil';
import isNil from 'lodash/isNil.js';
import { RootPath, RootPathToken } from 'pxth';

export const joinPaths = (...parts: Array<string | null | false | RootPath | number>) =>
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/utils/mergeErrors.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import isPlainObject from 'lodash/isPlainObject';
import mergeWith from 'lodash/mergeWith';
import isPlainObject from 'lodash/isPlainObject.js';
import mergeWith from 'lodash/mergeWith.js';

const errorsMergeCustomizer = (target: unknown, source: unknown): unknown => {
if (Array.isArray(target) && isPlainObject(source)) {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/utils/overrideMerge.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import cloneDeep from 'lodash/cloneDeep';
import isObject from 'lodash/isObject';
import cloneDeep from 'lodash/cloneDeep.js';
import isObject from 'lodash/isObject.js';

export const overrideMerge = (object: object, source: object) => {
object = cloneDeep(object);
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/utils/setNestedValues.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import isObject from 'lodash/isObject';
import isObject from 'lodash/isObject.js';

import { NestedObject } from '../typings/NestedObject';

Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/utils/yupToFormErrors.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import get from 'lodash/get';
import set from 'lodash/set';
import toPath from 'lodash/toPath';
import get from 'lodash/get.js';
import set from 'lodash/set.js';
import toPath from 'lodash/toPath.js';
import { ValidationError } from 'yup';

import { getErrorPath } from '../constants';
Expand Down
2 changes: 1 addition & 1 deletion packages/pxth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"import": "./dist/index.js"
},
"require": {
"types": "./dist/index.d.cts",
"types": "./dist/index.d.ts",
"require": "./dist/index.cjs"
}
},
Expand Down
2 changes: 1 addition & 1 deletion packages/pxth/src/deepGet.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import get from 'lodash/get';
import get from 'lodash/get.js';

import { getPxthSegments } from './getPxthSegments';
import type { Pxth } from './Pxth';
Expand Down
2 changes: 1 addition & 1 deletion packages/pxth/src/deepSet.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import set from 'lodash/set';
import set from 'lodash/set.js';

import { getPxthSegments } from './getPxthSegments';
import type { Pxth } from './Pxth';
Expand Down
2 changes: 1 addition & 1 deletion packages/pxth/src/parseSegmentsFromString.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import toPath from 'lodash/toPath';
import toPath from 'lodash/toPath.js';

import type { RootPath } from './RootPath';
import { RootPathToken } from '.';
Expand Down
2 changes: 1 addition & 1 deletion packages/stocked/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"import": "./dist/index.js"
},
"require": {
"types": "./dist/index.d.cts",
"types": "./dist/index.d.ts",
"require": "./dist/index.cjs"
}
},
Expand Down
4 changes: 2 additions & 2 deletions packages/stocked/src/hooks/useStock.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { SetStateAction, useCallback, useMemo } from 'react';
import cloneDeep from 'lodash/cloneDeep';
import isFunction from 'lodash/isFunction';
import cloneDeep from 'lodash/cloneDeep.js';
import isFunction from 'lodash/isFunction.js';
import { createPxth, deepGet, deepSet, Pxth } from 'pxth';

import { useDebugStock } from './useDebugStock';
Expand Down
4 changes: 2 additions & 2 deletions packages/stocked/src/typings/MappingProxy.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { SetStateAction } from 'react';
import isFunction from 'lodash/isFunction';
import isNil from 'lodash/isNil';
import isFunction from 'lodash/isFunction.js';
import isNil from 'lodash/isNil.js';
import { deepGet, deepSet, isInnerPxth, joinPxths, longestCommonPxth, Pxth, relativePxth, samePxth } from 'pxth';
import invariant from 'tiny-invariant';

Expand Down
6 changes: 3 additions & 3 deletions packages/stocked/src/utils/useInterceptors.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { SetStateAction, useCallback, useEffect } from 'react';
import cloneDeep from 'lodash/cloneDeep';
import isFunction from 'lodash/isFunction';
import unset from 'lodash/unset';
import cloneDeep from 'lodash/cloneDeep.js';
import isFunction from 'lodash/isFunction.js';
import unset from 'lodash/unset.js';
import { deepGet, deepSet, getPxthSegments, isInnerPxth, Pxth, samePxth } from 'pxth';
import invariant from 'tiny-invariant';

Expand Down
2 changes: 1 addition & 1 deletion packages/stocked/test/typings/MappingProxy.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { SetStateAction } from 'react';
import isFunction from 'lodash/isFunction';
import isFunction from 'lodash/isFunction.js';
import { createPxth, deepGet, deepSet, getPxthSegments, Pxth, samePxth } from 'pxth';
import { describe, expect, it, Mock, vi } from 'vitest';

Expand Down
2 changes: 1 addition & 1 deletion packages/x/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"types": "./dist/index.d.ts",
"exports": {
"import": {
"types": "./dist/index.d.mts",
"types": "./dist/index.d.ts",
"import": "./dist/index.mjs"
},
"require": {
Expand Down
2 changes: 1 addition & 1 deletion packages/x/src/useConverterField.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useCallback, useEffect, useRef, useState } from 'react';
import { FieldConfig, FieldContext, FieldError, FieldTouched, useField, useFieldValidator } from '@reactive-forms/core';
import isObject from 'lodash/isObject';
import isObject from 'lodash/isObject.js';

export class ConversionError extends Error {
public constructor(errorMessage: string) {
Expand Down

0 comments on commit 26ecf7d

Please sign in to comment.