Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into refactor/tag
Browse files Browse the repository at this point in the history
  • Loading branch information
Niznikr committed Sep 26, 2023
2 parents 994d328 + 63e8346 commit 3035e46
Show file tree
Hide file tree
Showing 117 changed files with 5,748 additions and 4,341 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/changeset-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
!contains(github.event.pull_request.labels.*.name, 'skip changeset')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
storybookUrl: ${{ steps.chromatic.outputs.storybookUrl }}
steps:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v3
uses: aws-actions/configure-aws-credentials@v4
with:
audience: https://github.com/launchdarkly
role-to-assume: ${{ vars.AWS_ROLE_ARN }}
Expand All @@ -26,7 +26,7 @@ jobs:
parameterPairs: '/production/common/launchpad-ui/chromatic-token = CHROMATIC_TOKEN'
withDecryption: 'true'

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
matrix:
shard: [1/4, 2/4, 3/4, 4/4]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/package-size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
name: Package Size
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
contents: read
steps:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v3
uses: aws-actions/configure-aws-credentials@v4
with:
audience: https://github.com/launchdarkly
role-to-assume: ${{ vars.AWS_ROLE_ARN }}
Expand All @@ -28,7 +28,7 @@ jobs:
parameterPairs: '/production/common/launchpad-ui/gh-pat-token = CUSTOM_GITHUB_TOKEN'
withDecryption: 'true'

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
fetch-depth: 0
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
needs: [branch-info]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
needs: [branch-info]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
needs: [branch-info]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
25 changes: 15 additions & 10 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import isChromatic from 'chromatic';
import { MotionConfig } from 'framer-motion';
import React from 'react';

import '../packages/tokens/dist/index.css';
Expand Down Expand Up @@ -64,22 +65,26 @@ export const decorators = [
case 'side-by-side': {
document.documentElement.setAttribute('data-theme', 'default');
return (
<div style={{ display: 'flex', flexDirection: 'row', minHeight: '100vh' }}>
<div style={{ width: '50vw', padding: '1rem' }}>
<StoryFn />
</div>
<div data-theme="dark" style={{ width: '50vw', padding: '1rem' }}>
<StoryFn />
<MotionConfig reducedMotion="user">
<div style={{ display: 'flex', flexDirection: 'row', minHeight: '100vh' }}>
<div style={{ width: '50vw', padding: '1rem' }}>
<StoryFn />
</div>
<div data-theme="dark" style={{ width: '50vw', padding: '1rem' }}>
<StoryFn />
</div>
</div>
</div>
</MotionConfig>
);
}
default: {
document.documentElement.setAttribute('data-theme', theme);
return (
<div style={{ padding: '1rem' }}>
<StoryFn />
</div>
<MotionConfig reducedMotion="user">
<div style={{ padding: '1rem' }}>
<StoryFn />
</div>
</MotionConfig>
);
}
}
Expand Down
48 changes: 0 additions & 48 deletions apps/remix/app/entry.server.tsx

This file was deleted.

4 changes: 2 additions & 2 deletions apps/remix/app/root.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { LinksFunction, V2_MetaFunction } from '@remix-run/node';
import type { LinksFunction, MetaFunction } from '@remix-run/node';
import type { PropsWithChildren, ReactNode } from 'react';

import { IconContext } from '@launchpad-ui/icons';
Expand Down Expand Up @@ -36,7 +36,7 @@ export const links: LinksFunction = () => {
];
};

export const meta: V2_MetaFunction = () => {
export const meta: MetaFunction = () => {
return [
{
name: 'charset',
Expand Down
4 changes: 2 additions & 2 deletions apps/remix/app/routes/_index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Menu, MenuItem } from '@launchpad-ui/core';
import type { LoaderFunction, V2_MetaFunction } from '@remix-run/node';
import type { LoaderFunction, MetaFunction } from '@remix-run/node';
import { json } from '@remix-run/node';
import { Link, useLoaderData } from '@remix-run/react';

Expand All @@ -14,7 +14,7 @@ export const loader: LoaderFunction = async () => {
});
};

export const meta: V2_MetaFunction = () => {
export const meta: MetaFunction = () => {
return [{ title: 'Remix SSR' }, { name: 'description', content: 'SSR component testing' }];
};

Expand Down
26 changes: 13 additions & 13 deletions apps/remix/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,31 @@
"build": "remix build",
"clean": "rm -rf public build",
"lint": "eslint '**/*.{ts,tsx,js}' && stylelint '**/*.css' --ignore-path ../../.stylelintignore",
"start": "remix-serve build",
"start": "remix-serve ./build/index.js",
"test": "exit 0"
},
"dependencies": {
"@launchpad-ui/core": "workspace:~",
"@launchpad-ui/icons": "workspace:~",
"@launchpad-ui/tokens": "workspace:~",
"@react-stately/collections": "3.10.0",
"@react-stately/data": "3.10.1",
"@react-stately/table": "3.11.0",
"@remix-run/css-bundle": "^1.19.3",
"@remix-run/node": "^1.19.3",
"@remix-run/react": "^1.19.3",
"@remix-run/serve": "^1.19.3",
"isbot": "^3.6.1",
"@react-stately/collections": "3.10.1",
"@react-stately/data": "3.10.2",
"@react-stately/table": "3.11.1",
"@remix-run/css-bundle": "^2.0.0",
"@remix-run/node": "^2.0.0",
"@remix-run/react": "^2.0.0",
"@remix-run/serve": "^2.0.0",
"isbot": "^3.7.0",
"react": "18.2.0",
"react-dom": "18.2.0"
},
"devDependencies": {
"@remix-run/dev": "^1.19.3",
"@remix-run/eslint-config": "^1.19.3",
"eslint": "^8.48.0",
"@remix-run/dev": "^2.0.0",
"@remix-run/eslint-config": "^2.0.0",
"eslint": "^8.50.0",
"typescript": "^5.2.2"
},
"engines": {
"node": ">=v18.17.0"
"node": ">=18.18.0"
}
}
12 changes: 0 additions & 12 deletions apps/remix/remix.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,6 @@
*/
module.exports = {
ignoredRouteFiles: ['**/.*'],
appDirectory: 'app',
assetsBuildDirectory: 'public/build',
serverBuildPath: 'build/index.js',
publicPath: '/build/',
serverDependenciesToBundle: [/^@launchpad-ui/, 'marked'],
future: {
v2_errorBoundary: true,
v2_headers: true,
v2_meta: true,
v2_normalizeFormMethod: true,
v2_routeConvention: true,
v2_dev: true,
},
serverModuleFormat: 'cjs',
};
25 changes: 13 additions & 12 deletions apps/remix/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
{
"include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
"compilerOptions": {
"baseUrl": ".",
"noEmit": true,
"forceConsistentCasingInFileNames": true,
"target": "es2019",
"module": "es2020",
"lib": ["DOM", "DOM.Iterable", "es2020"],
"allowJs": true,
"lib": ["DOM", "DOM.Iterable", "ES2022"],
"isolatedModules": true,
"esModuleInterop": true,
"jsx": "react-jsx",
"moduleResolution": "Bundler",
"resolveJsonModule": true,
"target": "ES2022",
"strict": true,
"allowJs": true,
"forceConsistentCasingInFileNames": true,
"baseUrl": ".",
"paths": {
"~/*": ["./app/*"]
},
"esModuleInterop": true,
"isolatedModules": true,
"jsx": "react-jsx",
"moduleResolution": "node",
"resolveJsonModule": true

// Remix takes care of building everything in `remix build`.
"noEmit": true
}
}
21 changes: 11 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@commitlint/cli": "^17.7.1",
"@commitlint/config-conventional": "^17.7.0",
"@etchteam/storybook-addon-status": "^4.2.4",
"@playwright/test": "^1.37.0",
"@playwright/test": "^1.38.0",
"@storybook/addon-a11y": "^7.3.0",
"@storybook/addon-essentials": "^7.3.0",
"@storybook/addon-interactions": "^7.3.0",
Expand All @@ -64,22 +64,22 @@
"@testing-library/dom": "^9.3.0",
"@testing-library/jest-dom": "^6.1.2",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
"@testing-library/user-event": "^14.5.1",
"@types/node": "^18.17.0",
"@types/react": "^18.2.8",
"@types/react-dom": "^18.2.4",
"@types/testing-library__jest-dom": "^5.14.3",
"@typescript-eslint/eslint-plugin": "^6.4.0",
"@typescript-eslint/parser": "^6.4.0",
"@typescript-eslint/eslint-plugin": "^6.7.0",
"@typescript-eslint/parser": "^6.7.0",
"@vanilla-extract/css": "^1.13.0",
"@vanilla-extract/vite-plugin": "^3.9.0",
"@vitejs/plugin-react-swc": "^3.3.2",
"@vitejs/plugin-react-swc": "^3.4.0",
"@vitest/coverage-v8": "^0.34.1",
"@vitest/ui": "^0.34.1",
"chromatic": "^6.24.1",
"chromatic": "^7.2.0",
"concurrently": "^8.2.0",
"deepmerge": "^4.3.1",
"eslint": "^8.48.0",
"eslint": "^8.50.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-functional": "^6.0.0",
"eslint-plugin-import": "^2.28.0",
Expand All @@ -89,19 +89,20 @@
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-testing-library": "^6.0.0",
"fast-glob": "^3.3.0",
"framer-motion": "10.16.1",
"husky": "^8.0.1",
"jsdom": "^22.1.0",
"lint-staged": "^14.0.0",
"nx": "^16.7.4",
"plop": "^3.1.1",
"nx": "^16.9.0",
"plop": "^4.0.0",
"postcss": "^8.4.16",
"postcss-import": "^15.1.0",
"postcss-nested": "^6.0.0",
"postcss-preset-env": "^9.1.0",
"prettier": "^3.0.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"rollup-plugin-pure": "^0.1.1",
"rollup-plugin-pure": "^0.2.1",
"storybook-addon-pseudo-states": "^2.1.0",
"stylelint": "^15.10.0",
"stylelint-config-standard": "^34.0.0",
Expand Down
Loading

0 comments on commit 3035e46

Please sign in to comment.