fix: handle ts 3.1 fallout

meetalva · Sep 10, 2018 · bdb1a24 · bdb1a24
1 parent 9876af9
commit bdb1a24
Show file tree

Hide file tree

Showing 9 changed files with 9,979 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -109,8 +109,8 @@
     "@types/node": "9.6.5",
     "@types/node-fetch": "2.1.1",
     "@types/object-path": "0.9.29",
-    "@types/react": "16.3.10",
-    "@types/react-dom": "16.0.5",
+    "@types/react": "16.4.7",
+    "@types/react-dom": "16.0.6",
     "@types/react-helmet": "5.0.6",
     "@types/read-pkg": "3.0.0",
     "@types/readdir-enhanced": "2.2.0",
@@ -204,7 +204,7 @@
     "styled-components": "3.2.5",
     "tag-hoc": "1.0.0",
     "tslib": "1.9.0",
-    "typescript": "2.8.1",
+    "typescript": "3.0.1",
     "typescript-simple": "8.0.6",
     "url-search-params": "0.10.0",
     "username": "3.0.0",

diff --git a/src/analyzer/typescript-react-analyzer/property-analyzer/property-analyzer.ts b/src/analyzer/typescript-react-analyzer/property-analyzer/property-analyzer.ts
@@ -119,6 +119,7 @@ function createBooleanProperty(
 	ctx: PropertyAnalyzeContext
 ): Types.SerializedPatternBooleanProperty | undefined {
 	return {
+		model: Types.ModelName.PatternProperty,
 		contextId: args.symbol.name,
 		description: '',
 		example: '',
@@ -156,6 +157,7 @@ function createEnumProperty(
 	const enumId = ctx.getPropertyId(args.symbol.name);
 
 	return {
+		model: Types.ModelName.PatternProperty,
 		contextId: args.symbol.name,
 		description: '',
 		example: '',
@@ -194,6 +196,7 @@ function createNumberProperty(
 	ctx: PropertyAnalyzeContext
 ): Types.SerializedPatternNumberProperty {
 	return {
+		model: Types.ModelName.PatternProperty,
 		contextId: args.symbol.name,
 		description: '',
 		example: '',
@@ -217,6 +220,7 @@ function createStringProperty(
 	| Types.SerializedStringProperty {
 	if (TypescriptUtils.hasJsDocTagFromSymbol(args.symbol, 'asset')) {
 		return {
+			model: Types.ModelName.PatternProperty,
 			contextId: args.symbol.name,
 			description: '',
 			example: '',
@@ -233,6 +237,7 @@ function createStringProperty(
 
 	if (TypescriptUtils.hasJsDocTagFromSymbol(args.symbol, 'href')) {
 		return {
+			model: Types.ModelName.PatternProperty,
 			contextId: args.symbol.name,
 			description: '',
 			example: '',
@@ -248,6 +253,7 @@ function createStringProperty(
 	}
 
 	return {
+		model: Types.ModelName.PatternProperty,
 		contextId: args.symbol.name,
 		description: '',
 		example: '',
@@ -269,6 +275,7 @@ function createEventHandlerProperty(
 	const eventType = ReactUtils.getEventType(args, { typechecker: ctx.program.getTypeChecker() });
 
 	return {
+		model: Types.ModelName.PatternProperty,
 		contextId: args.symbol.name,
 		description: '',
 		example: '',

diff --git a/src/analyzer/typescript-react-analyzer/typescript-react-analyzer.ts b/src/analyzer/typescript-react-analyzer/typescript-react-analyzer.ts
@@ -178,6 +178,7 @@ function analyzePatternExport(
 	return {
 		path: ctx.candidate.artifactPath,
 		pattern: {
+			model: Types.ModelName.Pattern,
 			contextId,
 			description: ctx.candidate.description,
 			exportName,

diff --git a/src/analyzer/typescript-utils/is-export.ts b/src/analyzer/typescript-utils/is-export.ts
@@ -14,7 +14,9 @@ export function isExport(node: TypeScript.Node): boolean {
 		return false;
 	}
 
-	const modifiers = TypeScript.getCombinedModifierFlags(node);
+	// tslint:disable-next-line:no-any
+	const modifiers = TypeScript.getCombinedModifierFlags(node as any);
+
 	if ((modifiers & TypeScript.ModifierFlags.Export) === TypeScript.ModifierFlags.Export) {
 		return true;
 	}

diff --git a/src/persistence/persistence.ts b/src/persistence/persistence.ts
@@ -70,7 +70,7 @@ export class Persistence {
 				try {
 					resolve({
 						state: PersistenceState.Success,
-						contents: Yaml.load(String(contents)) as T
+						contents: (Yaml.load(String(contents)) as unknown) as T
 					});
 				} catch (error) {
 					return resolve({

diff --git a/src/preview/preview-loader.ts b/src/preview/preview-loader.ts
@@ -11,7 +11,9 @@ interface StringMap {
 }
 
 export function alvaEntryLoader(this: loader.LoaderContext): string {
-	const options = getOptions(this);
+	// tslint:disable-next-line:no-any
+	const options = getOptions(this as any);
+
 	const components: StringMap = JSON.parse(options.components);
 	const componentDirs = Object.values(components);
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,5 +1,6 @@
 {
 	"compilerOptions": {
+		"skipLibCheck": true,
 		"allowJs": false,
 		"allowSyntheticDefaultImports": false,
 		"alwaysStrict": true,

diff --git a/tslint.json b/tslint.json
@@ -184,9 +184,6 @@
 			true,
 			"LF"
 		],
-		"max-classes-per-file": [
-			false
-		],
 		"max-file-line-count": [
 			false
 		],