Merge pull request #7650 from abpframework/auto-merge/rel-4-1/157

Merge branch rel-4.2 with rel-4.1

docs/en/UI/Angular/Environment.md

@@ -138,10 +138,10 @@ You can use the `getEnvironment` or `getEnvironment$` method of `EnvironmentServ
 ```js
 // this.environment is instance of EnvironmentService
 
-const environment = this.environment.getAll();
+const environment = this.environment.getEnvironment();
 
 // or
-this.environment.getAll$().subscribe(environment => {
+this.environment.getEnvironment$().subscribe(environment => {
    // use environment here
 })
 ```
@@ -166,7 +166,7 @@ This method returns the `url` of a specific API based on the key given as its on
 
 #### How to Set the Environment
 
-`EnvironmentService` has a method named `setState` which allow you to set the state value.
+`EnvironmentService` has a method named `setState` which allows you to set the state value.
 
 ```js
 // this.environment is instance of EnvironmentService

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@abp/aspnetcore.mvc.ui.theme.basic": "^4.2.0",
-	"@abp/prismjs": "^4.2.0"
+    "@abp/prismjs": "^4.2.0"
   },
   "devDependencies": {}
-}
+}

npm/lerna.json

@@ -1,8 +1,6 @@
 {
   "version": "4.2.0",
-  "packages": [
-    "packs/*"
-  ],
+  "packages": ["packs/*"],
   "npmClient": "yarn",
   "lerna": "3.18.4"
 }