Merge pull request #42 from department-of-veterans-affairs/bug/7193-n…

…arin-fix-yarn-workspace

[BUG] Configure Yarn Workspace Correctly

.github/workflows/code-checks.yml

@@ -30,7 +30,6 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
       - name: Install dependencies
-        working-directory: packages/components
         run: yarn install --immutable
       - name: yarn test
         working-directory: packages/components

.github/workflows/publish.yml

@@ -26,9 +26,6 @@ on:
 jobs:
   publish-package:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: packages/${{ inputs.package }}
     env:
       NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_KEY }}
     steps:
@@ -41,19 +38,17 @@ jobs:
         with:
           ruby-version: '3.2'
           bundler-cache: true
-          working-directory: ${{ github.workspace }}
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
           registry-url: https://registry.npmjs.org/
-          node-version-file: '.nvmrc'
+          node-version-file: .nvmrc
           cache: yarn
-      - run: |
-          yarn install
-          cd ../../
-          yarn install
+          cache-dependency-path: yarn.lock
+      - run: yarn install
       - name: Bump version and publish to NPM
         id: bump-version
+        working-directory: packages/${{ inputs.package }}
         run: |
           NPM_PACKAGE=$(jq -r .name package.json)
           echo "NPM_PACKAGE_NAME=$NPM_PACKAGE" >> "$GITHUB_OUTPUT"
@@ -86,6 +81,7 @@ jobs:
           echo "NEW_VERSION=$NEW_VERSION" >> "$GITHUB_OUTPUT"
           echo "GIT_TAG=${{ inputs.package }}-v$NEW_VERSION" >> "$GITHUB_OUTPUT"
       - name: Commit changes and tag
+        working-directory: packages/${{ inputs.package }}
         run: |
           git config --global user.name 'VA Automation Bot'
           git config --global user.email '[email protected]'
@@ -98,8 +94,8 @@ jobs:
           git tag -a $TAG -m $TAG
           git push origin $TAG
       - name: Generate changelog
+        if: ${{ inputs.version_bump != 'alpha' && inputs.version_bump != 'beta' }}
         run: |
-          cd ../../
           chmod +x .github/scripts/generate-changelog.sh
           ./.github/scripts/generate-changelog.sh ${{ inputs.package }} ${{ secrets.VA_MOBILE_ROBOT_GITHUB_PAT }}
           git add CHANGELOG.md

package.json

@@ -4,6 +4,7 @@
   "main": "index.js",
   "version": "0.0.1",
   "license": "ISC",
+  "private": true,
   "workspaces": [
     "packages/*"
   ],
@@ -25,5 +26,13 @@
     "eslint-plugin-tsdoc": "^0.2.17",
     "prettier": "3.0.0",
     "typescript": "^5.1.6"
+  },
+  "resolutions": {
+    "react-docgen-typescript": "2.2.2",
+    "@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.cd77847.0"
+  },
+  "overrides": {
+    "react-docgen-typescript": "2.2.2",
+    "@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.cd77847.0"
   }
 }

packages/components/README.md

@@ -31,7 +31,7 @@ yarn
 ```
 then
 ```
-yarn tokensBuild
+yarn tokens:build
 ```
 
 5. Launch the app
@@ -58,4 +58,3 @@ yarn tokensBuild
 | `storybook:generate` | Generates `.storybook/native/storybook.requires.js` which tells React Native where to find stores since it doesn't support dynamic imports |
 | `storybook:watch`    | Watches for newly created stories and regenerates `storybook.requires.js` |
 | `storybook:web`      | Builds and launches development server for web |
-| `tokensBuild`        | Builds the tokens package so they are available locally for use by Storybook |

packages/components/jest.config.js

@@ -11,7 +11,7 @@ module.exports = {
     ],
   },
   setupFiles: [
-    './node_modules/react-native-gesture-handler/jestSetup.js',
+    '../../node_modules/react-native-gesture-handler/jestSetup.js',
     './jest/testSetup.ts',
   ],
   transformIgnorePatterns: ['jest-runner', '/node_modules/(?!native-base)/'],

packages/components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@department-of-veterans-affairs/mobile-component-library",
-  "version": "0.3.3-alpha.0",
+  "version": "0.3.3-alpha.3",
   "description": "VA Design System Mobile Component Library",
   "main": "src/index.tsx",
   "scripts": {
@@ -14,8 +14,7 @@
     "storybook:watch": "sb-rn-watcher --config-path .storybook/native",
     "storybook:web": "STORYBOOK_WEB=true start-storybook --config-dir .storybook/web -p 6006 --no-version-updates",
     "test": "jest --coverage",
-    "test:watch": "jest --watch",
-    "tokensBuild": "cd ../tokens && yarn build"
+    "test:watch": "jest --watch"
   },
   "repository": {
     "type": "git",
@@ -93,7 +92,7 @@
     "metro-react-native-babel-preset": "^0.77.0",
     "react": "^18.2.0",
     "react-dom": "18.2.0",
-    "react-native": "0.72.5",
+    "react-native": "0.72.6",
     "react-native-gesture-handler": "^2.12.0",
     "react-native-reanimated": "~3.3.0",
     "react-native-safe-area-context": "4.6.3",
@@ -104,13 +103,5 @@
     "storybook-dark-mode": "^3.0.1",
     "ts-jest": "^29.1.1",
     "typescript": "^5.1.6"
-  },
-  "resolutions": {
-    "react-docgen-typescript": "2.2.2",
-    "@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.cd77847.0"
-  },
-  "overrides": {
-    "react-docgen-typescript": "2.2.2",
-    "@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.cd77847.0"
   }
 }