Skip to content

Commit

Permalink
build(routerlicious-urlresolver): use fluid-tsc (microsoft#19816)
Browse files Browse the repository at this point in the history
[AB#7353](https://dev.azure.com/fluidframework/235294da-091d-4c29-84fc-cdfc3d90890b/_workitems/edit/7353)

---------

Co-authored-by: Sonali Deshpande <48232592+sonalideshpandemsft@users.noreply.github.com>
Co-authored-by: Sonali Deshpande <sonalivdeshpande96@gmail.com>
  • Loading branch information
3 people committed Mar 7, 2024
1 parent 0110b20 commit ad55e43
Show file tree
Hide file tree
Showing 15 changed files with 69 additions and 62 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"@fluidframework/telemetry-utils": "workspace:~",
"@fluidframework/tool-utils": "workspace:~",
"express": "^4.16.3",
"nconf": "^0.12.0",
"webpack-dev-server": "~4.6.0"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
"lodash": "^4.17.21",
"long": "^4.0.0",
"lru-cache": "^6.0.0",
"nconf": "^0.12.0",
"qs": "^6.11.0",
"rmfr": "2.0.0",
"sanitize": "2.1.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
"extends": "../../../common/build/build-common/api-extractor-base-esm.json"
"extends": "../../../common/build/build-common/api-extractor-base.cjs.primary.json",
// CJS is actually secondary; so, no report.
"apiReport": {
"enabled": false
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
"extends": "../../../common/build/build-common/api-extractor-lint.json"
"extends": "../../../common/build/build-common/api-extractor-lint.esm.primary.json"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
"extends": "../../../common/build/build-common/api-extractor-base.json"
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
}
55 changes: 19 additions & 36 deletions packages/drivers/routerlicious-urlResolver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,71 +11,53 @@
"license": "MIT",
"author": "Microsoft and contributors",
"sideEffects": false,
"type": "module",
"exports": {
".": {
"import": {
"types": "./lib/index.d.mts",
"default": "./lib/index.mjs"
"types": "./lib/index.d.ts",
"default": "./lib/index.js"
},
"require": {
"types": "./dist/index.d.ts",
"default": "./dist/index.js"
}
},
"./alpha": {
"import": {
"types": "./lib/routerlicious-urlresolver-alpha.d.mts",
"default": "./lib/index.mjs"
},
"require": {
"types": "./dist/routerlicious-urlresolver-alpha.d.ts",
"default": "./dist/index.js"
}
},
"./beta": {
"./public": {
"import": {
"types": "./lib/routerlicious-urlresolver-beta.d.mts",
"default": "./lib/index.mjs"
"types": "./lib/routerlicious-urlresolver-public.d.ts",
"default": "./lib/index.js"
},
"require": {
"types": "./dist/routerlicious-urlresolver-beta.d.ts",
"types": "./dist/routerlicious-urlresolver-public.d.ts",
"default": "./dist/index.js"
}
},
"./internal": {
"import": {
"types": "./lib/index.d.mts",
"default": "./lib/index.mjs"
"types": "./lib/index.d.ts",
"default": "./lib/index.js"
},
"require": {
"types": "./dist/index.d.ts",
"default": "./dist/index.js"
}
},
"./public": {
"import": {
"types": "./lib/routerlicious-urlresolver-public.d.mts",
"default": "./lib/index.mjs"
},
"require": {
"types": "./dist/routerlicious-urlresolver-public.d.ts",
"default": "./dist/index.js"
}
}
},
"main": "dist/index.js",
"module": "lib/index.mjs",
"types": "dist/index.d.ts",
"scripts": {
"api": "fluid-build . --task api",
"api-extractor:commonjs": "api-extractor run --local",
"api-extractor:esnext": "api-extractor run --config ./api-extractor-esm.json",
"api-extractor:commonjs": "api-extractor run --config ./api-extractor-cjs.json",
"api-extractor:esnext": "api-extractor run --local",
"build": "fluid-build . --task build",
"build:commonjs": "fluid-build . --task commonjs",
"build:compile": "fluid-build . --task compile",
"build:docs": "fluid-build . --task api",
"build:esnext": "tsc-multi --config ../../../common/build/build-common/tsc-multi.esm.json",
"build:test": "tsc --project ./src/test/tsconfig.json",
"build:esnext": "tsc --project ./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:are-the-types-wrong": "attw --pack . --entrypoints .",
"check:release-tags": "api-extractor run --local --config ./api-extractor-lint.json",
"ci:build:docs": "api-extractor run",
Expand All @@ -88,9 +70,11 @@
"prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
"prettier:fix": "prettier --write . --cache --ignore-path ../../../.prettierignore",
"test": "npm run test:mocha",
"test:mocha": "mocha --ignore \"dist/test/types/*\" --recursive dist/test -r node_modules/@fluid-internal/mocha-test-setup",
"test:mocha": "npm run test:mocha:esm && npm run test:mocha:cjs",
"test:mocha:cjs": "mocha --recursive \"dist/test/**/*.spec.*js\" --exit",
"test:mocha:esm": "mocha --recursive \"lib/test/**/*.spec.*js\" --exit",
"test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
"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"
},
Expand Down Expand Up @@ -123,7 +107,6 @@
"moment": "^2.21.0",
"prettier": "~3.0.3",
"rimraf": "^4.4.0",
"tsc-multi": "^1.1.0",
"typescript": "~5.1.6"
},
"fluidBuild": {
Expand Down
2 changes: 1 addition & 1 deletion packages/drivers/routerlicious-urlResolver/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
* Licensed under the MIT License.
*/

export { IAlfredUser, IConfig, RouterliciousUrlResolver } from "./urlResolver";
export { IAlfredUser, IConfig, RouterliciousUrlResolver } from "./urlResolver.js";
12 changes: 12 additions & 0 deletions packages/drivers/routerlicious-urlResolver/src/nconf.cts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/*!
* Copyright (c) Microsoft Corporation and contributors. All rights reserved.
* Licensed under the MIT License.
*/

// This file serves as an intermediary module to export the 'Provider' named export from the 'nconf' module.
// It is written using ESM module syntax, making it compatible with both ESM and CJS module.
// This compatibility allows for flexible usage of the 'Provider' named export from the 'nconf' module across different module systems without modification.

import { Provider } from "nconf";

export { Provider };
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import { strict as assert } from "assert";
import { IResolvedUrl } from "@fluidframework/driver-definitions";
import { IRequest } from "@fluidframework/core-interfaces";
import { Provider } from "nconf";
import { RouterliciousUrlResolver } from "../urlResolver";
import { Provider } from "../nconf.cjs";
import { RouterliciousUrlResolver } from "../urlResolver.js";

describe("Routerlicious Url Resolver", () => {
const token = "dummy";
Expand Down
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",
},
],
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"extends": ["../../../../../common/build/build-common/tsconfig.test.json"],
"extends": "../../../../../common/build/build-common/tsconfig.test.node16.json",
"compilerOptions": {
"rootDir": "./",
"outDir": "../../lib/test",
"types": ["mocha", "node"],
},
"include": ["./**/*"],
"references": [
{
"path": "../..",
},
],
"compilerOptions": {
"rootDir": "./",
"outDir": "../../dist/test",
"types": ["node", "mocha"],
},
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { assert } from "@fluidframework/core-utils";
import { IRequest } from "@fluidframework/core-interfaces";
import { IResolvedUrl, IUrlResolver } from "@fluidframework/driver-definitions";
import { IUser } from "@fluidframework/protocol-definitions";
import { Provider } from "nconf";
import { Provider } from "./nconf.cjs";

const r11sServers = [
"www.wu2-ppe.prague.office-int.com",
Expand Down
7 changes: 7 additions & 0 deletions packages/drivers/routerlicious-urlResolver/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",
},
}
7 changes: 2 additions & 5 deletions packages/drivers/routerlicious-urlResolver/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
{
"extends": [
"../../../common/build/build-common/tsconfig.base.json",
"../../../common/build/build-common/tsconfig.cjs.json",
],
"extends": "../../../common/build/build-common/tsconfig.node16.json",
"include": ["src/**/*"],
"exclude": ["src/test/**/*"],
"compilerOptions": {
"rootDir": "./src",
"outDir": "./dist",
"outDir": "./lib",
"types": ["node"],
},
}
6 changes: 0 additions & 6 deletions pnpm-lock.yaml

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

0 comments on commit ad55e43

Please sign in to comment.