chore: merge conflicts

.github/workflows/health-check.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [ '12.x', '14.x', '16.x' ]
+        node: [ '16.x', '18.x' ]
     name: Node ${{ matrix.node }}
     steps:
     - name: Checkout

.github/workflows/publish.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Node Install
         uses: actions/setup-node@v1
         with:
-          node-version: '16'
+          node-version: '18'
       - name: Installing Packages
         env:
           NODE_ENV: development

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [ '12.x', '14.x', '16.x' ]
+        node: [ '16.x', '18.x' ]
     name: Node ${{ matrix.node }}
     steps:
       - name: Checkout

README.md

@@ -24,7 +24,6 @@ This codebase has the following packages:
 | Name                                                                | Description                                                                                                                  |
 |---------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------|
 | **[eslint-plugin-one-app](./packages/eslint-plugin-one-app)**       | [eslint](https://eslint.org/) plugin that exports rules related to One App usage                                             
-| **[generator-one-app-module](./packages/generator-one-app-module)** | [Yeoman](https://yeoman.io/) generator for a [One App](https://github.com/americanexpress/one-app#modules) `holocron` Module |
 | **[holocron-dev-server](./packages/holocron-dev-server/README.md)** | development server for Holocron modules                                                                                      |
 | **[one-app-bundler](./packages/one-app-bundler)**                   | CLI to bundle one-app modules                                                                                                |
 | **[one-app-dev-bundler](./packages/one-app-dev-bundler)**               | An alternate ESBuild bundler for development environments. This is a sub-package of the one-app-bundler.                      |

jest.cjs.config.js

@@ -22,7 +22,6 @@ module.exports = {
     '!packages/*/bin/**',
     '!packages/*/test-utils.js',
     '!packages/*/test-results/**',
-    '!packages/generator-one-app-module/generators/app/templates/**',
   ],
   coverageThreshold: {
     global: {
@@ -32,12 +31,8 @@ module.exports = {
       lines: 99.9,
     },
   },
-  testPathIgnorePatterns: [
-    'packages/generator-one-app-module/generators/app/templates',
-  ],
   roots: [
     'packages/eslint-plugin-one-app',
-    'packages/generator-one-app-module',
     'packages/holocron-dev-server',
     'packages/one-app-bundler',
     'packages/one-app-locale-bundler',

packages/eslint-plugin-one-app/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.13.5](https://github.com/americanexpress/one-app-cli/compare/@americanexpress/[email protected]...@americanexpress/[email protected]) (2023-06-13)
+
+**Note:** Version bump only for package @americanexpress/eslint-plugin-one-app
+
+
+
+
+
 ## [6.13.4](https://github.com/americanexpress/one-app-cli/compare/@americanexpress/[email protected]...@americanexpress/[email protected]) (2023-03-08)
 
 **Note:** Version bump only for package @americanexpress/eslint-plugin-one-app

packages/eslint-plugin-one-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@americanexpress/eslint-plugin-one-app",
-  "version": "6.13.4",
+  "version": "6.13.5",
   "description": "This package has Eslint configurations used by one-app.",
   "main": "index.js",
   "jest": {

packages/generator-one-app-module/README.md

@@ -1,57 +1,4 @@
-# @americanexpress/generator-one-app-module
 
-> yeoman generator for a bare-bones [One App](https://github.com/americanexpress/one-app#modules) `holocron` Module
+# ***@americanexpress/generator-one-app-module is deprecated***
 
-## 🤹‍ Usage
-
-Assuming you have [npx installed](https://medium.com/@maybekatz/introducing-npx-an-npm-package-runner-55f7d4bd282b) (comes with `npm` on versions 5.2.0 and above):
-
-```bash
-npx -p yo -p @americanexpress/generator-one-app-module -- yo @americanexpress/one-app-module
-```
-
-The generator will start up and prompt you with the following questions:
-- What is the name of your module?
-- Is this a [root module or child module](https://github.com/americanexpress/one-app/tree/main/docs/api#modules)?
-- Generate with [Parrot Middleware](https://github.com/americanexpress/parrot)?
-- Setup with [internationalization](https://github.com/americanexpress/one-app/blob/main/docs/api/modules/Internationalization.md)?
-
-#### Optional Flags
-##### --setupInternationalizationByDefault
-If you'd like to include internationalization in your module without being prompted, you can pass in the `--setupInternationalizationByDefault` flag. Your command will look as follows:
-```
-yo @americanexpress/one-app-module --setupInternationalizationByDefault
-```
-
-Alternatively, if you choose to compose `generator-one-app-module` with another generator, you can pass the `setupInternationalizationByDefault` value in an object as the second argument to the Yeoman `ComposeWith` function, like so:
-
-```
-const CustomExtension = require.resolve('./path-to-custom-extension');
-
-module.exports = class extends Generator {
-  initializing() {
-    this.composeWith(require.resolve('@americanexpress/generator-one-app-module/generators/app'), 
-    { setupInternationalizationByDefault: true });
-    this.composeWith(CustomExtension);
-  }
-};
-```
-
-Doing this, you're able to extend the `generator-one-app-module` generator, enable internationalization by default, and add additional prompts and logic in your custom extension.
-
-[More on composing generators here](https://yeoman.io/authoring/composability.html).
-
-
-### Bundling modules
-
-For more information about what happens after bundling your module, read [Bundling modules](./docs/Bundling-Modules.md)
-
-## 🏆 Contributing
-
-After making changes to the generator, test your changes locally:
-1. Install yeoman globally: `npm install --global yo`
-2. Link your local generator module so it is used instead of the repo version: `npm link`
-3. Switch to a temp directory and run: `yo @americanexpress/one-app-module`
-4. When you are done, unlink the local module : `npm unlink`
-
-Please see our [contributing guide](../../CONTRIBUTING.md) for more details.
+> Last relevant release [6.12.0](https://github.com/americanexpress/one-app-cli/releases/tag/v6.12.0)