diff --git a/package-lock.json b/package-lock.json index e962c8886c632a..6c33efb2ac80c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41720,15 +41720,6 @@ "react-dom": "^0.14.0 || ^15.0.0 || ^16.0.0" } }, - "node_modules/react-colorful": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.3.1.tgz", - "integrity": "sha512-nkP1w1LGe8PzhtOQO10xSDTsMWAYVj/Wm5c7ORk7CBngjCE7hHsknFRtosT5qMYkwWs8wSiU0sBwZ8dyzRbNEQ==", - "peerDependencies": { - "react": ">=16.8.0", - "react-dom": ">=16.8.0" - } - }, "node_modules/react-day-picker": { "version": "9.7.0", "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-9.7.0.tgz", @@ -53040,7 +53031,7 @@ "memize": "^2.1.0", "path-to-regexp": "^6.2.1", "re-resizable": "^6.4.0", - "react-colorful": "^5.3.1", + "react-colorful": "^5.6.1", "react-day-picker": "^9.7.0", "remove-accents": "^0.5.0", "uuid": "^9.0.1" @@ -53097,6 +53088,16 @@ "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", "license": "MIT" }, + "packages/components/node_modules/react-colorful": { + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.6.1.tgz", + "integrity": "sha512-1exovf0uGTGyq5mXQT0zgQ80uvj2PCwvF8zY1RN9/vbJVSjSo3fsB/4L3ObbF7u70NduSiK4xu4Y6q1MHoUGEw==", + "license": "MIT", + "peerDependencies": { + "react": ">=16.8.0", + "react-dom": ">=16.8.0" + } + }, "packages/compose": { "name": "@wordpress/compose", "version": "7.37.0", diff --git a/packages/components/package.json b/packages/components/package.json index f876c59b19e8b8..74ea33825e7305 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -94,7 +94,7 @@ "memize": "^2.1.0", "path-to-regexp": "^6.2.1", "re-resizable": "^6.4.0", - "react-colorful": "^5.3.1", + "react-colorful": "^5.6.1", "react-day-picker": "^9.7.0", "remove-accents": "^0.5.0", "uuid": "^9.0.1" diff --git a/packages/components/src/context/context-system-provider.js b/packages/components/src/context/context-system-provider.js index 5ca535bfa22c54..bfea45192f19c7 100644 --- a/packages/components/src/context/context-system-provider.js +++ b/packages/components/src/context/context-system-provider.js @@ -3,6 +3,7 @@ */ import deepmerge from 'deepmerge'; import fastDeepEqual from 'fast-deep-equal/es6/index.js'; +// @ts-expect-error https://github.com/jonschlinkert/is-plain-object/pull/47 import { isPlainObject } from 'is-plain-object'; /** diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts index e093cba6213e4f..07b1a6b7125c01 100644 --- a/packages/components/src/index.ts +++ b/packages/components/src/index.ts @@ -218,6 +218,12 @@ export { useSlot as __experimentalUseSlot, useSlotFills as __experimentalUseSlotFills, } from './slot-fill'; +export type { + SlotKey, + SlotComponentProps, + FillComponentProps, + DistributiveOmit, +} from './slot-fill/types'; export { default as __experimentalStyleProvider } from './style-provider'; export { ZStack as __experimentalZStack } from './z-stack'; diff --git a/packages/eslint-plugin/tsconfig.json b/packages/eslint-plugin/tsconfig.json index a769c50a12df4c..05bbe687390e50 100644 --- a/packages/eslint-plugin/tsconfig.json +++ b/packages/eslint-plugin/tsconfig.json @@ -2,7 +2,6 @@ "$schema": "https://json.schemastore.org/tsconfig.json", "extends": "../../tsconfig.base.json", "compilerOptions": { - "module": "CommonJS", "rootDir": "rules" }, "references": [ { "path": "../prettier-config" } ], diff --git a/packages/jest-console/src/declarations.d.ts b/packages/jest-console/declarations.d.ts similarity index 100% rename from packages/jest-console/src/declarations.d.ts rename to packages/jest-console/declarations.d.ts diff --git a/packages/jest-console/index.d.ts b/packages/jest-console/index.d.ts deleted file mode 100644 index a9100a5b0fd2b1..00000000000000 --- a/packages/jest-console/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -// This ensures types are available both in the monorepo (before build) and for npm consumers -/// diff --git a/packages/jest-console/package.json b/packages/jest-console/package.json index b158d9ce72a356..c378b2b81dd811 100644 --- a/packages/jest-console/package.json +++ b/packages/jest-console/package.json @@ -25,22 +25,21 @@ "npm": ">=8.19.2" }, "files": [ - "src", "build", "build-module", - "build-types" + "declarations.d.ts" ], "main": "build/index.cjs", "module": "build-module/index.mjs", "exports": { ".": { - "types": "./build-types/index.d.ts", + "types": "./declarations.d.ts", "import": "./build-module/index.mjs", "require": "./build/index.cjs" }, "./package.json": "./package.json" }, - "types": "index.d.ts", + "types": "declarations.d.ts", "dependencies": { "jest-matcher-utils": "^29.6.2", "jest-mock": "^29.6.2" diff --git a/packages/jest-console/tsconfig.json b/packages/jest-console/tsconfig.json index 45d5d4213b4d57..0e6abbff0f629f 100644 --- a/packages/jest-console/tsconfig.json +++ b/packages/jest-console/tsconfig.json @@ -2,7 +2,8 @@ "$schema": "https://json.schemastore.org/tsconfig.json", "extends": "../../tsconfig.base.json", "compilerOptions": { - "types": [ "jest" ] + "types": [ "jest" ], + "noEmit": true }, - "files": [ "global.d.ts", "src/declarations.d.ts" ] + "files": [ "global.d.ts", "declarations.d.ts" ] } diff --git a/packages/report-flaky-tests/tsconfig.json b/packages/report-flaky-tests/tsconfig.json index 26fcd6f5e51c6f..ca8ad40492623d 100644 --- a/packages/report-flaky-tests/tsconfig.json +++ b/packages/report-flaky-tests/tsconfig.json @@ -2,7 +2,6 @@ "$schema": "https://json.schemastore.org/tsconfig.json", "extends": "../../tsconfig.base.json", "compilerOptions": { - "module": "CommonJS", "types": [ "jest" ] }, "exclude": [ "src/__tests__", "src/__fixtures__" ] diff --git a/packages/sync/src/y-utilities/y-multidoc-undomanager.d.ts b/packages/sync/src/y-utilities/y-multidoc-undomanager.d.ts new file mode 100644 index 00000000000000..f74a4793b3abf0 --- /dev/null +++ b/packages/sync/src/y-utilities/y-multidoc-undomanager.d.ts @@ -0,0 +1,32 @@ +import { type Observable } from 'lib0/observable'; +import { type UndoManager, type Doc, type AbstractType } from 'yjs'; + +export class YMultiDocUndoManager extends Observable< string > { + docs: Map< Doc, UndoManager >; + trackedOrigins: Set< unknown >; + undoStack: Array< UndoManager >; + redoStack: Array< UndoManager >; + + constructor( + typeScope?: AbstractType< any > | Array< AbstractType< any > >, + opts?: NonNullable< ConstructorParameters< typeof UndoManager >[ 1 ] > + ); + + addToScope( + ytypes: Array< AbstractType< any > > | AbstractType< any > + ): void; + addTrackedOrigin( origin: unknown ): void; + removeTrackedOrigin( origin: unknown ): void; + undo(): unknown; + redo(): unknown; + clear( clearUndoStack?: boolean, clearRedoStack?: boolean ): void; + stopCapturing(): void; + canUndo(): boolean; + canRedo(): boolean; + destroy(): void; +} + +/** + * @deprecated Use YMultiDocUndoManager instead + */ +export { YMultiDocUndoManager as MultiDocUndoManager }; diff --git a/packages/sync/tsconfig.json b/packages/sync/tsconfig.json index f817648aab1d4c..3dee2350432214 100644 --- a/packages/sync/tsconfig.json +++ b/packages/sync/tsconfig.json @@ -4,6 +4,7 @@ "compilerOptions": { "types": [ "node" ] }, + "exclude": [ "src/y-utilities/y-multidoc-undomanager.js" ], "references": [ { "path": "../hooks" }, { "path": "../undo-manager" }, diff --git a/tsconfig.base.json b/tsconfig.base.json index ccbd160062f0a2..e8ed12c96dfc88 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -6,7 +6,7 @@ "allowSyntheticDefaultImports": true, "jsx": "preserve", "target": "esnext", - "module": "esnext", + "module": "preserve", "lib": [ "DOM", "DOM.Iterable", "ESNext" ], "declaration": true, "declarationMap": true, @@ -24,7 +24,7 @@ "noFallthroughCasesInSwitch": true, /* Module Resolution Options */ - "moduleResolution": "node", + "moduleResolution": "bundler", /* This needs to be false so our types are possible to consume without setting this */ "esModuleInterop": false,