Address PR feedback on microsoft#19520 (microsoft#19582)

Fixes one package that was inadvertently changed to CJS. Removes redundant inclusion of "tsconfig.base.json"
dannimad · Feb 13, 2024 · 2caf72f · 2caf72f
1 parent 937020c
commit 2caf72f
Show file tree

Hide file tree

Showing 80 changed files with 100 additions and 275 deletions.
diff --git a/azure/packages/azure-client/src/test/tsconfig.json b/azure/packages/azure-client/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*"],
 	"references": [
 		{

diff --git a/azure/packages/azure-service-utils/src/test/tsconfig.json b/azure/packages/azure-service-utils/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*"],
 	"references": [
 		{

diff --git a/azure/packages/test/end-to-end-tests/src/test/tsconfig.json b/azure/packages/test/end-to-end-tests/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*", "../*"],
 	"compilerOptions": {
 		"rootDir": "../",

diff --git a/azure/packages/test/scenario-runner/src/test/tsconfig.json b/azure/packages/test/scenario-runner/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*", "../*"],
 	"compilerOptions": {
 		"rootDir": "../",

diff --git a/experimental/PropertyDDS/examples/partial-checkout/package.json b/experimental/PropertyDDS/examples/partial-checkout/package.json
@@ -11,6 +11,7 @@
 	},
 	"license": "MIT",
 	"author": "Microsoft and contributors",
+	"type": "module",
 	"scripts": {
 		"build": "fluid-build . --task build",
 		"build:compile": "fluid-build . --task compile",

diff --git a/experimental/PropertyDDS/examples/partial-checkout/src/app.tsx b/experimental/PropertyDDS/examples/partial-checkout/src/app.tsx
@@ -5,8 +5,8 @@
 
 import { StaticCodeLoader, TinyliciousModelLoader } from "@fluid-example/example-utils";
 
-import { PropertyTreeContainerRuntimeFactory, IPropertyTreeAppModel } from "./containerCode";
-import { renderApp, renderInspector } from "./view";
+import { PropertyTreeContainerRuntimeFactory, IPropertyTreeAppModel } from "./containerCode.js";
+import { renderApp, renderInspector } from "./view.js";
 
 /**
  * Start the app and render.

diff --git a/experimental/PropertyDDS/examples/partial-checkout/src/containerCode.ts b/experimental/PropertyDDS/examples/partial-checkout/src/containerCode.ts
@@ -7,7 +7,7 @@ import { ModelContainerRuntimeFactory, getDataStoreEntryPoint } from "@fluid-exa
 import { IContainer } from "@fluidframework/container-definitions";
 import { IContainerRuntime } from "@fluidframework/container-runtime-definitions";
 
-import { IPropertyTree, PropertyTreeInstantiationFactory } from "./dataObject";
+import { IPropertyTree, PropertyTreeInstantiationFactory } from "./dataObject.js";
 
 /**
  * The data model for our application.

diff --git a/experimental/PropertyDDS/examples/partial-checkout/src/demo/bindings/coloredSquareBinding.ts b/experimental/PropertyDDS/examples/partial-checkout/src/demo/bindings/coloredSquareBinding.ts
@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 import { DataBinding } from "@fluid-experimental/property-binder";
-import { Square } from "../views/square";
+import { Square } from "../views/square.js";
 
 export class ColoredSquareBinding extends DataBinding {
 	private updatePosition(values: any) {

diff --git a/experimental/PropertyDDS/examples/partial-checkout/src/demo/bindings/squaresBoardBinding.ts b/experimental/PropertyDDS/examples/partial-checkout/src/demo/bindings/squaresBoardBinding.ts
@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 import { DataBinding } from "@fluid-experimental/property-binder";
-import { SquaresBoard } from "../views/squaresBoard";
-import { Square } from "../views/square";
+import { SquaresBoard } from "../views/squaresBoard.js";
+import { Square } from "../views/square.js";
 
 export class SquaresBoardBinding extends DataBinding {
 	public board: SquaresBoard;

diff --git a/experimental/PropertyDDS/examples/partial-checkout/src/demo/squaresApp.ts b/experimental/PropertyDDS/examples/partial-checkout/src/demo/squaresApp.ts
@@ -10,13 +10,13 @@ import { DataBinder } from "@fluid-experimental/property-binder";
 import _ from "lodash";
 import { SQUARES_DEMO_SCHEMAS } from "@fluid-example/schemas";
 import { assert } from "@fluidframework/core-utils";
-import { IPropertyTree } from "../dataObject";
-import { renderMoveButton } from "../view";
-import { SquaresBoard } from "./views/squaresBoard";
-import { IPoint2D, Square } from "./views/square";
+import { IPropertyTree } from "../dataObject.js";
+import { renderMoveButton } from "../view.js";
+import { SquaresBoard } from "./views/squaresBoard.js";
+import { IPoint2D, Square } from "./views/square.js";
 
-import { ColoredSquareBinding } from "./bindings/coloredSquareBinding";
-import { SquaresBoardBinding } from "./bindings/squaresBoardBinding";
+import { ColoredSquareBinding } from "./bindings/coloredSquareBinding.js";
+import { SquaresBoardBinding } from "./bindings/squaresBoardBinding.js";
 
 export function moveSquares(propertyNode: any, guid: string) {
 	const board = propertyNode.get(guid);

diff --git a/experimental/PropertyDDS/examples/partial-checkout/src/demo/views/square.ts b/experimental/PropertyDDS/examples/partial-checkout/src/demo/views/square.ts
@@ -2,7 +2,7 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { SquaresBoard } from "./squaresBoard";
+import { SquaresBoard } from "./squaresBoard.js";
 
 export interface IPoint2D {
 	x: number;

diff --git a/experimental/PropertyDDS/examples/partial-checkout/src/demo/views/squaresBoard.ts b/experimental/PropertyDDS/examples/partial-checkout/src/demo/views/squaresBoard.ts
@@ -2,7 +2,7 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { Square } from "./square";
+import { Square } from "./square.js";
 
 export class SquaresBoard {
 	static HEIGHT = 400;

diff --git a/experimental/PropertyDDS/examples/partial-checkout/src/view.tsx b/experimental/PropertyDDS/examples/partial-checkout/src/view.tsx
@@ -20,9 +20,9 @@ import {
 import { SharedPropertyTree } from "@fluid-experimental/property-dds";
 import { PropertyProxy } from "@fluid-experimental/property-proxy";
 import { DataBinder } from "@fluid-experimental/property-binder";
-import { SquaresApp, randomSquaresBoardGenerator, moveSquares } from "./demo/squaresApp";
+import { SquaresApp, randomSquaresBoardGenerator, moveSquares } from "./demo/squaresApp.js";
 
-import { IPropertyTree } from "./dataObject";
+import { IPropertyTree } from "./dataObject.js";
 
 /**
  * Render an IDiceRoller into a given div as a text character, with a button to roll it.

diff --git a/experimental/PropertyDDS/examples/partial-checkout/tests/index.ts b/experimental/PropertyDDS/examples/partial-checkout/tests/index.ts
@@ -5,8 +5,11 @@
 
 import { SessionStorageModelLoader, StaticCodeLoader } from "@fluid-example/example-utils";
 
-import { PropertyTreeContainerRuntimeFactory, IPropertyTreeAppModel } from "../src/containerCode";
-import { renderApp } from "../src/view";
+import {
+	PropertyTreeContainerRuntimeFactory,
+	IPropertyTreeAppModel,
+} from "../src/containerCode.js";
+import { renderApp } from "../src/view.js";
 
 /**
  * This is a helper function for loading the page. It's required because getting the Fluid Container

diff --git a/experimental/PropertyDDS/examples/partial-checkout/webpack.config.cjs b/experimental/PropertyDDS/examples/partial-checkout/webpack.config.cjs
@@ -23,6 +23,8 @@ module.exports = (env) => {
 					loader: "ts-loader",
 				},
 				{
+					// Required until all transitive dependencies are fully ESM.
+					// https://webpack.js.org/configuration/module/#resolvefullyspecified
 					test: /\.m?js/,
 					resolve: {
 						fullySpecified: false,

diff --git a/experimental/PropertyDDS/examples/property-inspector/webpack.config.cjs b/experimental/PropertyDDS/examples/property-inspector/webpack.config.cjs
@@ -36,6 +36,8 @@ module.exports = (env) => {
 					test: /\.m?js$/,
 					use: ["source-map-loader"],
 					resolve: {
+						// Required until all transitive dependencies are fully ESM.
+						// https://webpack.js.org/configuration/module/#resolvefullyspecified
 						fullySpecified: false,
 					},
 				},

diff --git a/experimental/PropertyDDS/packages/property-binder/src/test/tsconfig.json b/experimental/PropertyDDS/packages/property-binder/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../../common/build/build-common/tsconfig.test.json"],
 	"compilerOptions": {
 		"experimentalDecorators": true,
 		"allowJs": true,

diff --git a/experimental/PropertyDDS/packages/property-dds/src/test/tsconfig.json b/experimental/PropertyDDS/packages/property-dds/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../../common/build/build-common/tsconfig.test.json"],
 	"compilerOptions": {
 		"rootDir": "./",
 		"outDir": "../../dist/test",

diff --git a/experimental/PropertyDDS/packages/property-inspector-table/webpack.config.cjs b/experimental/PropertyDDS/packages/property-inspector-table/webpack.config.cjs
@@ -24,6 +24,8 @@ module.exports = (env) => {
 					{
 						test: /\.m?js/,
 						resolve: {
+							// Required until all transitive dependencies are fully ESM.
+							// https://webpack.js.org/configuration/module/#resolvefullyspecified
 							fullySpecified: false,
 						},
 					},

diff --git a/experimental/dds/ot/ot/src/test/tsconfig.json b/experimental/dds/ot/ot/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../../common/build/build-common/tsconfig.test.json"],
 	"compilerOptions": {
 		"rootDir": "./",
 		"outDir": "../../dist/test",

diff --git a/experimental/dds/ot/sharejs/json1/src/test/tsconfig.json b/experimental/dds/ot/sharejs/json1/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../../../common/build/build-common/tsconfig.test.json"],
 	"compilerOptions": {
 		"rootDir": "./",
 		"outDir": "../../dist/test",

diff --git a/experimental/dds/sequence-deprecated/src/test/tsconfig.json b/experimental/dds/sequence-deprecated/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../common/build/build-common/tsconfig.test.json"],
 	"compilerOptions": {
 		"rootDir": "./",
 		"outDir": "../../dist/test",

diff --git a/packages/common/client-utils/src/test/jest/tsconfig.json b/packages/common/client-utils/src/test/jest/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*"],
 	"references": [
 		{

diff --git a/packages/common/client-utils/src/test/mocha/tsconfig.json b/packages/common/client-utils/src/test/mocha/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*"],
 	"references": [
 		{

diff --git a/packages/common/client-utils/src/test/types/tsconfig.json b/packages/common/client-utils/src/test/types/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*"],
 	"exclude": ["dist", "node_modules"],
 	"references": [

diff --git a/packages/common/container-definitions/src/test/types/tsconfig.json b/packages/common/container-definitions/src/test/types/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*"],
 	"references": [
 		{

diff --git a/packages/common/core-interfaces/src/test/tsconfig.json b/packages/common/core-interfaces/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*"],
 	"references": [
 		{

diff --git a/packages/common/core-utils/src/test/tsconfig.json b/packages/common/core-utils/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*"],
 	"references": [
 		{

diff --git a/packages/dds/cell/src/test/tsconfig.json b/packages/dds/cell/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*"],
 	"references": [
 		{

diff --git a/packages/dds/counter/src/test/tsconfig.json b/packages/dds/counter/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*"],
 	"references": [
 		{

diff --git a/packages/dds/ink/src/test/tsconfig.json b/packages/dds/ink/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*"],
 	"references": [
 		{

diff --git a/packages/dds/map/src/test/tsconfig.json b/packages/dds/map/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*"],
 	"references": [
 		{

diff --git a/packages/dds/matrix/src/test/tsconfig.json b/packages/dds/matrix/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*"],
 	"references": [
 		{

diff --git a/packages/dds/merge-tree/src/test/tsconfig.json b/packages/dds/merge-tree/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*"],
 	"references": [
 		{

diff --git a/packages/dds/ordered-collection/src/test/tsconfig.json b/packages/dds/ordered-collection/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*"],
 	"references": [
 		{

diff --git a/packages/dds/pact-map/src/test/tsconfig.json b/packages/dds/pact-map/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*"],
 	"references": [
 		{

diff --git a/packages/dds/register-collection/src/test/tsconfig.json b/packages/dds/register-collection/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*"],
 	"references": [
 		{

diff --git a/packages/dds/sequence/src/test/tsconfig.json b/packages/dds/sequence/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*"],
 	"references": [
 		{

diff --git a/packages/dds/shared-object-base/src/test/tsconfig.json b/packages/dds/shared-object-base/src/test/tsconfig.json
@@ -1,8 +1,5 @@
 {
-	"extends": [
-		"../../../../../common/build/build-common/tsconfig.base.json",
-		"../../../../../common/build/build-common/tsconfig.test.json",
-	],
+	"extends": ["../../../../../common/build/build-common/tsconfig.test.json"],
 	"include": ["./**/*"],
 	"references": [
 		{