Skip to content

Commit

Permalink
Merge branch 'master' into publish-docs-update
Browse files Browse the repository at this point in the history
  • Loading branch information
Nathan Stilwell committed Oct 19, 2022
2 parents e257704 + 89831d9 commit cc3510f
Show file tree
Hide file tree
Showing 13 changed files with 33 additions and 49 deletions.
3 changes: 1 addition & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@


* @cockroachdb/CRUX
#TODO(nathanstilwell) - do we want to make this a team?
/docs @annebirzin @rsadres @rachwangcrl
/docs @annebirzin @rsadres
8 changes: 4 additions & 4 deletions .github/workflows/pull-request-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:
node-version: [16.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
node-version: 16
cache: 'yarn'

- name: Lerna bootstrap
run: lerna bootstrap
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
# Based on https://intuit.github.io/auto/docs/build-platforms/github-actions
name: Release

on: [push]
on:
push:
branches:
- master
pull_request:

jobs:
release:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'skip ci')"
if: "!contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'skip ci') && !github.event.pull_request.head.repo.fork"
steps:
- uses: actions/checkout@v3
with:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# (Tue Oct 18 2022)



---

# (Mon Oct 17 2022)

#### ⚠️ Pushed to `master`
Expand Down
3 changes: 0 additions & 3 deletions packages/icons/AUTHORS

This file was deleted.

15 changes: 2 additions & 13 deletions packages/icons/notests.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
const emoji = require("node-emoji");
const chalk = require("chalk");

console.log(`
${emoji.emojify(
`:ghost: :ghost: :ghost: ${chalk.bold.red("Nope!")} :ghost: :ghost: :ghost:`,
)}
There are no tests here because this package contains no code.
It is fully dependent on ${emoji.get("package")} ${chalk.bold(
"@svgr/cli",
)} ${emoji.get("package")}, so you can look at their
tests at ${chalk.cyanBright(
"https://github.com/gregberge/svgr/tree/master/packages/cli",
)}.
It is fully dependent on @svgr/cli. Please refer to their
tests at https://github.com/gregberge/svgr/tree/master/packages/cli.
`);
3 changes: 1 addition & 2 deletions packages/icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
"devDependencies": {
"@svgr/cli": "5.3.0",
"@types/react": "17.0.50",
"chalk": "5.1.2",
"node-emoji": "1.11.0",
"npm-run-all": "4.1.5",
"react": "17.0.2",
"rimraf": "3.0.2",
"typescript": "4.8.4"
Expand Down
3 changes: 0 additions & 3 deletions packages/storybook-ui-components/AUTHORS

This file was deleted.

4 changes: 2 additions & 2 deletions packages/storybook-ui-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "storybook-ui-components",
"version": "0.3.9",
"version": "0.4.0",
"description": "Storybook supporting ui-components as a component catalog",
"main": "index.js",
"private": true,
Expand All @@ -20,7 +20,7 @@
"homepage": "https://github.com/cockroachdb/ui#readme",
"dependencies": {
"@cockroachlabs/icons": "^0.5.4",
"@cockroachlabs/ui-components": "^0.3.11",
"@cockroachlabs/ui-components": "^0.4.0",
"@storybook/builder-webpack5": "6.5.12",
"@storybook/manager-webpack5": "6.5.12",
"ts-loader": "9.4.1",
Expand Down
3 changes: 0 additions & 3 deletions packages/ui-components/AUTHORS

This file was deleted.

2 changes: 1 addition & 1 deletion packages/ui-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cockroachlabs/ui-components",
"version": "0.3.11",
"version": "0.4.0",
"description": "UI Components is a reusable component library. It provides the core components for the Cockroach design system.",
"repository": {
"type": "git",
Expand Down
8 changes: 8 additions & 0 deletions packages/ui-components/src/Badge/Badge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export type BadgeIntent = "neutral" | "success" | "warning" | "danger" | "info";
interface OwnBadgeProps {
intent?: BadgeIntent;
transformCase?: BadgeCase;
debug?: boolean;
}
type NativeDivProps = Omit<
React.HTMLAttributes<HTMLDivElement>,
Expand All @@ -24,6 +25,7 @@ const cx = classNames.bind(styles);
export const Badge: FunctionComponent<BadgeProps> = ({
intent = "neutral",
transformCase = "uppercase",
debug = false,
children,
className,
...props
Expand All @@ -37,6 +39,12 @@ export const Badge: FunctionComponent<BadgeProps> = ({
if (children !== undefined) {
return (
<div className={classnames} {...props}>
{debug && (
<pre>
intent :: {intent}
transformCase :: {transformCase}
</pre>
)}
{children}
</div>
);
Expand Down
16 changes: 2 additions & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6335,12 +6335,7 @@ chalk@4.1.0:
ansi-styles "^4.1.0"
supports-color "^7.1.0"

chalk@5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.1.2.tgz#d957f370038b75ac572471e83be4c5ca9f8e8c45"
integrity sha512-E5CkT4jWURs1Vy5qGJye+XwCkNj7Od3Af7CP6SujMetSMkLs8Do2RWJK5yx1wamHV/op8Rz+9rltjaTQWDnEFQ==

chalk@^2.0.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2:
chalk@^2.0.0, chalk@^2.4.1:
version "2.4.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
Expand Down Expand Up @@ -11966,14 +11961,7 @@ node-dir@^0.1.10:
dependencies:
minimatch "^3.0.2"

node-emoji@1.11.0:
version "1.11.0"
resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c"
integrity sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==
dependencies:
lodash "^4.17.21"

node-fetch@2.6.7, node-fetch@^2.6.1, node-fetch@^2.6.7:
node-fetch@^2.6.1, node-fetch@^2.6.7:
version "2.6.7"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
Expand Down

0 comments on commit cc3510f

Please sign in to comment.