Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/lib/CHANGELOG.md
  • Loading branch information
sponglord committed Aug 14, 2024
2 parents 4d7afcb + da149c2 commit 6adc3b1
Show file tree
Hide file tree
Showing 134 changed files with 19,260 additions and 581 deletions.
5 changes: 0 additions & 5 deletions .changeset/brown-wolves-stare.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/dry-tomatoes-allow.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/dull-camels-argue.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/eleven-students-hunt.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/giant-hotels-act.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/mean-mirrors-lie.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/rare-falcons-bow.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/selfish-socks-fix.md

This file was deleted.

13 changes: 0 additions & 13 deletions .changeset/short-dolphins-worry.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/twenty-clouds-type.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/yellow-planets-tap.md

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: "CodeQL"

on:
push:
branches: [ main, v6 ]
branches: [ main ]
pull_request:
branches: [ main, v6 ]
branches: [ main ]
schedule:
- cron: '38 11 * * 5'

Expand Down
14 changes: 1 addition & 13 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,9 @@ jobs:
# Copy LICENSE to adyen-web package
- run: cp LICENSE packages/lib/

# Build and publish to npm with beta tag
- name: Build and prerelease
if: "github.event.release.prerelease"
run: |
echo "Pre-release beta:"
cd packages/lib && npm publish --tag beta --access public
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
CI: true

# Build and publish to npm
- name: Build and release
if: "!github.event.release.prerelease"
run: |
echo "Release:"
run: cd packages/lib && npm publish --access public
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
CI: true
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/stale-issues-bot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Close Stale Issues

on:
schedule:
- cron: '0 0 * * *' # Run every day at midnight

jobs:
close_stale_prs:
runs-on: ubuntu-latest
steps:
- name: Close stale issues
uses: actions/stale@v9
with:
any-of-labels: 'testing-bot'
stale-issue-message: 'This issue is stale because it has been open 1 days with no activity. Remove stale label or comment or this will be closed in 2 days.'
close-issue-message: 'This issue was closed because it has been stalled for 2 days with no activity.'
days-before-issue-stale: 1
days-before-issue-close: 2
2 changes: 1 addition & 1 deletion .github/workflows/validate-remote-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

- name: Getting SF_VERSION in the codebase
run: |
echo "SF_VERSION=$(grep -e 'SF_VERSION' packages/lib/src/components/internal/SecuredFields/lib/configuration/constants.ts | cut -d "'" -f2)" >> $GITHUB_ENV
echo "SF_VERSION=$(grep -e 'SF_VERSION' packages/lib/src/components/internal/SecuredFields/lib/constants.ts | cut -d "'" -f2)" >> $GITHUB_ENV
- name: Encoding test origin URL to base64
run: |
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ npm install @adyen/adyen-web --save
2. Import Adyen Web into your application:

```js
import AdyenCheckout from '@adyen/adyen-web';
import '@adyen/adyen-web/dist/adyen.css';
import { AdyenCheckout } from '@adyen/adyen-web';
import '@adyen/adyen-web/styles/adyen.css';
```

### Using a <script> tag
Expand Down
45 changes: 45 additions & 0 deletions examples/angular/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# See https://docs.github.com/get-started/getting-started-with-git/ignoring-files for more about ignoring files.

# Compiled output
/dist
/tmp
/out-tsc
/bazel-out

# Node
/node_modules
npm-debug.log
yarn-error.log

# IDEs and editors
.idea/
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# Visual Studio Code
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*

# Miscellaneous
/.angular/cache
.sass-cache/
/connect.lock
/coverage
/libpeerconnection.log
testem.log
/typings

# System files
.DS_Store
Thumbs.db

# Bundle size report
result.html
30 changes: 30 additions & 0 deletions examples/angular/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# @adyen/adyen-web v6 + Angular 18 with Server Side Rendering

### Steps to run the project:

1. Install the project dependencies: `npm install`
2. Edit the `src/environments/environment.development.ts` file and add there your variables.

Example:

```js
export const environment = {
production: false,
clientKey: 'test_L6HTEOAXQBCZ...',
merchantAccount: 'TestMerchant...',
apiVersion: 'v71',
apiKey: 'AQEthmfxKo7MbhFLw0m/n3Q...'
};
```

3. In order to run not only client-side code but also server-side code for local development, run `npm run watch` in one terminal, and `npm run serve:ssr:angular-ssr-prefetch` in another terminal. After doing that, you should be able to see the application running on `http://localhost:4000`

4. [OPTIONAL] Run `npm run analyze-bundle` to get a report of the bundle size. You can find the report in the `<root>/result.html` file.

> [!TIP]
> You can change the countryCode, locale and amount by updating the values in the URL parameters:
>
> `http://localhost:4000/?amount=2000&countryCode=US&shopperLocale=nl-NL`
> [!NOTE]
> This demo is not using the 'auto' package by default. Therefore, you might need to import your specific payment methods in order to see them in the UI.
113 changes: 113 additions & 0 deletions examples/angular/angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"angular": {
"projectType": "application",
"schematics": {},
"root": "",
"sourceRoot": "src",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/angular",
"index": "src/index.html",
"browser": "src/main.ts",
"polyfills": [
"zone.js"
],
"tsConfig": "tsconfig.app.json",
"assets": [
{
"glob": "**/*",
"input": "public"
}
],
"styles": [
"src/styles.css",
"node_modules/@adyen/adyen-web/dist/es/adyen.css"
],
"scripts": [],
"server": "src/main.server.ts",
"prerender": true,
"ssr": {
"entry": "server.ts"
}
},
"configurations": {
"production": {
"budgets": [
{
"type": "initial",
"maximumWarning": "500kB",
"maximumError": "1MB"
},
{
"type": "anyComponentStyle",
"maximumWarning": "2kB",
"maximumError": "4kB"
}
],
"outputHashing": "all"
},
"analyze-bundle": {
"sourceMap": true,
"outputHashing": "none",
"namedChunks": true
},
"development": {
"optimization": false,
"extractLicenses": false,
"sourceMap": true,
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.development.ts"
}
]
}
},
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"buildTarget": "angular:build:production"
},
"development": {
"buildTarget": "angular:build:development"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"polyfills": [
"zone.js",
"zone.js/testing"
],
"tsConfig": "tsconfig.spec.json",
"assets": [
{
"glob": "**/*",
"input": "public"
}
],
"styles": [
"src/styles.css"
],
"scripts": []
}
}
}
}
}
}
Loading

0 comments on commit 6adc3b1

Please sign in to comment.