Skip to content

Commit

Permalink
Merge pull request #178 from whereby/development
Browse files Browse the repository at this point in the history
Merge development branch
  • Loading branch information
havardholvik authored Jan 9, 2024
2 parents c420b3a + 681cdf0 commit 9c48cfb
Show file tree
Hide file tree
Showing 215 changed files with 62,495 additions and 7,442 deletions.
19 changes: 19 additions & 0 deletions .babelrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"sourceType": "unambiguous",
"presets": [
[
"@babel/preset-env",
{
"targets": {
"chrome": 100,
"safari": 15,
"firefox": 91
}
}
],
"@babel/preset-typescript",
"@babel/preset-react"
],
"plugins": []
}

6 changes: 4 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
"experimentalObjectRestSpread": true
}
},
"extends": ["eslint:recommended"],
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
"plugins": ["jest"],
"rules": {
"no-console": ["error", { "allow": ["warn", "error"] }]
"no-console": ["error", { "allow": ["warn", "error"] }],
"@typescript-eslint/ban-ts-comment": 0,
"@typescript-eslint/no-namespace": "off"
}
}
48 changes: 48 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
### Description

**Summary:**

<!-- Provide a brief overview of what this PR does or aims to achieve. -->

**Related Issue:**

<!-- Link to the GitHub issue that this PR addresses, if applicable. -->

### Testing

<!-- Describe the steps to test the changes made in this PR. Include details
about the test environment, any specific configurations or data required, and
the expected outcomes. -->

### Screenshots/GIFs (if applicable)

<!-- Include any screenshots or GIFs that help visualize the changes made,
especially for UI-related changes. -->

### Checklist

- [ ] My code follows the project's coding standards.
- [ ] I have written unit tests (if applicable).
- [ ] I have updated the documentation (if applicable).
- [ ] By submitting this pull request, I confirm that my contribution is made
under the terms of the MIT license.

### Dependency Updates

<!-- If this PR includes dependency updates, please list them here along with
the reason for the update. -->

### Reviewers

<!-- Tag the relevant team members or maintainers who should review this PR.
-->

@havardholvik
@kevinwhereby
@nandito
@thyal

### Additional Information

<!-- Add any additional information that you think is relevant for the review,
such as context, background, or links to related resources. -->
4 changes: 2 additions & 2 deletions .github/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ description: "Installs dependencies and builds lib"
runs:
using: "composite"
steps:
- uses: actions/setup-node@v2
- uses: actions/setup-node@v3
with:
node-version: "16"
node-version: "20"
cache: "yarn"

- name: Install dependencies
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.WHEREBY_GITHUB_TOKEN }}
steps:
- name: Checkout source code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Build
uses: ./.github/actions/build
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.WHEREBY_GITHUB_TOKEN }}
steps:
- name: Checkout source code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Build
uses: ./.github/actions/build
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
# Setup .npmrc file to publish to npm
- uses: actions/setup-node@v3
with:
node-version: "16.x"
node-version: "20.x"
registry-url: "https://registry.npmjs.org"

- name: Build
Expand Down
35 changes: 35 additions & 0 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Playwright Tests
on:
push:
branches: [main, development]
pull_request:
branches: [main, development]
jobs:
test:
timeout-minutes: 60
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 20
cache: "yarn"
cache-dependency-path: |
yarn.lock
test/sample-app/yarn.lock
- name: Install dependencies
run: yarn
- name: Install sample-app dependencies
run: yarn install:e2e-sample-app
- name: Install Playwright Browsers
run: yarn playwright install --with-deps
- name: Run Playwright tests
run: yarn playwright test
env:
WHEREBY_API_KEY: ${{ secrets.WHEREBY_API_KEY }}
- uses: actions/upload-artifact@v3
if: always()
with:
name: playwright-report
path: playwright-report/
retention-days: 30
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
pull_request:
branches:
- main
- development
jobs:
test:
name: Test
Expand All @@ -15,7 +16,7 @@ jobs:

steps:
- name: Checkout source code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Build
uses: ./.github/actions/build
Expand Down
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
*.env
*.log

dist/
node_modules/
*.log
storybook-static/
yalc.lock
.yalc/
/test-results/
/playwright-report/
/playwright/.cache/
24 changes: 22 additions & 2 deletions .storybook/main.cjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
module.exports = {
stories: ["../src/**/*.stories.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
stories: ["../src/**/*.stories.@(js|jsx|ts|tsx)"],
addons: ["@storybook/addon-links", "@storybook/addon-essentials"],
framework: "@storybook/web-components",
framewkork: "@storybook/react",

webpackFinal: async (config) => {
config.module.rules.push({
resolve: {
fullySpecified: false,
extensions: [".js", ".ts", ".tsx"],
},
});

return config;
},

framework: {
name: "@storybook/react-webpack5",
options: {}
},

docs: {
autodocs: true
}
};
Loading

0 comments on commit 9c48cfb

Please sign in to comment.