Fix conflict: stripe-embed <-- v1.9.2 (#2625)

* update

* exact version

* exact version install

* update env access

.env.example

@@ -1,10 +1,4 @@
-# generate source-maps to use in "yarn analyze"
-GENERATE_SOURCEMAP=<true | false>
+PUBLIC_ENVIRONMENT=<STAGING | PRODUCTION>
 
-# port to use for serving the application on (defaults to 3000)
-PORT=<port number>
-
-REACT_APP_ENVIRONMENT=<STAGING | PRODUCTION>
-
-REACT_APP_PUBLIC_STRIPE_KEY_PRODUCTION=
-REACT_APP_PUBLIC_STRIPE_KEY_STAGING=
+PUBLIC_STRIPE_PK_PRODUCTION=
+PUBLIC_STRIPE_PK_STAGING=

.github/workflows/javascript.yml

@@ -17,8 +17,8 @@ jobs:
  - name: Install dependencies
  run: yarn install
  - name: Lint codebase
- run: yarn run lint
+ run: yarn lint
  - name: Test codebase
- run: yarn run test --watchAll=false --coverage --json --outputFile ./codecov-report.json
+ run: yarn test --bail=0 --watch=false --passWithNoTests
  - name: Build codebase
  run: yarn build

.gitignore

@@ -45,7 +45,7 @@ amplify/backend/.temp
 build/
 dist/
 node_modules/
-# aws-exports.js
+aws-exports.js
 awsconfiguration.json
 amplifyconfiguration.json
 amplifyconfiguration.dart

.yarnrc.yml

@@ -1,20 +1,7 @@
-nodeLinker: node-modules
+compressionLevel: mixed
 
-packageExtensions:
- "@terra-money/wallet-provider@^3.11.1":
- peerDependencies:
- "@terra-money/terra.js": ^3.1.6
- eslint-config-react-app@7.0.1:
- peerDependencies:
- "@babel/plugin-syntax-flow": ^7.14.5
- "@babel/plugin-transform-react-jsx": ^7.14.9
- react-scripts@5.0.1:
- peerDependencies:
- "@babel/plugin-syntax-flow": ^7.14.5
- "@babel/plugin-transform-react-jsx": ^7.14.9
+enableGlobalCache: false
 
- "@aws-amplify/api@6.0.5":
- peerDependencies:
- "@aws-amplify/core": "^6.0.0"
+nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.3.0.cjs
+yarnPath: .yarn/releases/yarn-4.0.2.cjs

README.md

@@ -3,27 +3,32 @@
 ## GETTING STARTED
 
 ### Requirements
-- `Node.js` (v16.x) - https://github.com/nvm-sh/nvm#installing-and-updating
+
+- `Node.js` (18.x) - https://github.com/nvm-sh/nvm#installing-and-updating
 - `yarn` (v1.22.x) - https://yarnpkg.com/getting-started/install/
 
 We recommend using a version manager like `nvm`. Assuming you are using nvm, you can install and use Node v18 with the following two commands:
+
 ```shell
-nvm install v16
-nvm use v16
+nvm install v18
+nvm use v18
 ```
 
 We use `yarn` as a package manager. After installing yarn, simply run the package installer:
+
 ```shell
 yarn install
 ```
 
 Lastly, we have provided an example `.env` file as `.env.template`.
 You'll need to copy this file to `.env` and then modify/add your relevant app's settings, API Keys and the like:
+
 ```shell
 cp .env.template .env
 ```
 
-To run the web app server locally, simply execute: 
+To run the web app server locally, simply execute:
+
 ```shell
 yarn start
 ```

amplify.yml

@@ -11,10 +11,10 @@ frontend:
  - yarn install
  build:
  commands:
- - REACT_APP_ENVIRONMENT=${REACT_APP_ENVIRONMENT}
- - REACT_APP_SENTRY_DSN=${REACT_APP_SENTRY_DSN}
- - REACT_APP_PUBLIC_STRIPE_KEY_PRODUCTION=${REACT_APP_PUBLIC_STRIPE_KEY_PRODUCTION}
- - REACT_APP_PUBLIC_STRIPE_KEY_STAGING=${REACT_APP_PUBLIC_STRIPE_KEY_STAGING}
+ - PUBLIC_ENVIRONMENT=${ENVIRONMENT}
+ - PUBLIC_SENTRY_DSN=${SENTRY_DSN}
+ - PUBLIC_STRIPE_PK_PRODUCTION=${PUBLIC_STRIPE_KEY_PROD}
+ - PUBLIC_STRIPE_PK_STAGING=${PUBLIC_STRIPE_KEY_TEST}
  - export NODE_OPTIONS="--max-old-space-size=8192"
  - yarn run build
  artifacts: