From 81da0952794ee90433e86b322cf924cede39c99c Mon Sep 17 00:00:00 2001 From: Tyler Liu Date: Mon, 27 Jan 2025 11:11:06 -0800 Subject: [PATCH] Try new way to compile --- package.json | 4 ++-- packages/core/package.json | 4 ++-- packages/core/tsconfig.json | 3 --- packages/extensions/authorize-uri/package.json | 4 ++-- packages/extensions/authorize-uri/src/index.ts | 4 ++-- packages/extensions/authorize-uri/tsconfig.json | 3 --- packages/extensions/auto-refresh/package.json | 4 ++-- packages/extensions/auto-refresh/src/index.ts | 2 +- packages/extensions/auto-refresh/tsconfig.json | 3 --- packages/extensions/events/package.json | 4 ++-- packages/extensions/events/src/index.ts | 8 ++++---- packages/extensions/events/tsconfig.json | 3 --- packages/extensions/rate-limit/package.json | 4 ++-- packages/extensions/rate-limit/tsconfig.json | 3 --- packages/extensions/rcsdk/package.json | 4 ++-- packages/extensions/rcsdk/src/index.ts | 6 +++--- packages/extensions/rcsdk/tsconfig.json | 3 --- packages/extensions/retry/package.json | 4 ++-- packages/extensions/retry/src/index.ts | 6 +++--- packages/extensions/retry/tsconfig.json | 3 --- packages/extensions/ws/package.json | 4 ++-- packages/extensions/ws/src/index.ts | 8 ++++---- packages/extensions/ws/src/rest.ts | 4 ++-- packages/extensions/ws/src/subscription.ts | 6 +++--- packages/extensions/ws/src/types.ts | 2 +- packages/extensions/ws/tsconfig.json | 3 --- test/events-extension.spec.ts | 2 +- test/exceptions.spec.ts | 4 ++-- test/fax.spec.ts | 8 ++++---- test/low-level-api.spec.ts | 6 +++--- test/mms.spec.ts | 4 ++-- test/schedule-meeting.spec.ts | 2 +- 32 files changed, 54 insertions(+), 78 deletions(-) diff --git a/package.json b/package.json index 528b3c287..07b7b6e18 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,9 @@ "test" ], "scripts": { - "compile": "lerna exec tsc --scope=@rc-ex/core && lerna exec tsc --no-private --ignore=@rc-ex/core", + "compile": "lerna exec tsc --scope=@rc-ex/core && lerna exec tsc --no-private --ignore=@rc-ex/core && lerna exec 'cp -r src lib' --no-private", "prepublishOnly": "yarn reset && yarn compile", - "reset": "lerna exec 'rm -rf lib'", + "reset": "lerna exec 'rm -rf lib' && yarn delete-js", "test": "yarn workspace @rc-ex/test run jest -w 1 --detectOpenHandles -c jest.config.ts $t", "upgrade-all": "yarn-upgrade-all -W && yarn workspaces run yarn-upgrade-all && yarn install", "delete-js": "find . -type f \\( -name \"*.js\" -o -name \"*.d.ts\" -o -name \"*.js.map\" \\) -not -path \"*/node_modules/*\" -exec rm -f {} +" diff --git a/packages/core/package.json b/packages/core/package.json index 8431da1a1..3cf18f69e 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -5,8 +5,8 @@ "author": "Tyler Liu ", "homepage": "https://github.com/ringcentral/ringcentral-extensible/tree/master/packages/core", "license": "MIT", - "main": "lib/index.js", - "types": "lib/index.d.ts", + "main": "src/index.js", + "types": "src/index.d.ts", "repository": { "type": "git", "url": "git+https://github.com/ringcentral/ringcentral-extensible.git" diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index 1b551f4e9..596e2cf72 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -1,7 +1,4 @@ { "extends": "../../tsconfig.json", - "compilerOptions": { - "outDir": "lib" - }, "include": ["src"] } diff --git a/packages/extensions/authorize-uri/package.json b/packages/extensions/authorize-uri/package.json index 045d21f78..bb8ba99ae 100644 --- a/packages/extensions/authorize-uri/package.json +++ b/packages/extensions/authorize-uri/package.json @@ -5,8 +5,8 @@ "author": "Tyler Liu ", "homepage": "https://github.com/ringcentral/ringcentral-extensible/tree/master/packages/extensions/authorize-uri", "license": "MIT", - "main": "lib/index.js", - "types": "lib/index.d.ts", + "main": "src/index.js", + "types": "src/index.d.ts", "repository": { "type": "git", "url": "git+https://github.com/ringcentral/ringcentral-extensible.git" diff --git a/packages/extensions/authorize-uri/src/index.ts b/packages/extensions/authorize-uri/src/index.ts index 3f7263e0a..1db3d4ea1 100644 --- a/packages/extensions/authorize-uri/src/index.ts +++ b/packages/extensions/authorize-uri/src/index.ts @@ -1,6 +1,6 @@ import type RingCentral from "@rc-ex/core"; -import SdkExtension from "@rc-ex/core/lib/SdkExtension"; -import type AuthorizeRequest from "@rc-ex/core/lib/definitions/AuthorizeRequest"; +import SdkExtension from "@rc-ex/core/src/SdkExtension"; +import type AuthorizeRequest from "@rc-ex/core/src/definitions/AuthorizeRequest"; import type { QueryDataMap } from "urijs"; import URI from "urijs"; import { createHash, randomBytes } from "crypto"; diff --git a/packages/extensions/authorize-uri/tsconfig.json b/packages/extensions/authorize-uri/tsconfig.json index 62676b00a..9b376c2b1 100644 --- a/packages/extensions/authorize-uri/tsconfig.json +++ b/packages/extensions/authorize-uri/tsconfig.json @@ -1,7 +1,4 @@ { "extends": "../../../tsconfig.json", - "compilerOptions": { - "outDir": "lib" - }, "include": ["src"] } diff --git a/packages/extensions/auto-refresh/package.json b/packages/extensions/auto-refresh/package.json index 2f5727080..4e5e9a98f 100644 --- a/packages/extensions/auto-refresh/package.json +++ b/packages/extensions/auto-refresh/package.json @@ -5,8 +5,8 @@ "author": "Tyler Liu ", "homepage": "https://github.com/ringcentral/ringcentral-extensible/tree/master/packages/extensions/auto-refresh", "license": "MIT", - "main": "lib/index.js", - "types": "lib/index.d.ts", + "main": "src/index.js", + "types": "src/index.d.ts", "repository": { "type": "git", "url": "git+https://github.com/ringcentral/ringcentral-extensible.git" diff --git a/packages/extensions/auto-refresh/src/index.ts b/packages/extensions/auto-refresh/src/index.ts index 7d24027a1..6474eb4b2 100644 --- a/packages/extensions/auto-refresh/src/index.ts +++ b/packages/extensions/auto-refresh/src/index.ts @@ -1,5 +1,5 @@ import type RingCentral from "@rc-ex/core"; -import SdkExtension from "@rc-ex/core/lib/SdkExtension"; +import SdkExtension from "@rc-ex/core/src/SdkExtension"; export interface AutoRefreshOptions { interval: number; diff --git a/packages/extensions/auto-refresh/tsconfig.json b/packages/extensions/auto-refresh/tsconfig.json index 62676b00a..9b376c2b1 100644 --- a/packages/extensions/auto-refresh/tsconfig.json +++ b/packages/extensions/auto-refresh/tsconfig.json @@ -1,7 +1,4 @@ { "extends": "../../../tsconfig.json", - "compilerOptions": { - "outDir": "lib" - }, "include": ["src"] } diff --git a/packages/extensions/events/package.json b/packages/extensions/events/package.json index d113c9431..b7751a877 100644 --- a/packages/extensions/events/package.json +++ b/packages/extensions/events/package.json @@ -5,8 +5,8 @@ "author": "Tyler Liu ", "homepage": "https://github.com/ringcentral/ringcentral-extensible/tree/master/packages/extensions/events", "license": "MIT", - "main": "lib/index.js", - "types": "lib/index.d.ts", + "main": "src/index.js", + "types": "src/index.d.ts", "repository": { "type": "git", "url": "git+https://github.com/ringcentral/ringcentral-extensible.git" diff --git a/packages/extensions/events/src/index.ts b/packages/extensions/events/src/index.ts index 20b765fa3..62e19297b 100644 --- a/packages/extensions/events/src/index.ts +++ b/packages/extensions/events/src/index.ts @@ -3,10 +3,10 @@ import type { RestMethod, RestRequestConfig, RestResponse, -} from "@rc-ex/core/lib/types"; -import SdkExtension from "@rc-ex/core/lib/SdkExtension"; -import type GetTokenRequest from "@rc-ex/core/lib/definitions/GetTokenRequest"; -import RestException from "@rc-ex/core/lib/RestException"; +} from "@rc-ex/core/src/types"; +import SdkExtension from "@rc-ex/core/src/SdkExtension"; +import type GetTokenRequest from "@rc-ex/core/src/definitions/GetTokenRequest"; +import RestException from "@rc-ex/core/src/RestException"; import { EventEmitter } from "events"; export enum Events { diff --git a/packages/extensions/events/tsconfig.json b/packages/extensions/events/tsconfig.json index 62676b00a..9b376c2b1 100644 --- a/packages/extensions/events/tsconfig.json +++ b/packages/extensions/events/tsconfig.json @@ -1,7 +1,4 @@ { "extends": "../../../tsconfig.json", - "compilerOptions": { - "outDir": "lib" - }, "include": ["src"] } diff --git a/packages/extensions/rate-limit/package.json b/packages/extensions/rate-limit/package.json index fd6feefc7..e9f2d42e8 100644 --- a/packages/extensions/rate-limit/package.json +++ b/packages/extensions/rate-limit/package.json @@ -5,8 +5,8 @@ "author": "Tyler Liu ", "homepage": "https://github.com/ringcentral/ringcentral-extensible/tree/master/packages/extensions/rate-limit", "license": "MIT", - "main": "lib/index.js", - "types": "lib/index.d.ts", + "main": "src/index.js", + "types": "src/index.d.ts", "repository": { "type": "git", "url": "git+https://github.com/ringcentral/ringcentral-extensible.git" diff --git a/packages/extensions/rate-limit/tsconfig.json b/packages/extensions/rate-limit/tsconfig.json index 62676b00a..9b376c2b1 100644 --- a/packages/extensions/rate-limit/tsconfig.json +++ b/packages/extensions/rate-limit/tsconfig.json @@ -1,7 +1,4 @@ { "extends": "../../../tsconfig.json", - "compilerOptions": { - "outDir": "lib" - }, "include": ["src"] } diff --git a/packages/extensions/rcsdk/package.json b/packages/extensions/rcsdk/package.json index 1e6e50e61..1232f2810 100644 --- a/packages/extensions/rcsdk/package.json +++ b/packages/extensions/rcsdk/package.json @@ -5,8 +5,8 @@ "author": "Tyler Liu ", "homepage": "https://github.com/ringcentral/ringcentral-extensible/tree/master/packages/extensions/rcsdk", "license": "MIT", - "main": "lib/index.js", - "types": "lib/index.d.ts", + "main": "src/index.js", + "types": "src/index.d.ts", "repository": { "type": "git", "url": "git+https://github.com/ringcentral/ringcentral-extensible.git" diff --git a/packages/extensions/rcsdk/src/index.ts b/packages/extensions/rcsdk/src/index.ts index e8ffcc201..a32087f6e 100644 --- a/packages/extensions/rcsdk/src/index.ts +++ b/packages/extensions/rcsdk/src/index.ts @@ -3,9 +3,9 @@ import type { RestMethod, RestRequestConfig, RestResponse, -} from "@rc-ex/core/lib/types"; -import SdkExtension from "@rc-ex/core/lib/SdkExtension"; -import RestException from "@rc-ex/core/lib/RestException"; +} from "@rc-ex/core/src/types"; +import SdkExtension from "@rc-ex/core/src/SdkExtension"; +import RestException from "@rc-ex/core/src/RestException"; import type SDK from "@ringcentral/sdk"; export interface RcSdkOptions { diff --git a/packages/extensions/rcsdk/tsconfig.json b/packages/extensions/rcsdk/tsconfig.json index 62676b00a..9b376c2b1 100644 --- a/packages/extensions/rcsdk/tsconfig.json +++ b/packages/extensions/rcsdk/tsconfig.json @@ -1,7 +1,4 @@ { "extends": "../../../tsconfig.json", - "compilerOptions": { - "outDir": "lib" - }, "include": ["src"] } diff --git a/packages/extensions/retry/package.json b/packages/extensions/retry/package.json index 33d6898f5..41623e7a8 100644 --- a/packages/extensions/retry/package.json +++ b/packages/extensions/retry/package.json @@ -5,8 +5,8 @@ "author": "Tyler Liu ", "homepage": "https://github.com/ringcentral/ringcentral-extensible/tree/master/packages/extensions/retry", "license": "MIT", - "main": "lib/index.js", - "types": "lib/index.d.ts", + "main": "src/index.js", + "types": "src/index.d.ts", "repository": { "type": "git", "url": "git+https://github.com/ringcentral/ringcentral-extensible.git" diff --git a/packages/extensions/retry/src/index.ts b/packages/extensions/retry/src/index.ts index 6694e5b22..8459ed00e 100644 --- a/packages/extensions/retry/src/index.ts +++ b/packages/extensions/retry/src/index.ts @@ -3,9 +3,9 @@ import type { RestMethod, RestRequestConfig, RestResponse, -} from "@rc-ex/core/lib/types"; -import SdkExtension from "@rc-ex/core/lib/SdkExtension"; -import RestException from "@rc-ex/core/lib/RestException"; +} from "@rc-ex/core/src/types"; +import SdkExtension from "@rc-ex/core/src/SdkExtension"; +import RestException from "@rc-ex/core/src/RestException"; import waitFor from "wait-for-async"; export type ShouldRetry = ( diff --git a/packages/extensions/retry/tsconfig.json b/packages/extensions/retry/tsconfig.json index 62676b00a..9b376c2b1 100644 --- a/packages/extensions/retry/tsconfig.json +++ b/packages/extensions/retry/tsconfig.json @@ -1,7 +1,4 @@ { "extends": "../../../tsconfig.json", - "compilerOptions": { - "outDir": "lib" - }, "include": ["src"] } diff --git a/packages/extensions/ws/package.json b/packages/extensions/ws/package.json index 0b5e0b085..251ef10e0 100644 --- a/packages/extensions/ws/package.json +++ b/packages/extensions/ws/package.json @@ -5,8 +5,8 @@ "author": "Tyler Liu ", "homepage": "https://github.com/ringcentral/ringcentral-extensible/tree/master/packages/extensions/ws", "license": "MIT", - "main": "lib/index.js", - "types": "lib/index.d.ts", + "main": "src/index.js", + "types": "src/index.d.ts", "repository": { "type": "git", "url": "git+https://github.com/ringcentral/ringcentral-extensible.git" diff --git a/packages/extensions/ws/src/index.ts b/packages/extensions/ws/src/index.ts index b316ff491..8ef2d0f4e 100644 --- a/packages/extensions/ws/src/index.ts +++ b/packages/extensions/ws/src/index.ts @@ -3,15 +3,15 @@ import type { RestMethod, RestRequestConfig, RestResponse, -} from "@rc-ex/core/lib/types"; -import SdkExtension from "@rc-ex/core/lib/SdkExtension"; +} from "@rc-ex/core/src/types"; +import SdkExtension from "@rc-ex/core/src/SdkExtension"; import type { MessageEvent } from "isomorphic-ws"; import WS from "isomorphic-ws"; import hyperid from "hyperid"; import { EventEmitter } from "events"; import waitFor from "wait-for-async"; -import RestException from "@rc-ex/core/lib/RestException"; -import type SubscriptionInfo from "@rc-ex/core/lib/definitions/SubscriptionInfo"; +import RestException from "@rc-ex/core/src/RestException"; +import type SubscriptionInfo from "@rc-ex/core/src/definitions/SubscriptionInfo"; import { request } from "./rest"; import type { diff --git a/packages/extensions/ws/src/rest.ts b/packages/extensions/ws/src/rest.ts index 1c48be6d0..f4ef7dc44 100644 --- a/packages/extensions/ws/src/rest.ts +++ b/packages/extensions/ws/src/rest.ts @@ -2,8 +2,8 @@ import type { RestMethod, RestRequestConfig, RestResponse, -} from "@rc-ex/core/lib/types"; -import RestException from "@rc-ex/core/lib/RestException"; +} from "@rc-ex/core/src/types"; +import RestException from "@rc-ex/core/src/RestException"; import hyperid from "hyperid"; import { getReasonPhrase } from "http-status-codes"; diff --git a/packages/extensions/ws/src/subscription.ts b/packages/extensions/ws/src/subscription.ts index 3df701829..2c4efb2f1 100644 --- a/packages/extensions/ws/src/subscription.ts +++ b/packages/extensions/ws/src/subscription.ts @@ -1,6 +1,6 @@ -import type CreateSubscriptionRequest from "@rc-ex/core/lib/definitions/CreateSubscriptionRequest"; -import type SubscriptionInfo from "@rc-ex/core/lib/definitions/SubscriptionInfo"; -import type { RestResponse } from "@rc-ex/core/lib/types"; +import type CreateSubscriptionRequest from "@rc-ex/core/src/definitions/CreateSubscriptionRequest"; +import type SubscriptionInfo from "@rc-ex/core/src/definitions/SubscriptionInfo"; +import type { RestResponse } from "@rc-ex/core/src/types"; import type { MessageEvent } from "ws"; import type { WebSocketExtensionInterface, WsgEvent, WsgMeta } from "./types"; diff --git a/packages/extensions/ws/src/types.ts b/packages/extensions/ws/src/types.ts index 0c4af0a75..ac1eddbfa 100644 --- a/packages/extensions/ws/src/types.ts +++ b/packages/extensions/ws/src/types.ts @@ -3,7 +3,7 @@ import type { RestMethod, RestRequestConfig, RestResponse, -} from "@rc-ex/core/lib/types"; +} from "@rc-ex/core/src/types"; import type WS from "isomorphic-ws"; export interface WsToken { diff --git a/packages/extensions/ws/tsconfig.json b/packages/extensions/ws/tsconfig.json index 62676b00a..9b376c2b1 100644 --- a/packages/extensions/ws/tsconfig.json +++ b/packages/extensions/ws/tsconfig.json @@ -1,7 +1,4 @@ { "extends": "../../../tsconfig.json", - "compilerOptions": { - "outDir": "lib" - }, "include": ["src"] } diff --git a/test/events-extension.spec.ts b/test/events-extension.spec.ts index 0aff1591a..13f339949 100644 --- a/test/events-extension.spec.ts +++ b/test/events-extension.spec.ts @@ -1,5 +1,5 @@ import EventsExtension, { Events } from "@rc-ex/events"; -import Utils from "@rc-ex/core/lib/Utils"; +import Utils from "@rc-ex/core/src/Utils.js"; import ReusableRestClient from "./reusable-rest-client"; diff --git a/test/exceptions.spec.ts b/test/exceptions.spec.ts index cc34b2e7a..3bb21141a 100644 --- a/test/exceptions.spec.ts +++ b/test/exceptions.spec.ts @@ -1,5 +1,5 @@ -import type { RestResponse } from "@rc-ex/core/lib/types"; -import RestException from "@rc-ex/core/lib/RestException"; +import type { RestResponse } from "@rc-ex/core/src/types"; +import RestException from "@rc-ex/core/src/RestException.js"; import ReusableRestClient from "./reusable-rest-client"; diff --git a/test/fax.spec.ts b/test/fax.spec.ts index 79a07b5b6..29f6d52df 100644 --- a/test/fax.spec.ts +++ b/test/fax.spec.ts @@ -1,7 +1,7 @@ -import type CreateFaxMessageRequest from "@rc-ex/core/lib/definitions/CreateFaxMessageRequest"; -import type Attachment from "@rc-ex/core/lib/definitions/Attachment"; -import type FaxResponse from "@rc-ex/core/lib/definitions/FaxResponse"; -import Utils from "@rc-ex/core/lib/Utils"; +import type CreateFaxMessageRequest from "@rc-ex/core/src/definitions/CreateFaxMessageRequest"; +import type Attachment from "@rc-ex/core/src/definitions/Attachment"; +import type FaxResponse from "@rc-ex/core/src/definitions/FaxResponse"; +import Utils from "@rc-ex/core/src/Utils.js"; import fs from "fs"; import path from "path"; diff --git a/test/low-level-api.spec.ts b/test/low-level-api.spec.ts index 8684d3a72..152d81a3d 100644 --- a/test/low-level-api.spec.ts +++ b/test/low-level-api.spec.ts @@ -1,6 +1,6 @@ -import Utils from "@rc-ex/core/lib/Utils"; -import type FaxResponse from "@rc-ex/core/lib/definitions/FaxResponse"; -import type GetSMSMessageInfoResponse from "@rc-ex/core/lib/definitions/GetSMSMessageInfoResponse"; +import Utils from "@rc-ex/core/src/Utils.js"; +import type FaxResponse from "@rc-ex/core/src/definitions/FaxResponse"; +import type GetSMSMessageInfoResponse from "@rc-ex/core/src/definitions/GetSMSMessageInfoResponse"; import fs from "fs"; import path from "path"; diff --git a/test/mms.spec.ts b/test/mms.spec.ts index 6cc536902..0173e7b7d 100644 --- a/test/mms.spec.ts +++ b/test/mms.spec.ts @@ -1,5 +1,5 @@ -import type CreateMMSMessage from "@rc-ex/core/lib/definitions/CreateMMSMessage"; -import type Attachment from "@rc-ex/core/lib/definitions/Attachment"; +import type CreateMMSMessage from "@rc-ex/core/src/definitions/CreateMMSMessage"; +import type Attachment from "@rc-ex/core/src/definitions/Attachment"; import fs from "fs"; import path from "path"; import ReusableRestClient from "./reusable-rest-client"; diff --git a/test/schedule-meeting.spec.ts b/test/schedule-meeting.spec.ts index f2228faec..b087bc78d 100644 --- a/test/schedule-meeting.spec.ts +++ b/test/schedule-meeting.spec.ts @@ -3,7 +3,7 @@ // MeetingScheduleResource, // MeetingsTimezoneResource, // HostInfoRequest, -// } from '@rc-ex/core/lib/definitions'; +// } from '@rc-ex/core/src/definitions'; // import {createRingCentral} from './utils';