Merge pull request microsoft#1 from ruiterr/removed_prettier

Removed prettier from property-dds project.
karlbom · Apr 13, 2021 · 77f4d57 · 77f4d57
2 parents f7b0064 + 592ef0b
commit 77f4d57
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 48 deletions.
diff --git a/experimental/PropertyDDS/packages/property-dds/.prettierignore b/experimental/PropertyDDS/packages/property-dds/.prettierignore
diff --git a/experimental/PropertyDDS/packages/property-dds/.prettierrc.json b/experimental/PropertyDDS/packages/property-dds/.prettierrc.json
diff --git a/experimental/PropertyDDS/packages/property-dds/package.json b/experimental/PropertyDDS/packages/property-dds/package.json
@@ -20,41 +20,39 @@
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
     "eslint": "eslint src",
     "eslint:fix": "eslint src --fix",
-    "lint": "npm run prettier && npm run eslint",
-    "lint:fix": "npm run prettier:fix && npm run eslint:fix",
-    "prettier": "prettier --check \"**/*.{js,json,jsx,md,ts,tsx,yml,yaml}\"",
-    "prettier:fix": "prettier --write \"**/*.{js,json,jsx,md,ts,tsx,yml,yaml}\"",
+    "lint": "npm run eslint",
+    "lint:fix": "npm run eslint:fix",
     "test": "npm run test:mocha",
     "test:mocha": "mocha \"dist/**/*.spec.js\" --exit -r node_modules/@fluidframework/mocha-test-setup --unhandled-rejections=strict",
     "test:mocha-ts": "cross-env FLUID_TEST_VERBOSE=1 mocha --require ts-node/register --extensions ts,tsx  \"src/test/**/*.spec.ts\" --exit -r node_modules/@fluidframework/mocha-test-setup --unhandled-rejections=strict --timeout 1500000",
     "test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
     "tsc": "tsc"
   },
   "dependencies": {
-    "@fluidframework/protocol-definitions": "^0.1022.0-0",
-    "@fluidframework/datastore-definitions": "^0.38.0",
+    "@fluid-experimental/property-changeset": "^0.1.0",
+    "@fluid-experimental/property-properties": "^0.1.0",
     "@fluidframework/common-utils": "^0.29.0-0",
-    "@fluidframework/shared-object-base": "^0.38.0",
     "@fluidframework/core-interfaces": "^0.38.0",
-    "@fluid-experimental/property-properties": "^0.1.0",
-    "@fluid-experimental/property-changeset": "^0.1.0",
-    "uuid": "^8.3.1",
+    "@fluidframework/datastore-definitions": "^0.38.0",
+    "@fluidframework/protocol-definitions": "^0.1022.0-0",
+    "@fluidframework/shared-object-base": "^0.38.0",
     "axios": "^0.21.1",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "uuid": "^8.3.1"
   },
   "devDependencies": {
+    "@fluid-experimental/property-common": "^0.1.0",
     "@fluidframework/build-common": "^0.21.0-0",
     "@fluidframework/container-definitions": "^0.38.0",
+    "@fluidframework/driver-definitions": "^0.38.0",
     "@fluidframework/eslint-config-fluid": "^0.23.0",
+    "@fluidframework/local-driver": "^0.38.0",
     "@fluidframework/mocha-test-setup": "^0.38.0",
-    "@fluid-experimental/property-common": "^0.1.0",
     "@fluidframework/runtime-utils": "^0.38.0",
+    "@fluidframework/sequence": "^0.38.0",
     "@fluidframework/server-local-server": "^0.1022.0-0",
-    "@fluidframework/driver-definitions":"^0.38.0",
     "@fluidframework/test-runtime-utils": "^0.38.0",
-    "@fluidframework/local-driver": "^0.38.0",
     "@fluidframework/test-utils": "^0.38.0",
-    "@fluidframework/sequence":"^0.38.0",
     "@microsoft/api-extractor": "^7.13.1",
     "@typescript-eslint/eslint-plugin": "~4.14.0",
     "@typescript-eslint/parser": "~4.14.0",
@@ -72,7 +70,6 @@
     "eslint-plugin-unicorn": "~26.0.1",
     "mocha": "^8.1.1",
     "nyc": "^15.0.0",
-    "prettier": "^2.2.1",
     "rimraf": "^2.6.2",
     "typescript": "~4.1.3"
   }

diff --git a/experimental/PropertyDDS/packages/property-dds/src/test/propertyTree.spec.ts b/experimental/PropertyDDS/packages/property-dds/src/test/propertyTree.spec.ts
@@ -37,13 +37,13 @@ describe("PropertyTree", () => {
 
 	function createLocalLoader(
 		packageEntries: Iterable<[IFluidCodeDetails, TestFluidObjectFactory]>,
-		deltaConnectionServer: ILocalDeltaConnectionServer,
-		urlResolver: IUrlResolver,
+		localDeltaConnectionServer: ILocalDeltaConnectionServer,
+		localUrlResolver: IUrlResolver,
 		options?: ILoaderOptions,
 	): IHostLoader {
-		const documentServiceFactory = new LocalDocumentServiceFactory(deltaConnectionServer);
+		const documentServiceFactory = new LocalDocumentServiceFactory(localDeltaConnectionServer);
 
-		return createLoader(packageEntries, documentServiceFactory, urlResolver, undefined, options);
+		return createLoader(packageEntries, documentServiceFactory, localUrlResolver, undefined, options);
 	}
 
 	async function createContainer(): Promise<IContainer> {