Skip to content

Commit

Permalink
Add 'node:' prefix explicitly to import built-in modules (#746)
Browse files Browse the repository at this point in the history
Current Node.js v18 allows us to use `node:` prefix to import built-in
modules. line-bot-sdk-nodejs only supports Node.js version >= 18, this
won't affect normal line-bot-sdk-nodejs users.


ref: nodejs/node#36098,
https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V14.md#2021-09-28-version-14180-fermium-lts-targos
ref: https://nodejs.org/api/esm.html#node-imports

list:
https://github.com/sindresorhus/builtin-modules/blob/main/builtin-modules.json
  • Loading branch information
Yang-33 authored Mar 11, 2024
1 parent 02ec49f commit b1db79a
Show file tree
Hide file tree
Showing 40 changed files with 66 additions and 67 deletions.
4 changes: 2 additions & 2 deletions examples/rich-menu/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict';

const line = require('@line/bot-sdk');
const { join } = require("path");
const { readFileSync } = require("fs");
const { join } = require("node:path");
const { readFileSync } = require("node:fs");

// create LINE SDK client
const client = new line.messagingApi.MessagingApiClient({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { {{import.classname}} } from '{{import.filename}}';
{% endfor %}
import * as Types from "../../types";
import {ensureJSON} from "../../utils";
import {Readable} from "stream";
import {Readable} from "node:stream";

import HTTPFetchClient, { convertResponseToReadable } from "../../http-fetch";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { {{operations.classname}} } from "../../api";
import { {{import.classname}} } from '../{{import.filename}}';
{% endfor %}

import { createServer } from "http";
import { deepEqual, equal, ok } from "assert";
import { createServer } from "node:http";
import { deepEqual, equal, ok } from "node:assert";

const pkg = require("../../../../package.json");

Expand Down
2 changes: 1 addition & 1 deletion lib/channel-access-token/api/channelAccessTokenClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { VerifyChannelAccessTokenResponse } from "../model/verifyChannelAccessTo

import * as Types from "../../types";
import { ensureJSON } from "../../utils";
import { Readable } from "stream";
import { Readable } from "node:stream";

import HTTPFetchClient, { convertResponseToReadable } from "../../http-fetch";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { IssueShortLivedChannelAccessTokenResponse } from "../../model/issueShor
import { IssueStatelessChannelAccessTokenResponse } from "../../model/issueStatelessChannelAccessTokenResponse";
import { VerifyChannelAccessTokenResponse } from "../../model/verifyChannelAccessTokenResponse";

import { createServer } from "http";
import { deepEqual, equal, ok } from "assert";
import { createServer } from "node:http";
import { deepEqual, equal, ok } from "node:assert";

const pkg = require("../../../../package.json");

Expand Down
2 changes: 1 addition & 1 deletion lib/client.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Readable } from "stream";
import { Readable } from "node:stream";
import HTTPClient from "./http-axios";
import * as Types from "./types";
import { AxiosRequestConfig, AxiosResponse } from "axios";
Expand Down
4 changes: 2 additions & 2 deletions lib/http-axios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import axios, {
AxiosResponse,
AxiosRequestConfig,
} from "axios";
import { Readable } from "stream";
import { Readable } from "node:stream";
import { HTTPError, ReadError, RequestError } from "./exceptions";
import * as fileType from "file-type";
import * as qs from "querystring";
import * as qs from "node:querystring";

const pkg = require("../package.json");

Expand Down
4 changes: 2 additions & 2 deletions lib/http-fetch.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Readable } from "stream";
import { Readable } from "node:stream";
import { HTTPFetchError } from "./exceptions";
import * as qs from "querystring";
import * as qs from "node:querystring";

const pkg = require("../package.json");
export interface FetchRequestConfig {
Expand Down
2 changes: 1 addition & 1 deletion lib/insight/api/insightClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { GetStatisticsPerUnitResponse } from "../model/getStatisticsPerUnitRespo

import * as Types from "../../types";
import { ensureJSON } from "../../utils";
import { Readable } from "stream";
import { Readable } from "node:stream";

import HTTPFetchClient, { convertResponseToReadable } from "../../http-fetch";

Expand Down
4 changes: 2 additions & 2 deletions lib/insight/tests/api/InsightClientTest.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { GetNumberOfFollowersResponse } from "../../model/getNumberOfFollowersRe
import { GetNumberOfMessageDeliveriesResponse } from "../../model/getNumberOfMessageDeliveriesResponse";
import { GetStatisticsPerUnitResponse } from "../../model/getStatisticsPerUnitResponse";

import { createServer } from "http";
import { deepEqual, equal, ok } from "assert";
import { createServer } from "node:http";
import { deepEqual, equal, ok } from "node:assert";

const pkg = require("../../../../package.json");

Expand Down
2 changes: 1 addition & 1 deletion lib/liff/api/liffClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { UpdateLiffAppRequest } from "../model/updateLiffAppRequest";

import * as Types from "../../types";
import { ensureJSON } from "../../utils";
import { Readable } from "stream";
import { Readable } from "node:stream";

import HTTPFetchClient, { convertResponseToReadable } from "../../http-fetch";

Expand Down
4 changes: 2 additions & 2 deletions lib/liff/tests/api/LiffClientTest.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { AddLiffAppResponse } from "../../model/addLiffAppResponse";
import { GetAllLiffAppsResponse } from "../../model/getAllLiffAppsResponse";
import { UpdateLiffAppRequest } from "../../model/updateLiffAppRequest";

import { createServer } from "http";
import { deepEqual, equal, ok } from "assert";
import { createServer } from "node:http";
import { deepEqual, equal, ok } from "node:assert";

const pkg = require("../../../../package.json");

Expand Down
2 changes: 1 addition & 1 deletion lib/manage-audience/api/manageAudienceBlobClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { CreateAudienceGroupResponse } from "../model/createAudienceGroupRespons

import * as Types from "../../types";
import { ensureJSON } from "../../utils";
import { Readable } from "stream";
import { Readable } from "node:stream";

import HTTPFetchClient, { convertResponseToReadable } from "../../http-fetch";

Expand Down
2 changes: 1 addition & 1 deletion lib/manage-audience/api/manageAudienceClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { UpdateAudienceGroupDescriptionRequest } from "../model/updateAudienceGr

import * as Types from "../../types";
import { ensureJSON } from "../../utils";
import { Readable } from "stream";
import { Readable } from "node:stream";

import HTTPFetchClient, { convertResponseToReadable } from "../../http-fetch";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { ManageAudienceBlobClient } from "../../api";

import { CreateAudienceGroupResponse } from "../../model/createAudienceGroupResponse";

import { createServer } from "http";
import { deepEqual, equal, ok } from "assert";
import { createServer } from "node:http";
import { deepEqual, equal, ok } from "node:assert";

const pkg = require("../../../../package.json");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import { GetAudienceGroupsResponse } from "../../model/getAudienceGroupsResponse
import { UpdateAudienceGroupAuthorityLevelRequest } from "../../model/updateAudienceGroupAuthorityLevelRequest";
import { UpdateAudienceGroupDescriptionRequest } from "../../model/updateAudienceGroupDescriptionRequest";

import { createServer } from "http";
import { deepEqual, equal, ok } from "assert";
import { createServer } from "node:http";
import { deepEqual, equal, ok } from "node:assert";

const pkg = require("../../../../package.json");

Expand Down
2 changes: 1 addition & 1 deletion lib/messaging-api/api/messagingApiBlobClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { GetMessageContentTranscodingResponse } from "../model/getMessageContent

import * as Types from "../../types";
import { ensureJSON } from "../../utils";
import { Readable } from "stream";
import { Readable } from "node:stream";

import HTTPFetchClient, { convertResponseToReadable } from "../../http-fetch";

Expand Down
2 changes: 1 addition & 1 deletion lib/messaging-api/api/messagingApiClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ import { ValidateMessageRequest } from "../model/validateMessageRequest";

import * as Types from "../../types";
import { ensureJSON } from "../../utils";
import { Readable } from "stream";
import { Readable } from "node:stream";

import HTTPFetchClient, { convertResponseToReadable } from "../../http-fetch";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { MessagingApiBlobClient } from "../../api";

import { GetMessageContentTranscodingResponse } from "../../model/getMessageContentTranscodingResponse";

import { createServer } from "http";
import { deepEqual, equal, ok } from "assert";
import { createServer } from "node:http";
import { deepEqual, equal, ok } from "node:assert";

const pkg = require("../../../../package.json");

Expand Down
4 changes: 2 additions & 2 deletions lib/messaging-api/tests/api/MessagingApiClientTest.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ import { UpdateRichMenuAliasRequest } from "../../model/updateRichMenuAliasReque
import { UserProfileResponse } from "../../model/userProfileResponse";
import { ValidateMessageRequest } from "../../model/validateMessageRequest";

import { createServer } from "http";
import { deepEqual, equal, ok } from "assert";
import { createServer } from "node:http";
import { deepEqual, equal, ok } from "node:assert";

const pkg = require("../../../../package.json");

Expand Down
2 changes: 1 addition & 1 deletion lib/middleware.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { raw } from "body-parser";
import * as http from "http";
import * as http from "node:http";
import { JSONParseError, SignatureValidationFailed } from "./exceptions";
import * as Types from "./types";
import validateSignature from "./validate-signature";
Expand Down
2 changes: 1 addition & 1 deletion lib/module-attach/api/lineModuleAttachClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { AttachModuleResponse } from "../model/attachModuleResponse";

import * as Types from "../../types";
import { ensureJSON } from "../../utils";
import { Readable } from "stream";
import { Readable } from "node:stream";

import HTTPFetchClient, { convertResponseToReadable } from "../../http-fetch";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { LineModuleAttachClient } from "../../api";

import { AttachModuleResponse } from "../../model/attachModuleResponse";

import { createServer } from "http";
import { deepEqual, equal, ok } from "assert";
import { createServer } from "node:http";
import { deepEqual, equal, ok } from "node:assert";

const pkg = require("../../../../package.json");

Expand Down
2 changes: 1 addition & 1 deletion lib/module/api/lineModuleClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { GetModulesResponse } from "../model/getModulesResponse";

import * as Types from "../../types";
import { ensureJSON } from "../../utils";
import { Readable } from "stream";
import { Readable } from "node:stream";

import HTTPFetchClient, { convertResponseToReadable } from "../../http-fetch";

Expand Down
4 changes: 2 additions & 2 deletions lib/module/tests/api/LineModuleClientTest.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { AcquireChatControlRequest } from "../../model/acquireChatControlRequest
import { DetachModuleRequest } from "../../model/detachModuleRequest";
import { GetModulesResponse } from "../../model/getModulesResponse";

import { createServer } from "http";
import { deepEqual, equal, ok } from "assert";
import { createServer } from "node:http";
import { deepEqual, equal, ok } from "node:assert";

const pkg = require("../../../../package.json");

Expand Down
2 changes: 1 addition & 1 deletion lib/shop/api/shopClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { MissionStickerRequest } from "../model/missionStickerRequest";

import * as Types from "../../types";
import { ensureJSON } from "../../utils";
import { Readable } from "stream";
import { Readable } from "node:stream";

import HTTPFetchClient, { convertResponseToReadable } from "../../http-fetch";

Expand Down
4 changes: 2 additions & 2 deletions lib/shop/tests/api/ShopClientTest.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { ShopClient } from "../../api";

import { MissionStickerRequest } from "../../model/missionStickerRequest";

import { createServer } from "http";
import { deepEqual, equal, ok } from "assert";
import { createServer } from "node:http";
import { deepEqual, equal, ok } from "node:assert";

const pkg = require("../../../../package.json");

Expand Down
2 changes: 1 addition & 1 deletion lib/validate-signature.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createHmac, timingSafeEqual } from "crypto";
import { createHmac, timingSafeEqual } from "node:crypto";

function s2b(str: string, encoding: BufferEncoding): Buffer {
return Buffer.from(str, encoding);
Expand Down
9 changes: 4 additions & 5 deletions test/client.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { readFileSync } from "fs";
import { join } from "path";
import { deepEqual, equal, ok, strictEqual } from "assert";
import { URL } from "url";
import { readFileSync } from "node:fs";
import { join } from "node:path";
import { deepEqual, equal, ok, strictEqual } from "node:assert";
import { URL } from "node:url";
import Client, { OAuth } from "../lib/client";
import * as Types from "../lib/types";
import { getStreamData } from "./helpers/stream";
Expand All @@ -13,7 +13,6 @@ import {
OAUTH_BASE_PREFIX,
OAUTH_BASE_PREFIX_V2_1,
} from "../lib/endpoints";
import exp = require("constants");

const pkg = require("../package.json");

Expand Down
2 changes: 1 addition & 1 deletion test/helpers/stream.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Readable } from "stream";
import { Readable } from "node:stream";

export function getStreamData(stream: Readable): Promise<string> {
return new Promise(resolve => {
Expand Down
6 changes: 3 additions & 3 deletions test/helpers/test-server.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as bodyParser from "body-parser";
import * as express from "express";
import { Server } from "http";
import { join } from "path";
import { writeFileSync } from "fs";
import { Server } from "node:http";
import { join } from "node:path";
import { writeFileSync } from "node:fs";
import {
JSONParseError,
SignatureValidationFailed,
Expand Down
8 changes: 4 additions & 4 deletions test/http-axios.spec.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { deepEqual, equal, ok } from "assert";
import { deepEqual, equal, ok } from "node:assert";
import { HTTPError } from "../lib/exceptions";
import HTTPClient from "../lib/http-axios";
import { getStreamData } from "./helpers/stream";
import { http, HttpResponse } from "msw";
import { setupServer } from "msw/node";
import { createReadStream, readFileSync } from "fs";
import { join } from "path";
import * as fs from "fs";
import { createReadStream, readFileSync } from "node:fs";
import { join } from "node:path";
import * as fs from "node:fs";

const pkg = require("../package.json");
const baseURL = "https://line.me";
Expand Down
6 changes: 3 additions & 3 deletions test/http-fetch.spec.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { deepEqual, equal, ok } from "assert";
import { deepEqual, equal, ok } from "node:assert";
import { HTTPFetchError } from "../lib";
import HTTPFetchClient, { convertResponseToReadable } from "../lib/http-fetch";
import { getStreamData } from "./helpers/stream";
import { http, HttpResponse } from "msw";
import { setupServer } from "msw/node";
import { join } from "path";
import * as fs from "fs";
import { join } from "node:path";
import * as fs from "node:fs";

const pkg = require("../package.json");
const baseURL = "https://line.me";
Expand Down
2 changes: 1 addition & 1 deletion test/libs-channelAccessToken.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { channelAccessToken } from "../lib";
import { http, HttpResponse } from "msw";
import { setupServer } from "msw/node";
import { deepEqual, equal } from "assert";
import { deepEqual, equal } from "node:assert";

const pkg = require("../package.json");

Expand Down
2 changes: 1 addition & 1 deletion test/libs-manageAudience.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { manageAudience } from "../lib";
import { http, HttpResponse } from "msw";
import { setupServer } from "msw/node";
import { deepEqual, equal, match } from "assert";
import { deepEqual, equal, match } from "node:assert";

const pkg = require("../package.json");

Expand Down
2 changes: 1 addition & 1 deletion test/libs-messagingApi.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { messagingApi } from "../lib";
import { http, HttpResponse } from "msw";
import { setupServer } from "msw/node";
import { deepEqual, equal } from "assert";
import { deepEqual, equal } from "node:assert";

const pkg = require("../package.json");

Expand Down
2 changes: 1 addition & 1 deletion test/libs-shop.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { shop } from "../lib";
import { http, HttpResponse } from "msw";
import { setupServer } from "msw/node";
import { deepEqual, equal } from "assert";
import { deepEqual, equal } from "node:assert";

const pkg = require("../package.json");

Expand Down
6 changes: 3 additions & 3 deletions test/middleware.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { deepEqual, equal, ok } from "assert";
import { readFileSync } from "fs";
import { join } from "path";
import { deepEqual, equal, ok } from "node:assert";
import { readFileSync } from "node:fs";
import { join } from "node:path";
import { HTTPError } from "../lib/exceptions";
import HTTPClient from "../lib/http-axios";
import middleware from "../lib/middleware";
Expand Down
2 changes: 1 addition & 1 deletion test/utils.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ensureJSON } from "../lib/utils";
import { JSONParseError } from "../lib/exceptions";
import { equal, ok } from "assert";
import { equal, ok } from "node:assert";

describe("utils", () => {
describe("ensureJSON", () => {
Expand Down
Loading

0 comments on commit b1db79a

Please sign in to comment.