Skip to content

Commit

Permalink
prettier --write for the first time
Browse files Browse the repository at this point in the history
  • Loading branch information
tibuurcio committed Jan 16, 2024
1 parent 19daf47 commit 66a202f
Show file tree
Hide file tree
Showing 156 changed files with 1,160 additions and 1,180 deletions.
6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
version: 2
updates:
- commit-message:
prefix: 'chore'
prefix: "chore"
directory: "/"
labels: ['dependabot']
labels: ["dependabot"]
open-pull-requests-limit: 5
package-ecosystem: "npm"
schedule:
interval: "weekly"
day: "monday"
time: "15:00"
target-branch: 'chore/dependabot'
target-branch: "chore/dependabot"
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ on: workflow_dispatch
jobs:
automerge-dependabot:
name: "Automerge Dependabot PR"
uses: mParticle/mparticle-workflows/.github/workflows/dependabot-automerge.yml@stable
uses: mParticle/mparticle-workflows/.github/workflows/dependabot-automerge.yml@stable
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-branch-rebase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ jobs:
rebase-branch:
name: "Rebase Development onto Dependabot Branch"
uses: mParticle/mparticle-workflows/.github/workflows/dependabot-rebase-main.yml@stable
secrets: inherit
secrets: inherit
106 changes: 53 additions & 53 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
name: Release Aquarium

on:
workflow_dispatch:
workflow_dispatch:

jobs:
# release is done from main branch.
confirm-public-repo-main-branch:
name: 'Confirm release is run from public/main branch'
uses: mParticle/mparticle-workflows/.github/workflows/sdk-release-repo-branch-check.yml@main

release:
name: Perform Release
runs-on: ubuntu-latest
needs: confirm-public-repo-main-branch
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GIT_AUTHOR_NAME: mparticle-automation
GIT_AUTHOR_EMAIL: developers@mparticle.com
GIT_COMMITTER_NAME: mparticle-automation
GIT_COMMITTER_EMAIL: developers@mparticle.com
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

steps:
- name: Checkout public main branch
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: main

- name: Import GPG Key
uses: crazy-max/ghaction-import-gpg@v4
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.GPG_PASSPHRASE }}
git_user_signingkey: true
git_commit_gpgsign: true

- name: Setup Node.js
uses: actions/setup-node@v4

- name: Install dependencies
run: npm ci

- name: Build dist
run: npm run build-dist

- name: Release
run: |
npx semantic-release
- name: Archive npm failure logs
uses: actions/upload-artifact@v3
if: failure()
with:
name: npm-logs
path: ~/.npm/_logs
# release is done from main branch.
confirm-public-repo-main-branch:
name: "Confirm release is run from public/main branch"
uses: mParticle/mparticle-workflows/.github/workflows/sdk-release-repo-branch-check.yml@main

release:
name: Perform Release
runs-on: ubuntu-latest
needs: confirm-public-repo-main-branch

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GIT_AUTHOR_NAME: mparticle-automation
GIT_AUTHOR_EMAIL: developers@mparticle.com
GIT_COMMITTER_NAME: mparticle-automation
GIT_COMMITTER_EMAIL: developers@mparticle.com
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

steps:
- name: Checkout public main branch
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: main

- name: Import GPG Key
uses: crazy-max/ghaction-import-gpg@v4
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.GPG_PASSPHRASE }}
git_user_signingkey: true
git_commit_gpgsign: true

- name: Setup Node.js
uses: actions/setup-node@v4

- name: Install dependencies
run: npm ci

- name: Build dist
run: npm run build-dist

- name: Release
run: |
npx semantic-release
- name: Archive npm failure logs
uses: actions/upload-artifact@v3
if: failure()
with:
name: npm-logs
path: ~/.npm/_logs
2 changes: 1 addition & 1 deletion .github/workflows/storybook-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
run: npx playwright install

- name: Run Storybook Tests
run: npm run test-storybook:ci
run: npm run test-storybook:ci
4 changes: 2 additions & 2 deletions .github/workflows/tokens-to-css.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: Design Tokens to CSS
on:
push:
branches-ignore:
- 'main'
- 'development'
- "main"
- "development"
workflow_dispatch:

jobs:
Expand Down
11 changes: 4 additions & 7 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
// Replace your-framework with the framework you are using (e.g., react-webpack5, vue3-vite)
import type { StorybookConfig } from "@storybook/react-vite";
import react from '@vitejs/plugin-react'
import react from "@vitejs/plugin-react";
import { PluginOption } from "vite";

type StorybookVitePlugins = { plugins: PluginOption[][] }
type StorybookVitePlugins = { plugins: PluginOption[][] };

const config: StorybookConfig & StorybookVitePlugins = {
framework: "@storybook/react-vite",

stories: [
"../src/**/*.mdx",
"../src/**/*.stories.@(ts|tsx)",
],
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(ts|tsx)"],

addons: [
"@storybook/addon-links",
Expand All @@ -27,4 +24,4 @@ const config: StorybookConfig & StorybookVitePlugins = {
plugins: [react()],
};

export default config;
export default config;
2 changes: 1 addition & 1 deletion .storybook/preview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ const preview: Preview = {
},
};

export default preview;
export default preview;
2 changes: 1 addition & 1 deletion design/tokens.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ const baseConfig: Config & StorybookTestConfig = {
testRunnerOptions: {
play: true,
},
};
};
72 changes: 35 additions & 37 deletions release.config.js
Original file line number Diff line number Diff line change
@@ -1,40 +1,38 @@
module.exports = {
branches: ['main'],
tagFormat: 'v${version}',
repositoryUrl: 'https://github.com/mParticle/aquarium',
plugins: [
[
'@semantic-release/commit-analyzer',
{
preset: 'angular',
releaseRules: [
{ type: 'feat', release: 'minor' },
{ type: 'ci', release: 'patch' },
{ type: 'fix', release: 'patch' },
{ type: 'docs', release: 'patch' },
{ type: 'test', release: 'patch' },
{ type: 'refactor', release: 'patch' },
{ type: 'style', release: 'patch' },
{ type: 'build', release: 'patch' },
{ type: 'chore', release: 'patch' },
{ type: 'revert', release: 'patch' },
],
},
branches: ["main"],
tagFormat: "v${version}",
repositoryUrl: "https://github.com/mParticle/aquarium",
plugins: [
[
"@semantic-release/commit-analyzer",
{
preset: "angular",
releaseRules: [
{ type: "feat", release: "minor" },
{ type: "ci", release: "patch" },
{ type: "fix", release: "patch" },
{ type: "docs", release: "patch" },
{ type: "test", release: "patch" },
{ type: "refactor", release: "patch" },
{ type: "style", release: "patch" },
{ type: "build", release: "patch" },
{ type: "chore", release: "patch" },
{ type: "revert", release: "patch" },
],
[
'@semantic-release/release-notes-generator',
{
preset: 'angular',
},
],
['@semantic-release/npm'],
[
'@semantic-release/github',
{
assets: [
'dist/**',
],
},
]
},
],
[
"@semantic-release/release-notes-generator",
{
preset: "angular",
},
],
["@semantic-release/npm"],
[
"@semantic-release/github",
{
assets: ["dist/**"],
},
],
};
],
};
8 changes: 2 additions & 6 deletions src/components/data-display/Avatar/Avatar.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ const meta: Meta<typeof Avatar> = {
};
export default meta;

type Story = StoryObj<typeof Avatar>;

type Story = StoryObj<typeof Avatar>



export const Primary: Story = {
};
export const Primary: Story = {};
13 changes: 7 additions & 6 deletions src/components/data-display/Avatar/Avatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ import React from "react";
import { Avatar as AntAvatar } from "antd";
import { AvatarProps as AntAvatarProps } from "antd";

export interface IAvatarProps extends AntAvatarProps {
}
export interface IAvatarProps extends AntAvatarProps {}

export const Avatar = (props: IAvatarProps) => {
return <>
<AntAvatar {...props}/>
</>;
};
return (
<>
<AntAvatar {...props} />
</>
);
};
8 changes: 2 additions & 6 deletions src/components/data-display/Badge/Badge.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ const meta: Meta<typeof Badge> = {
};
export default meta;

type Story = StoryObj<typeof Badge>;

type Story = StoryObj<typeof Badge>



export const Primary: Story = {
};
export const Primary: Story = {};
13 changes: 7 additions & 6 deletions src/components/data-display/Badge/Badge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ import React from "react";
import { Badge as AntBadge } from "antd";
import { BadgeProps as AntBadgeProps } from "antd";

export interface IBadgeProps extends AntBadgeProps {
}
export interface IBadgeProps extends AntBadgeProps {}

export const Badge = (props: IBadgeProps) => {
return <>
<AntBadge {...props}/>
</>;
};
return (
<>
<AntBadge {...props} />
</>
);
};
8 changes: 2 additions & 6 deletions src/components/data-display/Calendar/Calendar.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ const meta: Meta<typeof Calendar> = {
};
export default meta;

type Story = StoryObj<typeof Calendar>;

type Story = StoryObj<typeof Calendar>



export const Primary: Story = {
};
export const Primary: Story = {};
13 changes: 7 additions & 6 deletions src/components/data-display/Calendar/Calendar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ import React from "react";
import { Calendar as AntCalendar } from "antd";
import { CalendarProps as AntCalendarProps } from "antd";

export interface ICalendarProps extends AntCalendarProps {
}
export interface ICalendarProps extends AntCalendarProps {}

export const Calendar = (props: ICalendarProps) => {
return <>
<AntCalendar {...props}/>
</>;
};
return (
<>
<AntCalendar {...props} />
</>
);
};
Loading

0 comments on commit 66a202f

Please sign in to comment.