Enable Angular 10 support

stefanseeger · stefanseeger · commit 9538dbd05d94 · 2022-07-28T14:46:08.000+02:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -35,7 +35,8 @@
         "no-multi-spaces": "error",
         "import/prefer-default-export": "off",
         "class-methods-use-this": "off",
-        "@typescript-eslint/object-curly-spacing": "off"
+        "@typescript-eslint/object-curly-spacing": "off",
+        "max-len": [2, 160]
       }
     },
     {
diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,13 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
 # Compiled output
-/dist
+**/dist
 /tmp
 /out-tsc
 /bazel-out
 
 # Node
-/node_modules
+**/node_modules
 npm-debug.log
 yarn-error.log
 
@@ -29,10 +29,10 @@ yarn-error.log
 .history/*
 
 # Miscellaneous
-/.angular/cache
+**/.angular
 .sass-cache/
 /connect.lock
-/coverage
+**/coverage
 /libpeerconnection.log
 testem.log
 /typings
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [Format.js](https://formatjs.io/) based [@ngx/translate](https://github.com/ngx-translate/core) compiler.
 
-Supports Angular 13 || 14
+Supports Angular >= 10
 
 ## Install
 
@@ -33,6 +33,11 @@ import { AppComponent } from './app';
 export class AppModule {}
 ```
 
+## Troubleshooting
+
+- With FormatJS HTML tags must be escaped with a `'` in the translation. E.g. `'<h1>'Your content goes here'</h1>'`
+- With FormatJS interpolation variables are surrounded by single brackets. E.g. `I am having {count} cats`
+
 ## Further links
 
 - [Supported Syntax](https://formatjs.io/docs/core-concepts/icu-syntax)
diff --git a/angular.json b/angular.json
@@ -1,7 +1,7 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "version": 1,
-  "newProjectRoot": "apps",
+  "newProjectRoot": "projects",
   "projects": {
     "lib": {
       "projectType": "library",
@@ -32,6 +32,5 @@
         }
       }
     }
-  },
-  "defaultProject": "lib"
+  }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,8 +19,8 @@
     "lint": "eslint . --fix"
   },
   "peerDependencies": {
-    "@angular/common": ">= 13",
-    "@angular/core": ">= 13",
+    "@angular/common": ">= 10",
+    "@angular/core": ">= 10",
     "@ngx-translate/core": ">= 13",
     "intl-messageformat": ">= 10"
   },
diff --git a/tsconfig.json b/tsconfig.json
@@ -28,5 +28,6 @@
     "strictInjectionParameters": true,
     "strictInputAccessModifiers": true,
     "strictTemplates": true
-  }
+  },
+  "include": ["./src**/*.ts"]
 }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@`
`35`	`35`	`"no-multi-spaces": "error",`
`36`	`36`	`"import/prefer-default-export": "off",`
`37`	`37`	`"class-methods-use-this": "off",`
`38`		`- "@typescript-eslint/object-curly-spacing": "off"`
	`38`	`+ "@typescript-eslint/object-curly-spacing": "off",`
	`39`	`+ "max-len": [2, 160]`
`39`	`40`	`}`
`40`	`41`	`},`
`41`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "./node_modules/@angular/cli/lib/config/schema.json",`
`3`	`3`	`"version": 1,`
`4`		`- "newProjectRoot": "apps",`
	`4`	`+ "newProjectRoot": "projects",`
`5`	`5`	`"projects": {`
`6`	`6`	`"lib": {`
`7`	`7`	`"projectType": "library",`
`@@ -32,6 +32,5 @@`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`}`
`35`		`- },`
`36`		`- "defaultProject": "lib"`
	`35`	`+ }`
`37`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,6 @@`
`28`	`28`	`"strictInjectionParameters": true,`
`29`	`29`	`"strictInputAccessModifiers": true,`
`30`	`30`	`"strictTemplates": true`
`31`		`- }`
	`31`	`+ },`
	`32`	`+ "include": ["./src*/.ts"]`
`32`	`33`	`}`