Skip to content

Commit 31d80b7

Browse files
DLehenbauerDLehenbauer
authored
build(debugger): use fluid-tsc (#19807)
Semi-automatic PR to switch to fluid-tsc
1 parent 65c2650 commit 31d80b7

12 files changed

+42
-47
lines changed

Diff for: ‎packages/drivers/debugger/api-extractor-esm.json renamed to ‎packages/drivers/debugger/api-extractor-cjs.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base-esm.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.cjs.primary.json",
4+
// CJS is actually secondary; so, no report.
5+
"apiReport": {
6+
"enabled": false
7+
}
48
}

Diff for: ‎packages/drivers/debugger/api-extractor-lint.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-lint.json"
3+
"extends": "../../../common/build/build-common/api-extractor-lint.esm.primary.json"
44
}

Diff for: ‎packages/drivers/debugger/api-extractor.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
44
}

Diff for: ‎packages/drivers/debugger/package.json

+17-28
Original file line numberDiff line numberDiff line change
@@ -11,69 +11,59 @@
1111
"license": "MIT",
1212
"author": "Microsoft and contributors",
1313
"sideEffects": false,
14+
"type": "module",
1415
"exports": {
1516
".": {
1617
"import": {
17-
"types": "./lib/index.d.mts",
18-
"default": "./lib/index.mjs"
18+
"types": "./lib/index.d.ts",
19+
"default": "./lib/index.js"
1920
},
2021
"require": {
2122
"types": "./dist/index.d.ts",
2223
"default": "./dist/index.js"
2324
}
2425
},
25-
"./alpha": {
26+
"./public": {
2627
"import": {
27-
"types": "./lib/debugger-alpha.d.mts",
28-
"default": "./lib/index.mjs"
28+
"types": "./lib/debugger-public.d.ts",
29+
"default": "./lib/index.js"
2930
},
3031
"require": {
31-
"types": "./dist/debugger-alpha.d.ts",
32+
"types": "./dist/debugger-public.d.ts",
3233
"default": "./dist/index.js"
3334
}
3435
},
35-
"./beta": {
36+
"./alpha": {
3637
"import": {
37-
"types": "./lib/debugger-beta.d.mts",
38-
"default": "./lib/index.mjs"
38+
"types": "./lib/debugger-alpha.d.ts",
39+
"default": "./lib/index.js"
3940
},
4041
"require": {
41-
"types": "./dist/debugger-beta.d.ts",
42+
"types": "./dist/debugger-alpha.d.ts",
4243
"default": "./dist/index.js"
4344
}
4445
},
4546
"./internal": {
4647
"import": {
47-
"types": "./lib/index.d.mts",
48-
"default": "./lib/index.mjs"
48+
"types": "./lib/index.d.ts",
49+
"default": "./lib/index.js"
4950
},
5051
"require": {
5152
"types": "./dist/index.d.ts",
5253
"default": "./dist/index.js"
5354
}
54-
},
55-
"./public": {
56-
"import": {
57-
"types": "./lib/debugger-public.d.mts",
58-
"default": "./lib/index.mjs"
59-
},
60-
"require": {
61-
"types": "./dist/debugger-public.d.ts",
62-
"default": "./dist/index.js"
63-
}
6455
}
6556
},
6657
"main": "dist/index.js",
67-
"module": "lib/index.mjs",
6858
"types": "dist/index.d.ts",
6959
"scripts": {
7060
"api": "fluid-build . --task api",
71-
"api-extractor:commonjs": "api-extractor run --local",
72-
"api-extractor:esnext": "api-extractor run --config ./api-extractor-esm.json",
61+
"api-extractor:commonjs": "api-extractor run --config ./api-extractor-cjs.json",
62+
"api-extractor:esnext": "api-extractor run --local",
7363
"build": "fluid-build . --task build",
7464
"build:compile": "fluid-build . --task compile",
7565
"build:docs": "fluid-build . --task api",
76-
"build:esnext": "tsc-multi --config ../../../common/build/build-common/tsc-multi.esm.json",
66+
"build:esnext": "tsc --project ./tsconfig.json",
7767
"check:are-the-types-wrong": "attw --pack . --entrypoints .",
7868
"check:release-tags": "api-extractor run --local --config ./api-extractor-lint.json",
7969
"ci:build:docs": "api-extractor run",
@@ -85,7 +75,7 @@
8575
"lint:fix": "npm run prettier:fix && npm run eslint:fix",
8676
"prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
8777
"prettier:fix": "prettier --write . --cache --ignore-path ../../../.prettierignore",
88-
"tsc": "tsc",
78+
"tsc": "fluid-tsc commonjs --project ./tsconfig.cjs.json && copyfiles -f ../../../common/build/build-common/src/cjs/package.json ./dist",
8979
"typetests:gen": "fluid-type-test-generator",
9080
"typetests:prepare": "flub typetests --dir . --reset --previous --normalize"
9181
},
@@ -110,7 +100,6 @@
110100
"eslint": "~8.55.0",
111101
"prettier": "~3.0.3",
112102
"rimraf": "^4.4.0",
113-
"tsc-multi": "^1.1.0",
114103
"typescript": "~5.1.6"
115104
},
116105
"fluidBuild": {

Diff for: ‎packages/drivers/debugger/src/fluidDebugger.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
import { IDocumentService, IDocumentServiceFactory } from "@fluidframework/driver-definitions";
77
import { ReplayDocumentService, ReplayDocumentServiceFactory } from "@fluidframework/replay-driver";
8-
import { DebugReplayController } from "./fluidDebuggerController";
9-
import { DebuggerUI } from "./fluidDebuggerUi";
8+
import { DebugReplayController } from "./fluidDebuggerController.js";
9+
import { DebuggerUI } from "./fluidDebuggerUi.js";
1010

1111
/**
1212
* @alpha

Diff for: ‎packages/drivers/debugger/src/fluidDebuggerController.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import {
2323
ReplayController,
2424
SnapshotStorage,
2525
} from "@fluidframework/replay-driver";
26-
import { IDebuggerController, IDebuggerUI } from "./fluidDebuggerUi";
27-
import { Sanitizer } from "./sanitizer";
26+
import { IDebuggerController, IDebuggerUI } from "./fluidDebuggerUi.js";
27+
import { Sanitizer } from "./sanitizer.js";
2828

2929
/**
3030
* @internal

Diff for: ‎packages/drivers/debugger/src/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
* Licensed under the MIT License.
44
*/
55

6-
export { FluidDebugger } from "./fluidDebugger";
7-
export { debuggerUIFactory, DebugReplayController } from "./fluidDebuggerController";
8-
export { DebuggerUI, IDebuggerController, IDebuggerUI } from "./fluidDebuggerUi";
6+
export { FluidDebugger } from "./fluidDebugger.js";
7+
export { debuggerUIFactory, DebugReplayController } from "./fluidDebuggerController.js";
8+
export { DebuggerUI, IDebuggerController, IDebuggerUI } from "./fluidDebuggerUi.js";

Diff for: ‎packages/drivers/debugger/src/sanitize.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import fs from "fs";
2222
import process from "process";
2323
import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
24-
import { Sanitizer } from "./sanitizer";
24+
import { Sanitizer } from "./sanitizer.js";
2525

2626
function printUsage() {
2727
console.log("Usage:");

Diff for: ‎packages/drivers/debugger/src/sanitizer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {
3232
opContentsMergeTreeGroupOpSchema,
3333
opContentsRegisterCollectionSchema,
3434
proposeContentsSchema,
35-
} from "./messageSchema";
35+
} from "./messageSchema.js";
3636

3737
enum TextType {
3838
Generic,

Diff for: ‎packages/drivers/debugger/tsconfig.cjs.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
// This config must be used in a "type": "commonjs" environment. (Use fluid-tsc commonjs.)
3+
"extends": "./tsconfig.json",
4+
"compilerOptions": {
5+
"outDir": "./dist",
6+
},
7+
}

Diff for: ‎packages/drivers/debugger/tsconfig.json

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
{
2-
"extends": [
3-
"../../../common/build/build-common/tsconfig.base.json",
4-
"../../../common/build/build-common/tsconfig.cjs.json",
5-
],
2+
"extends": "../../../common/build/build-common/tsconfig.node16.json",
63
"include": ["src/**/*"],
74
"exclude": ["dist", "node_modules"],
85
"compilerOptions": {
96
"rootDir": "./src",
10-
"outDir": "./dist",
7+
"outDir": "./lib",
118
"lib": ["ES2017", "ES2018.Promise", "ES2018.AsyncIterable", "DOM", "DOM.Iterable"],
129
"types": ["node"],
1310
},

Diff for: ‎pnpm-lock.yaml

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)