Merge branch 'main' into feat/handle-rejected-modules

americanexpress · Mar 27, 2023 · 0e0e2ce · 0e0e2ce
2 parents 34b44d7 + fd1585a
commit 0e0e2ce
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 11 deletions.
diff --git a/docs/api/modules/App-Configuration.md b/docs/api/modules/App-Configuration.md
@@ -499,7 +499,7 @@ if (!global.BROWSER) {
 }
 ```
 
-The `dnsCache` option allows for enabling applcation-level DNS caching. It is disabled by default. When enabled, the default max TTL is `Infinity`. 
+The `dnsCache` option allows for enabling application-level DNS caching. It is disabled by default. When enabled, the default max TTL is `Infinity`. 
 
 `maxTtl` affects the maximum lifetime of the entries received from the specified DNS server (TTL in seconds). If set to 0, it will make a new DNS query each time. It is not recommended to be lower than the DNS server response time in order to prevent bottlenecks.
 

diff --git a/docs/api/server/Environment-Variables.md b/docs/api/server/Environment-Variables.md
@@ -682,7 +682,7 @@ Must be one of: `no-referrer`, `no-referrer-when-downgrade`, `same-origin` or `s
 ```bash
 ONE_REFERRER_POLICY_OVERRIDE=String
 ```
-**Exampke**
+**Example**
 ```bash
 ONE_REFERRER_POLICY_OVERRIDE=no-referrer
 ```

diff --git a/docs/guides/Internationalizing-Your-Module.md b/docs/guides/Internationalizing-Your-Module.md
@@ -35,7 +35,7 @@ export default Child;
 
 ## Module Locale Files
 
-Next create the locale files. [one-app-locale-bundler](https://github.com/americanexpress/one-app-cli/tree/main/packages/one-app-locale-bundler) will bundle the locale files as a part of [one-app-bundler](https://github.com/americanexpress/one-app-cli/tree/main/packages/one-app-bundler). More information about locale folder stucture and naming can be found in the [README](https://github.com/americanexpress/one-app-cli/blob/main/packages/one-app-locale-bundler/README.md).
+Next create the locale files. [one-app-locale-bundler](https://github.com/americanexpress/one-app-cli/tree/main/packages/one-app-locale-bundler) will bundle the locale files as a part of [one-app-bundler](https://github.com/americanexpress/one-app-cli/tree/main/packages/one-app-bundler). More information about locale folder structure and naming can be found in the [README](https://github.com/americanexpress/one-app-cli/blob/main/packages/one-app-locale-bundler/README.md).
 
 Create a folder structure and content as follows (locale must follow BCP-47):
 ```
@@ -113,7 +113,7 @@ export default Parent;
 ```
 
 ## Access Locale and Language Pack
-Utilizing [mapStateToProps](https://react-redux.js.org/api/connect#mapstatetoprops-state-ownprops-object) will allow accessing the langugage pack and locale from the Redux state and provide them as props in the `Parent` component.
+Utilizing [mapStateToProps](https://react-redux.js.org/api/connect#mapstatetoprops-state-ownprops-object) will allow accessing the language pack and locale from the Redux state and provide them as props in the `Parent` component.
 
 Install React-Redux, Immutable, and PropTypes:
 ```

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -181,7 +181,7 @@
     "lockfile-lint": "^4.9.6",
     "lodash.set": "^4.3.2",
     "markdown-table": "^3.0.2",
-    "mkdirp": "^1.0.4",
+    "mkdirp": "^2.1.5",
     "node-mocks-http": "^1.11.0",
     "nodemon": "^2.0.20",
     "ora": "^5.4.1",

diff --git a/src/server/plugins/conditionallyAllowCors.js b/src/server/plugins/conditionallyAllowCors.js
@@ -30,7 +30,7 @@ export const setCorsOrigins = (newCorsOrigins = []) => {
 setCorsOrigins();
 
 /**
- * Sets configurable cors when 'renderPatialOnly' is enabled
+ * Sets configurable cors when 'renderPartialOnly' is enabled
  * @param {import('fastify').FastifyInstance} fastify app instance
  */
 const conditionallyAllowCors = async (fastify) => {