From a18750321378619cd16fb3a33b9aae53661744a1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 10 Jun 2023 16:21:12 +0800 Subject: [PATCH] fix(deps): update dependency @withtyped packages to ^0.11.0 (#4007) * fix(deps): update dependency @withtyped packages to ^0.11.0 * refactor: fix build --------- Co-authored-by: Gao Sun --- package.json | 4 +++ packages/app-insights/package.json | 5 --- packages/cloud/package.json | 4 +-- packages/console/src/App.tsx | 2 +- packages/schemas/package.json | 2 +- packages/schemas/src/models/tenants.ts | 2 +- packages/schemas/src/seeds/tenant.ts | 2 +- packages/shared/package.json | 4 --- packages/toolkit/core-kit/package.json | 10 ++++-- pnpm-lock.yaml | 48 +++++++++++++++----------- 10 files changed, 44 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index 4e3df266d..9bf2420ac 100644 --- a/package.json +++ b/package.json @@ -49,5 +49,9 @@ }, "dependencies": { "@logto/cli": "workspace:^1.1.0" + }, + "//": "@see https://parceljs.org/features/dependency-resolution/#package-exports", + "@parcel/resolver-default": { + "packageExports": true } } diff --git a/packages/app-insights/package.json b/packages/app-insights/package.json index 5d7be6049..7064ae0b2 100644 --- a/packages/app-insights/package.json +++ b/packages/app-insights/package.json @@ -18,11 +18,6 @@ "types": "./lib/react/index.d.ts" } }, - "//": "This field is for parcel. It is still needed after https://github.com/parcel-bundler/parcel/pull/8807 published.", - "alias": { - "./react": "./lib/react/index.js", - "./custom-event": "./lib/custom-event.js" - }, "publishConfig": { "access": "public" }, diff --git a/packages/cloud/package.json b/packages/cloud/package.json index f32c35bb3..f54f39107 100644 --- a/packages/cloud/package.json +++ b/packages/cloud/package.json @@ -30,8 +30,8 @@ "@logto/schemas": "workspace:^1.5.0", "@logto/shared": "workspace:^2.0.0", "@silverhand/essentials": "^2.5.0", - "@withtyped/postgres": "^0.10.0", - "@withtyped/server": "^0.10.0", + "@withtyped/postgres": "^0.11.0", + "@withtyped/server": "^0.11.0", "accepts": "^1.3.8", "chalk": "^5.0.0", "decamelize": "^6.0.0", diff --git a/packages/console/src/App.tsx b/packages/console/src/App.tsx index 8dbbc0bd3..bae53e005 100644 --- a/packages/console/src/App.tsx +++ b/packages/console/src/App.tsx @@ -6,7 +6,7 @@ import { conditionalArray, deduplicate } from '@silverhand/essentials'; import { useContext, useMemo } from 'react'; import { Helmet } from 'react-helmet'; -import 'overlayscrollbars/styles/overlayscrollbars.css'; +import 'overlayscrollbars/overlayscrollbars.css'; import './scss/normalized.scss'; import './scss/overlayscrollbars.scss'; diff --git a/packages/schemas/package.json b/packages/schemas/package.json index c5d7a7e7a..a212964be 100644 --- a/packages/schemas/package.json +++ b/packages/schemas/package.json @@ -86,7 +86,7 @@ "@logto/phrases": "workspace:^1.4.0", "@logto/phrases-ui": "workspace:^1.2.0", "@logto/shared": "workspace:^2.0.0", - "@withtyped/server": "^0.10.0", + "@withtyped/server": "^0.11.0", "zod": "^3.20.2" } } diff --git a/packages/schemas/src/models/tenants.ts b/packages/schemas/src/models/tenants.ts index 2c5fb771f..08643bfab 100644 --- a/packages/schemas/src/models/tenants.ts +++ b/packages/schemas/src/models/tenants.ts @@ -1,4 +1,4 @@ -import { createModel } from '@withtyped/server'; +import { createModel } from '@withtyped/server/model'; import { TenantTag } from '../index.js'; diff --git a/packages/schemas/src/seeds/tenant.ts b/packages/schemas/src/seeds/tenant.ts index 4804577b7..51a3f4ecd 100644 --- a/packages/schemas/src/seeds/tenant.ts +++ b/packages/schemas/src/seeds/tenant.ts @@ -1,4 +1,4 @@ -import type { InferModelType } from '@withtyped/server'; +import type { InferModelType } from '@withtyped/server/model'; import type { Tenants } from '../models/tenants.js'; diff --git a/packages/shared/package.json b/packages/shared/package.json index 74e1b89d2..0f83d26c4 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -22,10 +22,6 @@ "types": "./lib/esm/index.d.ts" } }, - "//": "This field is for parcel. It is still needed after https://github.com/parcel-bundler/parcel/pull/8807 published.", - "alias": { - "./universal": "./lib/universal.js" - }, "publishConfig": { "access": "public" }, diff --git a/packages/toolkit/core-kit/package.json b/packages/toolkit/core-kit/package.json index e3f477068..0dfea4ac5 100644 --- a/packages/toolkit/core-kit/package.json +++ b/packages/toolkit/core-kit/package.json @@ -11,9 +11,13 @@ "type": "module", "main": "./lib/index.js", "exports": { - "default": "./lib/index.js", - "types": "./lib/index.d.ts", - "import": "./lib/index.js" + ".": { + "default": "./lib/index.js", + "types": "./lib/index.d.ts", + "import": "./lib/index.js" + }, + "./declaration": "./declaration/index.ts", + "./scss/*": "./scss/*.scss" }, "types": "./lib/index.d.ts", "files": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e816f8e7c..1e5e1757e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -252,11 +252,11 @@ importers: specifier: ^2.5.0 version: 2.5.0 '@withtyped/postgres': - specifier: ^0.10.0 - version: 0.10.0(@withtyped/server@0.10.0) + specifier: ^0.11.0 + version: 0.11.0(@withtyped/server@0.11.0) '@withtyped/server': - specifier: ^0.10.0 - version: 0.10.0(zod@3.20.2) + specifier: ^0.11.0 + version: 0.11.0(zod@3.20.2) accepts: specifier: ^1.3.8 version: 1.3.8 @@ -3556,8 +3556,8 @@ importers: specifier: workspace:^2.0.0 version: link:../shared '@withtyped/server': - specifier: ^0.10.0 - version: 0.10.0(zod@3.20.2) + specifier: ^0.11.0 + version: 0.11.0(zod@3.20.2) zod: specifier: ^3.20.2 version: 3.20.2 @@ -7073,8 +7073,8 @@ packages: engines: {node: '>=6.0.0'} dev: true - /@jridgewell/source-map@0.3.2: - resolution: {integrity: sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==} + /@jridgewell/source-map@0.3.3: + resolution: {integrity: sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==} dependencies: '@jridgewell/gen-mapping': 0.3.2 '@jridgewell/trace-mapping': 0.3.17 @@ -8522,7 +8522,7 @@ packages: dependencies: '@rollup/pluginutils': 5.0.2(rollup@3.8.0) '@types/resolve': 1.20.2 - deepmerge: 4.2.2 + deepmerge: 4.3.1 is-builtin-module: 3.2.0 is-module: 1.0.0 resolve: 1.22.1 @@ -9808,21 +9808,21 @@ packages: eslint-visitor-keys: 3.3.0 dev: true - /@withtyped/postgres@0.10.0(@withtyped/server@0.10.0): - resolution: {integrity: sha512-EnFcgLLEbFaVzhkX1IkOwdYJ11mFqMAbQX87M5CzENv2gHMvEnsrxswilJ70aql918Uqrae693JpJmaidzNmQw==} + /@withtyped/postgres@0.11.0(@withtyped/server@0.11.0): + resolution: {integrity: sha512-PHnx6ake/MDdyy4sZXS/7l5XNBtjqlPSqSHrlmCYUXYxUV0sHSrXECKxX7deAvWZtcHVh9VaWEpiQBhFS06Vig==} peerDependencies: - '@withtyped/server': ^0.10.0 + '@withtyped/server': ^0.11.0 dependencies: '@types/pg': 8.6.6 - '@withtyped/server': 0.10.0(zod@3.20.2) + '@withtyped/server': 0.11.0(zod@3.20.2) '@withtyped/shared': 0.2.0 pg: 8.8.0 transitivePeerDependencies: - pg-native dev: false - /@withtyped/server@0.10.0(zod@3.20.2): - resolution: {integrity: sha512-eTL24K9cIXGxhkoteGlj9Vo+DpXcxzmwFGbEIfc4XsuEKq/vIW6LrsDFjjmG8Z7XWF3rfq5FD7JRbThapBv3Eg==} + /@withtyped/server@0.11.0(zod@3.20.2): + resolution: {integrity: sha512-InF3g9uv63ImK/sTIywcwX9tg2KnyFOlYsqeVI1WDjV1eTdzVxRJInD8iA08+U10S/dhBimukSx2Bfjwt8MWiw==} peerDependencies: zod: ^3.19.1 dependencies: @@ -9900,6 +9900,12 @@ packages: hasBin: true dev: true + /acorn@8.8.2: + resolution: {integrity: sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==} + engines: {node: '>=0.4.0'} + hasBin: true + dev: true + /agent-base@6.0.2: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} @@ -18067,7 +18073,7 @@ packages: filesize: 10.0.7 gzip-size: 7.0.0 rollup: 3.8.0 - terser: 5.15.1 + terser: 5.17.7 dev: true /rollup@3.8.0: @@ -19201,13 +19207,13 @@ packages: engines: {node: '>=8'} dev: true - /terser@5.15.1: - resolution: {integrity: sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==} + /terser@5.17.7: + resolution: {integrity: sha512-/bi0Zm2C6VAexlGgLlVxA0P2lru/sdLyfCVaRMfKVo9nWxbmz7f/sD8VPybPeSUJaJcwmCJis9pBIhcVcG1QcQ==} engines: {node: '>=10'} hasBin: true dependencies: - '@jridgewell/source-map': 0.3.2 - acorn: 8.8.1 + '@jridgewell/source-map': 0.3.3 + acorn: 8.8.2 commander: 2.20.3 source-map-support: 0.5.21 dev: true @@ -19377,7 +19383,7 @@ packages: '@tsconfig/node14': 1.0.1 '@tsconfig/node16': 1.0.2 '@types/node': 18.11.18 - acorn: 8.8.1 + acorn: 8.8.2 acorn-walk: 8.2.0 arg: 4.1.3 create-require: 1.1.1