Skip to content

Commit 818c96f

Browse files
authored
build(test-pairwise-generator): use node16 module resolution (#20238)
Semi-automatic PR to switch to node16 module resolution
1 parent a53f1be commit 818c96f

File tree

8 files changed

+41
-20
lines changed

8 files changed

+41
-20
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,5 +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",
4-
"mainEntryPointFilePath": "<projectFolder>/lib/index.d.ts"
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+
}
58
}
Lines changed: 1 addition & 1 deletion
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
}
Lines changed: 1 addition & 1 deletion
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
}

packages/test/test-pairwise-generator/package.json

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,31 @@
1111
"license": "MIT",
1212
"author": "Microsoft and contributors",
1313
"sideEffects": false,
14+
"type": "module",
15+
"exports": {
16+
".": {
17+
"import": {
18+
"types": "./lib/index.d.ts",
19+
"default": "./lib/index.js"
20+
},
21+
"require": {
22+
"types": "./dist/index.d.ts",
23+
"default": "./dist/index.js"
24+
}
25+
}
26+
},
1427
"main": "dist/index.js",
15-
"module": "lib/index.js",
1628
"types": "dist/index.d.ts",
1729
"scripts": {
1830
"api": "fluid-build . --task api",
19-
"api-extractor:commonjs": "api-extractor run --local",
20-
"api-extractor:esnext": "api-extractor run --config ./api-extractor-esm.json",
31+
"api-extractor:commonjs": "api-extractor run --config ./api-extractor-cjs.json",
32+
"api-extractor:esnext": "api-extractor run --local",
2133
"build": "fluid-build . --task build",
2234
"build:commonjs": "fluid-build . --task commonjs",
2335
"build:compile": "fluid-build . --task compile",
2436
"build:docs": "fluid-build . --task api",
25-
"build:esnext": "tsc --project ./tsconfig.esnext.json",
26-
"check:are-the-types-wrong": "attw --pack",
37+
"build:esnext": "tsc --project ./tsconfig.json",
38+
"check:are-the-types-wrong": "attw --pack . --entrypoints .",
2739
"check:release-tags": "api-extractor run --local --config ./api-extractor-lint.json",
2840
"ci:build:docs": "api-extractor run",
2941
"clean": "rimraf --glob dist lib \"**/*.tsbuildinfo\" \"**/*.build.log\" _api-extractor-temp nyc",
@@ -35,9 +47,11 @@
3547
"prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
3648
"prettier:fix": "prettier --write . --cache --ignore-path ../../../.prettierignore",
3749
"test": "npm run test:mocha",
38-
"test:mocha": "mocha --recursive dist/test -r node_modules/@fluid-internal/mocha-test-setup",
50+
"test:mocha": "npm run test:mocha:esm && echo skipping cjs to avoid overhead - npm run test:mocha:cjs",
51+
"test:mocha:cjs": "mocha --recursive \"dist/test/**/*.spec.*js\" --exit",
52+
"test:mocha:esm": "mocha --recursive \"lib/test/**/*.spec.*js\" --exit",
3953
"test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
40-
"tsc": "tsc",
54+
"tsc": "fluid-tsc commonjs --project ./tsconfig.cjs.json && copyfiles -f ../../../common/build/build-common/src/cjs/package.json ./dist",
4155
"typetests:gen": "fluid-type-test-generator",
4256
"typetests:prepare": "flub typetests --dir . --reset --previous --normalize",
4357
"usePrereleaseDeps": "node ./scripts/usePrereleaseDeps.js"
@@ -47,12 +61,12 @@
4761
"cache-dir": "nyc/.cache",
4862
"exclude": [
4963
"src/test/**/*.*ts",
50-
"dist/test/**/*.*js"
64+
"lib/test/**/*.*js"
5165
],
5266
"exclude-after-remap": false,
5367
"include": [
5468
"src/**/*.*ts",
55-
"dist/**/*.*js"
69+
"lib/**/*.*js"
5670
],
5771
"report-dir": "nyc/report",
5872
"reporter": [

packages/test/test-pairwise-generator/src/test/examples.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
import { strict as assert } from "assert";
7-
import { generatePairwiseOptions, OptionsMatrix } from "../index";
7+
import { generatePairwiseOptions, OptionsMatrix } from "../index.js";
88

99
describe("generatePairwiseOptions.examples", () => {
1010
it("Testing a function", () => {

packages/test/test-pairwise-generator/src/test/generatePairwiseOptions.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* eslint-disable @typescript-eslint/no-base-to-string */
77

88
import { strict as assert } from "assert";
9-
import { generatePairwiseOptions, OptionsMatrix } from "../index";
9+
import { generatePairwiseOptions, OptionsMatrix } from "../index.js";
1010

1111
interface SimpleOptions {
1212
oBoolean?: boolean;
Lines changed: 7 additions & 0 deletions
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+
}
Lines changed: 2 additions & 5 deletions
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
"types": ["mocha", "node"],
129
},
1310
}

0 commit comments

Comments
 (0)