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

Integrate main to next up to the type validator changes #9751

Merged
merged 11 commits into from
Apr 6, 2022
Merged
2 changes: 2 additions & 0 deletions api-report/container-loader.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ export class Container extends EventEmitterWithErrorHandling<IContainerEvents> i
// (undocumented)
get closed(): boolean;
// (undocumented)
get closeSignal(): AbortSignal;
// (undocumented)
get connected(): boolean;
// (undocumented)
get connectionState(): ConnectionState;
Expand Down
2 changes: 1 addition & 1 deletion api-report/driver-utils.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ export class InsecureUrlResolver implements IUrlResolver {
// @public
export interface IProgress {
cancel?: AbortSignal;
retry?(delayInMs: number, error: any): void;
onRetry?(delayInMs: number, error: any): void;
}

// @public (undocumented)
Expand Down
7 changes: 6 additions & 1 deletion common/build/eslint-config-fluid/eslint7.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,12 @@ module.exports = {
"@typescript-eslint/strict-boolean-expressions": "error",
"@typescript-eslint/triple-slash-reference": "error",
"@typescript-eslint/type-annotation-spacing": "error",
"@typescript-eslint/unbound-method": "off",
"@typescript-eslint/unbound-method": [
"error",
{
"ignoreStatic": true
}
],
"@typescript-eslint/unified-signatures": "error",

// eslint-plugin-eslint-comments
Expand Down
5 changes: 0 additions & 5 deletions common/build/eslint-config-fluid/package-lock.json

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

Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ module.exports = {
"@typescript-eslint/quotes": "off",
"@typescript-eslint/restrict-plus-operands": "off",
"@typescript-eslint/strict-boolean-expressions": "off",
"@typescript-eslint/unbound-method": "off",
"@typescript-eslint/unified-signatures": "off",
"eqeqeq": "off",
"import/no-internal-modules": "off",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ module.exports = {
"@typescript-eslint/quotes": "off",
"@typescript-eslint/restrict-plus-operands": "off",
"@typescript-eslint/strict-boolean-expressions": "off",
"@typescript-eslint/unbound-method": "off",
"guard-for-in": "off",
"import/no-duplicates": "off",
"import/no-internal-modules": "off",
Expand Down
5,849 changes: 4,384 additions & 1,465 deletions lerna-package-lock.json

Large diffs are not rendered by default.

81 changes: 39 additions & 42 deletions package-lock.json

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

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@
"tsc:fast": "fluid-build --root . -s tsc",
"tsfmt": "lerna run tsfmt:fix --no-sort --stream --no-bail",
"tsfmt:fix": "lerna run tsfmt:fix --no-sort --stream --no-bail",
"typetests:gen": "fluid-type-validator -m packages -v",
"typetests:prepare": "npm run typetests:gen -- -p",
"watch": "concurrently \"npm run watch:tsc\" \"npm run watch:esnext\" \"npm run watch:webpack\"",
"watch:esnext": "lerna run --parallel build:esnext -- -- --watch",
"watch:tsc": "lerna run --parallel tsc -- -- --watch",
Expand Down Expand Up @@ -107,7 +109,7 @@
"temp-directory": "nyc/.nyc_output"
},
"devDependencies": {
"@fluidframework/build-tools": "^0.2.58041",
"@fluidframework/build-tools": "^0.2.59529",
"@fluidframework/test-tools": "^0.2.3074",
"@microsoft/api-documenter": "^7.12.7",
"@microsoft/api-extractor": "^7.16.1",
Expand Down
9 changes: 7 additions & 2 deletions packages/dds/cell/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"lint:fix": "npm run eslint:fix",
"test": "npm run test:mocha",
"test:coverage": "nyc npm test -- --reporter xunit --reporter-option output=nyc/junit-report.xml",
"test:mocha": "mocha --recursive dist/test -r node_modules/@fluidframework/mocha-test-setup --unhandled-rejections=strict",
"test:mocha": "mocha --ignore 'dist/test/types/*' --recursive dist/test -r node_modules/@fluidframework/mocha-test-setup --unhandled-rejections=strict",
"test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
"tsc": "tsc",
"tsfmt": "tsfmt --verify",
Expand Down Expand Up @@ -70,6 +70,7 @@
"devDependencies": {
"@fluid-internal/test-dds-utils": "^0.59.1000",
"@fluidframework/build-common": "^0.23.0",
"@fluidframework/cell-previous": "npm:@fluidframework/cell@^0.58.0",
"@fluidframework/eslint-config-fluid": "^0.27.0",
"@fluidframework/mocha-test-setup": "^0.59.1000",
"@fluidframework/test-runtime-utils": "^0.59.1000",
Expand All @@ -94,5 +95,9 @@
"rimraf": "^2.6.2",
"typescript": "~4.1.3",
"typescript-formatter": "7.1.0"
},
"typeValidation": {
"version": "0.59.1000",
"broken": {}
}
}
}
3 changes: 2 additions & 1 deletion packages/dds/cell/src/test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"mocha"
],
"declaration": false,
"declarationMap": false
"declarationMap": false,
"skipLibCheck": true
},
"include": [
"./**/*"
Expand Down
87 changes: 87 additions & 0 deletions packages/dds/cell/src/test/types/validateCellPrevious.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
/*!
* Copyright (c) Microsoft Corporation and contributors. All rights reserved.
* Licensed under the MIT License.
*/
/*
* THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
* Generated by fluid-type-validator in @fluidframework/build-tools.
*/
/* eslint-disable max-lines */
import * as old from "@fluidframework/cell-previous";
import * as current from "../../index";

type TypeOnly<T> = {
[P in keyof T]: TypeOnly<T[P]>;
};

/*
* Validate forward compat by using old type in place of current type
* If breaking change required, add in package.json under typeValidation.broken.0.58.2002:
* "InterfaceDeclaration_ISharedCell": {"forwardCompat": false}
*/
declare function get_old_InterfaceDeclaration_ISharedCell():
TypeOnly<old.ISharedCell>;
declare function use_current_InterfaceDeclaration_ISharedCell(
use: TypeOnly<current.ISharedCell>);
use_current_InterfaceDeclaration_ISharedCell(
get_old_InterfaceDeclaration_ISharedCell());

/*
* Validate back compat by using current type in place of old type
* If breaking change required, add in package.json under typeValidation.broken.0.58.2002:
* "InterfaceDeclaration_ISharedCell": {"backCompat": false}
*/
declare function get_current_InterfaceDeclaration_ISharedCell():
TypeOnly<current.ISharedCell>;
declare function use_old_InterfaceDeclaration_ISharedCell(
use: TypeOnly<old.ISharedCell>);
use_old_InterfaceDeclaration_ISharedCell(
get_current_InterfaceDeclaration_ISharedCell());

/*
* Validate forward compat by using old type in place of current type
* If breaking change required, add in package.json under typeValidation.broken.0.58.2002:
* "InterfaceDeclaration_ISharedCellEvents": {"forwardCompat": false}
*/
declare function get_old_InterfaceDeclaration_ISharedCellEvents():
TypeOnly<old.ISharedCellEvents<any>>;
declare function use_current_InterfaceDeclaration_ISharedCellEvents(
use: TypeOnly<current.ISharedCellEvents<any>>);
use_current_InterfaceDeclaration_ISharedCellEvents(
get_old_InterfaceDeclaration_ISharedCellEvents());

/*
* Validate back compat by using current type in place of old type
* If breaking change required, add in package.json under typeValidation.broken.0.58.2002:
* "InterfaceDeclaration_ISharedCellEvents": {"backCompat": false}
*/
declare function get_current_InterfaceDeclaration_ISharedCellEvents():
TypeOnly<current.ISharedCellEvents<any>>;
declare function use_old_InterfaceDeclaration_ISharedCellEvents(
use: TypeOnly<old.ISharedCellEvents<any>>);
use_old_InterfaceDeclaration_ISharedCellEvents(
get_current_InterfaceDeclaration_ISharedCellEvents());

/*
* Validate forward compat by using old type in place of current type
* If breaking change required, add in package.json under typeValidation.broken.0.58.2002:
* "ClassDeclaration_SharedCell": {"forwardCompat": false}
*/
declare function get_old_ClassDeclaration_SharedCell():
TypeOnly<old.SharedCell>;
declare function use_current_ClassDeclaration_SharedCell(
use: TypeOnly<current.SharedCell>);
use_current_ClassDeclaration_SharedCell(
get_old_ClassDeclaration_SharedCell());

/*
* Validate back compat by using current type in place of old type
* If breaking change required, add in package.json under typeValidation.broken.0.58.2002:
* "ClassDeclaration_SharedCell": {"backCompat": false}
*/
declare function get_current_ClassDeclaration_SharedCell():
TypeOnly<current.SharedCell>;
declare function use_old_ClassDeclaration_SharedCell(
use: TypeOnly<old.SharedCell>);
use_old_ClassDeclaration_SharedCell(
get_current_ClassDeclaration_SharedCell());
Loading