Merge pull request #135 from Code-4-Community/ah/redo-amplify

update configs, switch to yarn
Code-4-Community · Feb 11, 2025 · e3385ff · e3385ff
2 parents bef75b1 + a75bbc7
commit e3385ff
Show file tree

Hide file tree

Showing 23 changed files with 17,874 additions and 50,757 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,12 +24,12 @@ jobs:
     steps:
       - name: Check out code 🛎
         uses: actions/checkout@v2
-      - name: Use Node.js 14.x
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 22.x
         # need this to avoid chokidar file watcher spamming the console
-      - run: npm ci
+      - run: yarn
 
       - name: Run E2E tests 🧪
         uses: cypress-io/github-action@v2
@@ -43,12 +43,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 14.x
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 22.x
       - uses: mansona/npm-lockfile-version@v1
-      - run: npm ci
+      - run: yarn
       - run: npm run test:unit
       - run: npm run test:pact
       - name: Publish pact tagged with branch name
@@ -58,11 +58,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 14.x
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
-      - run: npm ci
+          node-version: 22.x
+      - run: yarn
       - run: npm run prepush
       - run: npm run build
 
@@ -84,28 +84,28 @@ jobs:
               --to prod
 
   #TODO: write a real deploy script
-  deploy:
-    if: ${{ github.ref == 'refs/heads/master' }}
-    runs-on: ubuntu-latest
-    needs: can-i-deploy
-    steps:
-      - uses: actions/checkout@v2
-      - run: docker pull pactfoundation/pact-cli:latest
-      - name: Tag version as prod
-        run: |
-          docker run --rm \
-              pactfoundation/pact-cli:latest \
-              broker create-version-tag \
-              --broker-base-url=${PACT_BROKER_BASE_URL} \
-              --broker-token ${PACT_BROKER_TOKEN} \
-              --pacticipant ${PACT_PACTICIPANT} \
-              --version ${GIT_COMMIT} \
-              --tag prod
-      - name: Create Sentry release
-        uses: getsentry/action-release@v1
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
-          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
-        with:
-          environment: production
+  # deploy:
+  #   if: ${{ github.ref == 'refs/heads/master' }}
+  #   runs-on: ubuntu-latest
+  #   needs: can-i-deploy
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - run: docker pull pactfoundation/pact-cli:latest
+  #     - name: Tag version as prod
+  #       run: |
+  #         docker run --rm \
+  #             pactfoundation/pact-cli:latest \
+  #             broker create-version-tag \
+  #             --broker-base-url=${PACT_BROKER_BASE_URL} \
+  #             --broker-token ${PACT_BROKER_TOKEN} \
+  #             --pacticipant ${PACT_PACTICIPANT} \
+  #             --version ${GIT_COMMIT} \
+  #             --tag prod
+  #     - name: Create Sentry release
+  #       uses: getsentry/action-release@v1
+  #       env:
+  #         SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+  #         SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+  #         SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+  #       with:
+  #         environment: production
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,7 @@ pact/logs
 .env.production.local
 .env
 .idea
+.vscode
 
 npm-debug.log*
 yarn-debug.log*
@@ -36,18 +37,18 @@ amplify/\#current-cloud-backend
 amplify/.config/local-*
 amplify/logs
 amplify/mock-data
+amplify/mock-api-resources
 amplify/backend/amplify-meta.json
-amplify/backend/awscloudformation
 amplify/backend/.temp
 build/
 dist/
 node_modules/
-aws-exports.js
 awsconfiguration.json
 amplifyconfiguration.json
 amplifyconfiguration.dart
 amplify-build-config.json
 amplify-gradle-config.json
 amplifytools.xcconfig
 .secret-*
+**.sample
 #amplify-do-not-edit-end
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,5 +8,5 @@
     "amplify/backend/amplify-meta.json": true,
     "amplify/backend/awscloudformation": true
   },
-  "typescript.tsdk": "node_modules\\typescript\\lib"
+  "typescript.tsdk": "node_modules/typescript/lib"
 }
diff --git a/amplify/README.md b/amplify/README.md
@@ -1,10 +1,8 @@
 # Getting Started with Amplify CLI
-
 This directory was generated by [Amplify CLI](https://docs.amplify.aws/cli).
 
 Helpful resources:
-
-- Amplify documentation: https://docs.amplify.aws
-- Amplify CLI documentation: https://docs.amplify.aws/cli
-- More details on this folder & generated files: https://docs.amplify.aws/cli/reference/files
-- Join Amplify's community: https://amplify.aws/community/
+- Amplify documentation: https://docs.amplify.aws.
+- Amplify CLI documentation: https://docs.amplify.aws/cli.
+- More details on this folder & generated files: https://docs.amplify.aws/cli/reference/files.
+- Join Amplify's community: https://amplify.aws/community/.