Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(test-service-load): use node16 module resolution #20314

Merged
merged 2 commits into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions packages/test/test-service-load/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
"license": "MIT",
"author": "Microsoft and contributors",
"sideEffects": false,
"main": "dist/index.js",
"module": "lib/index.js",
"types": "dist/index.d.ts",
"type": "module",
"scripts": {
"build": "fluid-build . --task build",
"build:commonjs": "fluid-build . --task commonjs",
"build:compile": "fluid-build . --task compile",
"build:esnext": "tsc --project ./tsconfig.esnext.json",
"build:esnext": "tsc --project ./tsconfig.json",
"build:genver": "gen-version",
"build:test": "tsc --project ./src/test/tsconfig.json",
"build:test": "npm run build:test:esm && npm run build:test:cjs",
"build:test:cjs": "fluid-tsc commonjs --project ./src/test/tsconfig.cjs.json",
"build:test:esm": "tsc --project ./src/test/tsconfig.json",
"check:biome": "biome check .",
"check:prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
"clean": "rimraf --glob dist lib \"**/*.tsbuildinfo\" \"**/*.build.log\" nyc",
Expand Down Expand Up @@ -51,7 +51,7 @@
"test:stress:tinylicious": "cross-env fluid__test__driver=t9s start-server-and-test start:tinylicious:test 7070 test:stress:tinylicious:run",
"test:stress:tinylicious:report": "npm run test:stress:tinylicious",
"test:stress:tinylicious:run": "npm run test:stress:run",
"tsc": "tsc",
"tsc": "fluid-tsc commonjs --project ./tsconfig.cjs.json && copyfiles -f ../../../common/build/build-common/src/cjs/package.json ./dist",
"typetests:gen": "fluid-type-test-generator",
"typetests:prepare": "flub typetests --dir . --reset --previous --normalize",
"usePrereleaseDeps": "node ./scripts/usePrereleaseDeps.js"
Expand Down Expand Up @@ -115,6 +115,7 @@
"@types/mocha": "^9.1.1",
"@types/node": "^18.19.0",
"c8": "^8.0.1",
"copyfiles": "^2.4.1",
"cross-env": "^7.0.3",
"eslint": "~8.55.0",
"mocha": "^10.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/test/test-service-load/src/loadTestDataStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"
import { IContainerRuntimeBase } from "@fluidframework/runtime-definitions";
import { ITaskManager, TaskManager } from "@fluidframework/task-manager";
import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
import { ILoadTestConfig } from "./testConfigFile";
import { ILoadTestConfig } from "./testConfigFile.js";

export interface IRunConfig {
runId: number;
Expand Down
4 changes: 2 additions & 2 deletions packages/test/test-service-load/src/nodeStressTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import {
} from "@fluidframework/test-driver-definitions";
import commander from "commander";
import ps from "ps-node";
import { ILoadTestConfig } from "./testConfigFile";
import { createLogger, createTestDriver, getProfile, initialize, safeExit } from "./utils";
import { ILoadTestConfig } from "./testConfigFile.js";
import { createLogger, createTestDriver, getProfile, initialize, safeExit } from "./utils.js";

interface ITestUserConfig {
/* Credentials' key/value description:
Expand Down
2 changes: 1 addition & 1 deletion packages/test/test-service-load/src/optionsMatrix.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
import { ConfigTypes } from "@fluidframework/core-interfaces";
import { LoggingError } from "@fluidframework/telemetry-utils";
import { TestDriverTypes } from "@fluidframework/test-driver-definitions";
import { ILoadTestConfig, OptionOverride } from "./testConfigFile";
import { ILoadTestConfig, OptionOverride } from "./testConfigFile.js";

const loaderOptionsMatrix: OptionsMatrix<ILoaderOptions> = {
cache: booleanCases,
Expand Down
8 changes: 4 additions & 4 deletions packages/test/test-service-load/src/runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ import {
TestDriverTypes,
} from "@fluidframework/test-driver-definitions";
import commander from "commander";
import { FaultInjectionDocumentServiceFactory } from "./faultInjectionDriver";
import { ILoadTest, IRunConfig } from "./loadTestDataStore";
import { FaultInjectionDocumentServiceFactory } from "./faultInjectionDriver.js";
import { ILoadTest, IRunConfig } from "./loadTestDataStore.js";
import {
generateConfigurations,
generateLoaderOptions,
generateRuntimeOptions,
getOptionOverride,
} from "./optionsMatrix";
} from "./optionsMatrix.js";
import {
configProvider,
createCodeLoader,
Expand All @@ -35,7 +35,7 @@ import {
getProfile,
globalConfigurations,
safeExit,
} from "./utils";
} from "./utils.js";

function printStatus(runConfig: IRunConfig, message: string) {
if (runConfig.verbose) {
Expand Down
12 changes: 12 additions & 0 deletions packages/test/test-service-load/src/test/tsconfig.cjs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
// This config must be used in a "type": "commonjs" environment. (Use fluid-tsc commonjs.)
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/test",
},
"references": [
{
"path": "../../tsconfig.cjs.json",
},
],
}
8 changes: 3 additions & 5 deletions packages/test/test-service-load/src/test/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
{
"extends": "@fluidframework/build-common/ts-common-config.json",
"extends": "../../../../../common/build/build-common/tsconfig.test.node16.json",
"compilerOptions": {
"rootDir": "./",
"outDir": "../../dist/test",
"types": ["node", "mocha"],
"declaration": false,
"declarationMap": false,
"outDir": "../../lib/test",
"types": ["mocha", "node"],
},
"include": ["./**/*"],
"references": [
Expand Down
8 changes: 4 additions & 4 deletions packages/test/test-service-load/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ import {
TestDriverTypes,
} from "@fluidframework/test-driver-definitions";
import { LocalCodeLoader } from "@fluidframework/test-utils";
import { ILoadTest, createFluidExport } from "./loadTestDataStore";
import { ILoadTest, createFluidExport } from "./loadTestDataStore.js";
import {
generateConfigurations,
generateLoaderOptions,
generateRuntimeOptions,
getOptionOverride,
} from "./optionsMatrix";
import { pkgName, pkgVersion } from "./packageVersion";
import { ILoadTestConfig, ITestConfig } from "./testConfigFile";
} from "./optionsMatrix.js";
import { pkgName, pkgVersion } from "./packageVersion.js";
import { ILoadTestConfig, ITestConfig } from "./testConfigFile.js";

const packageName = `${pkgName}@${pkgVersion}`;

Expand Down
7 changes: 7 additions & 0 deletions packages/test/test-service-load/tsconfig.cjs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
// This config must be used in a "type": "commonjs" environment. (Use fluid-tsc commonjs.)
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./dist",
},
}
5 changes: 2 additions & 3 deletions packages/test/test-service-load/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
{
"extends": "@fluidframework/build-common/ts-common-config.json",
"extends": "../../../common/build/build-common/tsconfig.node16.json",
"exclude": ["src/test/**/*"],
"include": ["src/**/*"],
"compilerOptions": {
"rootDir": "./src",
"outDir": "./dist",
"outDir": "./lib",
"types": ["node"],
"composite": true,
},
}
2 changes: 2 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading