Skip to content

Commit

Permalink
feat(shoreline): join shoreline components, date, and primitives (#1600)
Browse files Browse the repository at this point in the history
  • Loading branch information
matheusps authored May 3, 2024
2 parents 22011e9 + 482a145 commit 1e5003e
Show file tree
Hide file tree
Showing 569 changed files with 13,382 additions and 20,818 deletions.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ body:
multiple: true
options:
- '@vtex/shoreline'
- '@vtex/shoreline-primitives'
- '@vtex/shoreline-ts-table'
- '@vtex/shoreline-stylelint'
- '@vtex/shoreline-icons'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
fetch-depth: 25

- name: Setup pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v2
with:
version: 9
version: 8

- name: Setup Node.js environment
uses: actions/setup-node@v3
Expand All @@ -43,8 +43,8 @@ jobs:
- name: Test
run: pnpm test:ci

- name: Test Storybook
run: pnpm test:storybook:ci
# - name: Test Storybook
# run: pnpm test:storybook:ci

- name: Publish to Chromatic
uses: chromaui/action@v1
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
fetch-depth: 25

- name: Setup pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v2
with:
version: 9
version: 8

- name: Setup Node.js environment
uses: actions/setup-node@v3
Expand Down Expand Up @@ -86,9 +86,9 @@ jobs:
fetch-depth: 25

- name: Setup pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v2
with:
version: 9
version: 8

- name: Setup Node.js environment
uses: actions/setup-node@v3
Expand Down
17 changes: 12 additions & 5 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,33 @@
import { dirname, join } from 'path'

module.exports = {
stories: ['../packages/**/*.stories.@(js|jsx|ts|tsx)'],
addons: [
'@storybook/addon-links',
getAbsolutePath('@storybook/addon-links'),
{
name: '@storybook/addon-essentials',
options: {
actions: false,
},
},
'@storybook/addon-a11y',
'@storybook/addon-storysource',
'@storybook/addon-interactions',
getAbsolutePath('@storybook/addon-a11y'),
getAbsolutePath('@storybook/addon-storysource'),
getAbsolutePath('@storybook/addon-interactions'),
'@chromatic-com/storybook',
],
typescript: {
check: false,
reactDocgen: false,
},
framework: {
name: '@storybook/react-vite',
name: getAbsolutePath('@storybook/react-vite'),
options: {},
},
docs: {
autodocs: false,
},
}

function getAbsolutePath(value) {
return dirname(require.resolve(join(value, 'package.json')))
}
7 changes: 0 additions & 7 deletions .storybook/manager.js

This file was deleted.

9 changes: 0 additions & 9 deletions .storybook/theme.js

This file was deleted.

2 changes: 1 addition & 1 deletion .storybook/themeDecorator.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import '../packages/theme-sunrise/dist/sunrise.css'
import '../packages/shoreline/dist/themes/sunrise/styles.css'

export function themeDecorator(storyFn) {
return (
Expand Down
5 changes: 2 additions & 3 deletions examples/shoreline-nextjs-integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
"dependencies": {
"@faker-js/faker": "8.0.2",
"@vtex/raccoon-next": "latest",
"@vtex/shoreline-components": "workspace:^",
"@vtex/shoreline-icons": "workspace:^",
"@vtex/shoreline-theme-sunrise": "workspace:^",
"@vtex/shoreline": "workspace:*",
"@vtex/shoreline-icons": "workspace:*",
"next": "13.4.8",
"react": "^18.2.0",
"react-dom": "18.2.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/shoreline-nextjs-integration/pages/_app.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { AppProps } from 'next/app'
import { connect, bootstrap } from '@vtex/raccoon-next'
import '@vtex/shoreline-theme-sunrise/css'
import '@vtex/shoreline/themes/sunrise'

connect()

Expand Down
2 changes: 1 addition & 1 deletion examples/shoreline-nextjs-integration/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
PageHeader,
PageHeading,
PageContent,
} from '@vtex/shoreline-components'
} from '@vtex/shoreline'
import { faker } from '@faker-js/faker'
import { generateRandomId } from '../lib/generate-random-id'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
IconButton,
PageHeaderRow,
Flex,
} from '@vtex/shoreline-components'
} from '@vtex/shoreline'
import { IconArrowLeft } from '@vtex/shoreline-icons'
import { useNavigation } from '@vtex/raccoon-next'
import { useRouter } from 'next/router'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
IconButton,
PageHeaderRow,
Flex,
} from '@vtex/shoreline-components'
} from '@vtex/shoreline'
import { IconArrowLeft } from '@vtex/shoreline-icons'
import { useNavigation } from '@vtex/raccoon-next'
import { generateRandomId } from '../../lib/generate-random-id'
Expand Down
34 changes: 18 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"format": "prettier --write \"packages/**/*.{ts,js,tsx,jsx,json}\" \"examples/**/*.{ts,js,tsx,jsx,json}\"",
"lint": "eslint --ext .ts,.tsx,.js,.jsx \"packages/**/*.{ts,js,tsx,jsx}\" \"examples/**/*.{ts,js,tsx,jsx}\"",
"commit": "cz",
"dev:styles": "npm --prefix packages/theme-sunrise run dev",
"dev:styles": "npm --prefix packages/shoreline run dev",
"dev:storybook": "concurrently -p [{name}] -n storybook@shoreline,styles@shoreline -c bgMagenta,bgYellow \"pnpm storybook dev -p 6006\" \"pnpm run dev:styles\"",
"dev:docs": "npm --prefix packages/docs run dev",
"build:docs": "npm --prefix packages/docs run build-docs",
Expand All @@ -40,30 +40,29 @@
"commitlint": "commitlint --edit"
},
"devDependencies": {
"@chromatic-com/storybook": "^1",
"@commitlint/cli": "^9.1.2",
"@commitlint/config-conventional": "^9.1.2",
"@commitlint/prompt": "^9.1.2",
"@playwright/test": "^1.43.0",
"@storybook/addon-a11y": "^7.5.3",
"@storybook/addon-actions": "^7.5.3",
"@storybook/addon-essentials": "^7.5.3",
"@storybook/addon-interactions": "^7.6.8",
"@storybook/addon-links": "^7.5.3",
"@storybook/addon-storysource": "^7.5.3",
"@storybook/jest": "^0.2.3",
"@storybook/react": "^7.5.3",
"@storybook/react-vite": "7.5.3",
"@storybook/react-webpack5": "^7.5.3",
"@storybook/test-runner": "^0.16.0",
"@storybook/testing-library": "^0.2.2",
"@storybook/theming": "7.5.3",
"@storybook/addon-a11y": "^8.0.9",
"@storybook/addon-actions": "^8.0.9",
"@storybook/addon-essentials": "^8.0.9",
"@storybook/addon-interactions": "^8.0.9",
"@storybook/addon-links": "^8.0.9",
"@storybook/addon-storysource": "^8.0.9",
"@storybook/react": "^8.0.9",
"@storybook/react-vite": "^8.0.9",
"@storybook/react-webpack5": "^8.0.9",
"@storybook/test-runner": "^0.17.0",
"@storybook/theming": "^8.0.9",
"@types/react": "18.2.14",
"@types/react-dom": "18.2.6",
"@typescript-eslint/eslint-plugin": "5.60.1",
"@typescript-eslint/parser": "5.60.1",
"@vitejs/plugin-react": "4.1.0",
"@vtex/prettier-config": "^0.3.6",
"@vtex/shoreline-stylelint": "workspace",
"@vtex/shoreline-stylelint": "workspace:*",
"@vtex/shoreline-test-utils": "workspace:*",
"@vtex/tsconfig": "^0.5.6",
"chromatic": "^9.1.0",
Expand All @@ -88,7 +87,7 @@
"react": "18.2.0",
"react-dom": "18.2.0",
"react-test-renderer": "18.2.0",
"storybook": "^7.5.3",
"storybook": "^8.0.9",
"stylelint": "^15.11.0",
"stylelint-config-recommended": "^13.0.0",
"stylelint-prettier": "^4.0.2",
Expand Down Expand Up @@ -117,5 +116,8 @@
"commitizen": {
"path": "cz-conventional-changelog"
}
},
"dependencies": {
"@storybook/test": "^8.0.9"
}
}
Loading

0 comments on commit 1e5003e

Please sign in to comment.