test

.eslintignore

@@ -4,3 +4,8 @@ build
 test-results
 public
 **/templates
+jest.cjs.setup.js
+jest.esm.setup.js
+
+# This directory contains input and output test fixtures, which contain generated code. It is not expected it to be well formatted.
+**/one-app-index-loader/*

.eslintrc.json

@@ -1,3 +1,19 @@
 {
-  "extends": "amex"
+  "extends": "amex",
+  "rules": {
+    "no-console": 0, // CLI's are allowed to use console
+    "unicorn/no-process-exit": 0, // CLI's are allowed to exit
+    "unicorn/prefer-spread": 0 // Spread is not always semantically identical
+  },
+  "overrides": [
+    {
+      "files": ["**/__tests__/**", "**/__mocks__/**", "**/__fixtures__/**", "**/*.spec.js"],
+      "extends": "amex/test",
+      "rules": {
+        "no-console": 0, // CLI's are allowed to use console
+        "unicorn/no-process-exit": 0, // CLI's are allowed to exit
+        "unicorn/prefer-spread": 0 // Spread is not always semantically identical
+      }
+    }
+  ]
 }

.github/labeler.yml

@@ -1,18 +1,11 @@
+one-app-team-review-requested:
+  - '**/*'
+
 # Add 'eslint-plugin-one-app' label to any file changes
 # in the eslint-plugin-one-app package
 eslint-plugin-one-app:
   - packages/eslint-plugin-one-app/*
 
-# Add 'generator-one-app-module' label to any file changes
-# in the generator-one-app-module package
-generator-one-app-module:
-  - packages/generator-one-app-module/*
-
-# Add 'holocron-dev-server' label to any file changes
-# in the holocron-dev-server package
-holocron-dev-server:
-  - packages/holocron-dev-server/*
-
 # Add 'one-app-bundler' label to any file changes
 # in the one-app-bundler package
 one-app-bundler:

.github/workflows/health-check.yml

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

.github/workflows/labeler.yml

@@ -1,11 +1,12 @@
 name: "Pull Request Labeler"
 on:
-  - pull_request_target
+  pull_request_target:
+    types: [opened, reopened]
 
 jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/labeler@v3
       with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/publish.yml

@@ -8,7 +8,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     steps:
     - id: commit
-      run: echo "::set-output name=message::${{ github.event.head_commit.message }}"
+      run: echo "message=${{ github.event.head_commit.message }}" >> $GITHUB_OUTPUT
     outputs:
       commitMsg: ${{ steps.commit.outputs.message }}
   publish:
@@ -20,12 +20,11 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-          persist-credentials: false
-          ref: main
+          token: ${{ secrets.PA_TOKEN }}
       - name: Node Install
         uses: actions/setup-node@v1
         with:
-          node-version: '12'
+          node-version: '18'
       - name: Installing Packages
         env:
           NODE_ENV: development
@@ -37,10 +36,8 @@ jobs:
           NODE_ENV: production
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.PA_TOKEN }}
-          GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
-          GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
-          GIT_COMMITTER_EMAIL: ${{ secrets.GIT_COMMITTER_EMAIL }}
-          GIT_COMMITTER_NAME: ${{ secrets.GIT_COMMITTER_NAME }}
         run: |-
+          git config user.name "${{ secrets.GIT_AUTHOR_NAME }}"
+          git config user.email "${{ secrets.GIT_AUTHOR_EMAIL }}"
           echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" >> $HOME/.npmrc 2> /dev/null
-          yarn lerna:publish --yes
+          yarn lerna:publish

.github/workflows/set-tag.yml

@@ -0,0 +1,40 @@
+name: Set npm Registry Latest Tag
+
+on:
+  workflow_dispatch:
+    inputs:
+      name:
+        description: 'Name of package'
+        default: 'holocron'
+        required: true
+        type: choice
+        options:
+        - '@americanexpress/one-app-runner'
+        - '@americanexpress/one-app-locale-bundler'
+        - '@americanexpress/one-app-dev-bundler'
+        - '@americanexpress/one-app-bundler'
+        - '@americanexpress/eslint-plugin-one-app'
+      version:
+        description: 'version to tag'
+        required: true
+        type: string
+      tag:
+        description: 'tag'
+        default: 'latest'
+        required: true
+        type: choice
+        options:
+        - latest
+        - alpha
+        - beta
+jobs:
+  set-tag:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 18
+        registry-url: https://registry.npmjs.org/
+    - run: npm dist-tag add ${{ github.event.inputs.name }}@${{ github.event.inputs.version}} ${{ github.event.inputs.tag }}
+      env:
+        NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

.github/workflows/tests.yml

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

.gitignore

@@ -19,3 +19,7 @@ bundle.integrity.manifest.json
 # yarn
 yarn-debug.log*
 yarn-error.log*
+
+# OS
+.DS_Store
+

.npmrc

@@ -1 +1 @@
-registry=https://registry.npmjs.org
+registry=https://registry.yarnpkg.com

CHANGELOG.md

@@ -1,3 +1,15 @@
+# This repo has switched to independent versioning
+
+Each package now contains their own CHANGELOG:
+
+* [one-app-bundler](https://github.com/americanexpress/one-app-cli/blob/main/packages/one-app-bundler/CHANGELOG.md)
+* [eslint-plugin-one-app](https://github.com/americanexpress/one-app-cli/blob/main/packages/eslint-plugin-one-app/CHANGELOG.md)
+* [one-app-dev-bundler](https://github.com/americanexpress/one-app-cli/blob/main/packages/one-app-dev-bundler/CHANGELOG.md)
+* [one-app-locale-bundler](https://github.com/americanexpress/one-app-cli/blob/main/packages/one-app-locale-bundler/CHANGELOG.md)
+* [one-app-runner](https://github.com/americanexpress/one-app-cli/blob/main/packages/one-app-runner/CHANGELOG.md)
+* holocron-dev-server - Deprecated
+* generator-one-app-module - Deprecated
+
 # [](https://github.com/americanexpress/one-app-cli/compare/v6.9.0...v) (2020-08-28)
 
 

CONTRIBUTING.md

@@ -22,7 +22,7 @@ This project adheres to the American Express [Code of Conduct](./CODE_OF_CONDUCT
 1. Fork the repository `one-app-cli` to your GitHub account.
 2. Afterwards run the following commands in your terminal
    Please review this tutorial to learn how to clone a repository https://help.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository
- 
+
     ```bash
     $ git clone https://github.com/<your-github-username>/one-app-cli
     $ cd one-app-cli
@@ -33,20 +33,11 @@ This project adheres to the American Express [Code of Conduct](./CODE_OF_CONDUCT
 3. Install the dependencies by running
 
     ```bash
-    $ yarn
+    $ npx yarn@^1
     ```
 
 4. You can now run the scripts within the different [packages](./packages).
 
-### Creating a `one-app-cli` new release
-
-1. Run `yarn lerna:version` locally from your release branch. This would push your release changes(changelog and tags) to the branch on github.
-2. Create a pull request from your branch to the `main` branch with your changes.
-3. Once the changes are approved ensure you merge the changes and provide the commit message for the merge as
-   `chore(release) : 1.9.7`
-   ensure you follow this convention otherwise the deployment will not be executed.
-4. Once this is merged to main a deployment would be initiated on the main branch and all packages that changed would be released to npm.
-
 ## Submitting a new feature
 
 When submitting a new feature request or enhancement of an existing features please review the following:
@@ -109,4 +100,4 @@ Please review our [Security Policy](./SECURITY.md). Please follow the instructio
 
 ### Git Commit Guidelines
 
-We follow [conventional commits](https://www.conventionalcommits.org/) for git commit message formatting. These rules make it easier to review commit logs and improve contextual understanding of code changes. This also allows us to auto-generate the CHANGELOG from commit messages.
+We follow [conventional commits](https://www.conventionalcommits.org/) for git commit message formatting. These rules make it easier to review commit logs and improve contextual understanding of code changes. This also allows us to auto-generate the CHANGELOG from commit messages.

README.md

@@ -1,17 +1,16 @@
 <h1 align="center">
+
+  [One App is now InnerSource](https://github.com/americanexpress/one-app/issues/1393)
+
+  <hr/>
+
   <img src='https://github.com/americanexpress/one-app-cli/raw/main/one-app-cli.png' alt="One App CLI - One Amex" width='50%'/>
 </h1>
 
-![Tests](https://github.com/americanexpress/one-app-cli/workflows/Tests/badge.svg)
 [![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lerna.js.org/)
 
 > A set of command line interface (CLI) tools for bundling **[One App](https://github.com/americanexpress/one-app)**, its modules, and property files(locale and environment specific files).
 
-## 👩‍💻 Hiring 👨‍💻
-
-Want to get paid for your contributions to `one-app-cli`?
-> Send your resume to oneamex.careers@aexp.com
-
 ## 📖 Table of Contents
 
 * [Packages](#-packages)
@@ -21,14 +20,13 @@ Want to get paid for your contributions to `one-app-cli`?
 
 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-locale-bundler](./packages/one-app-locale-bundler)**     | CLI to bundle locale and environment JSON files      |
-| **[one-app-runner](./packages/one-app-runner)**     | CLI tool for running [One App](https://github.com/americanexpress/one-app) locally |
+| Name                                                                | Description                                                                                                                  |
+|---------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------|
+| **[eslint-plugin-one-app](./packages/eslint-plugin-one-app)**       | [eslint](https://eslint.org/) plugin that exports rules related to One App usage                                             
+| **[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.                      |
+| **[one-app-locale-bundler](./packages/one-app-locale-bundler)**     | CLI to bundle locale and environment JSON files                                                                              |
+| **[one-app-runner](./packages/one-app-runner)**                     | CLI tool for running [One App](https://github.com/americanexpress/one-app) locally                                           |
 
 
 ## 🏆 Contributing

RELEASE.md

@@ -0,0 +1,12 @@
+# Creating a `one-app-cli` new release
+
+1. Create, checkout and push a new release branch
+2. Fetch tags `git fetch --tags`
+3. Run `yarn lerna:version` locally from your release branch. This will push your release changes(changelog and tags) to the branch on github.
+4. Ensure that correctly formatted tags have been created for each package being versioned. Tag needs to be in the format of `@americanexpress/[package-name]@x.x.x` for example`@americanexpress/one-app-bundler@6.0.0`. This can impact future releases.
+5. Create a pull request from your branch to the `main` branch with your changes.
+6. When merging try to ensure that commit does not get squashed as this will cause the tags be against missing commits.
+7. Once merged run the [manually publish](https://github.com/americanexpress/one-app-cli/actions/workflows/publish.yml) github action workflow.
+
+One App CLI is currently not setup for pre-releases.
+In theory, if one is required, using [--conventional-prerelease](https://github.com/lerna/lerna/tree/main/commands/version#--conventional-prerelease) in step two should work. For example: `yarn lerna:version --conventional-prerelease`

jest.config.js → jest.cjs.config.js

@@ -10,30 +10,32 @@
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,either express
  * or implied. See the License for the specific language governing permissions and limitations
  * under the License.
- */
-
+*/
 module.exports = {
   preset: 'amex-jest-preset',
-  setupFilesAfterEnv: ['<rootDir>/jest.setup.js'],
+  setupFilesAfterEnv: ['<rootDir>/jest.cjs.setup.js'],
   collectCoverageFrom: [
     'packages/**/*.{js,jsx}',
     '!**/node_modules/**',
     '!**/build/**',
     'packages/*/lib/**',
     '!packages/*/bin/**',
+    '!packages/*/__fixtures__/**',
     '!packages/*/test-utils.js',
     '!packages/*/test-results/**',
-    '!packages/generator-one-app-module/generators/app/templates/**',
   ],
   coverageThreshold: {
     global: {
       statements: 99.72,
-      branches: 99.80,
+      branches: 99.8,
       functions: 99.15,
       lines: 99.9,
     },
   },
-  testPathIgnorePatterns: [
-    'packages/generator-one-app-module/generators/app/templates',
+  roots: [
+    'packages/eslint-plugin-one-app',
+    'packages/one-app-locale-bundler',
+    'packages/one-app-server-bundler',
+    'packages/one-app-runner',
   ],
 };