Skip to content

Commit 0372154

Browse files
designmattyalkamin
authored andcommitted
cleans up overall configuration of repo (#102)
* cleans up overall configuration of repo * show code playground by default, hides codesandbox
1 parent f4f15fa commit 0372154

25 files changed

+11686
-29143
lines changed

.gitignore

-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ dist
3636
.idea
3737
*.iml
3838

39-
#VSCode metadata
40-
.vscode
41-
4239
# Mac files
4340
.DS_Store
4441

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
language: node_js
2-
script: yarn build && yarn test
2+
script: npm run build && npm run test

.vscode/settings.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"editor.formatOnSave": true,
3+
"editor.tabSize": 2,
4+
"prettier.disableLanguages": ["mdx"],
5+
"javascript.validate.enable": false,
6+
"javascript.format.enable": false
7+
}

README.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ You will need to have installed `styled-components` as well as `styled-system` i
2121
### Getting Started
2222

2323
1. Clone the project: `git clone [email protected]:raster-foundry/blasterjs.git`
24-
2. Setup project: `yarn install`
25-
3. Run `yarn start`
24+
2a. Change node versions: `nvm use` _recommend using nvm for switching node versions_
25+
2b. Setup project: `npm install`
26+
2. Run `npm run start`
2627

2728
### Using the CLI
2829

@@ -89,17 +90,16 @@ be unable to override them with `styled-system`'s _asymmetric_ shortcuts
8990
using the asymmetric shortcuts, which a developer can override using either
9091
asymmetric or symmetric shortcuts.
9192

92-
9393
### Scripts
9494

95-
| Command | Description |
96-
| ---------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
97-
| **`yarn start`** or<br/> **`./scripts/start`** | This is the most commonly used command when developing locally. <br/> It runs `yarn build`, `lerna bootstrap`, and then starts the styleguidist server. |
98-
| `yarn bootstrap` | An alias for `lerna bootstrap`. <br/> Symlinks the various packages together to enable a smooth monorepo development workflow. |
99-
| `yarn test` | Run tests for all components |
100-
| `yarn build` or <br/> `./scripts/build` | Uses lerna to run all packages through babel. |
101-
| `./scripts/release` | Create a new release interactively with Lerna |
102-
| `./scripts/clean` | Remove all existing `node_modules` directories |
95+
| Command | Description |
96+
| ------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
97+
| **`npm run start`** | This is the most commonly used command when developing locally. It runs `npm run build`, `lerna bootstrap`, and starts the `docz` server. |
98+
| `npm run bootstrap` | An alias for `lerna bootstrap`. <br/> Symlinks the various packages together to enable a smooth monorepo development workflow. |
99+
| `npm run test` | Run tests for all components |
100+
| `npm run build` | Uses lerna to run all packages through babel. |
101+
| `npm run release` | Create a new release interactively with Lerna |
102+
| `npm run clean` | Remove all existing `node_modules` directories |
103103

104104
All Lerna [Lerna commands](https://lernajs.io/) are also available.
105105

@@ -131,4 +131,4 @@ This means that whenever one package is updated to a new version, all packages a
131131

132132
1. Ensure all changes have been committed. Publishing will not work if your local version is not up to date with `master`.
133133
1. **`npm addUser --scope @blasterjs`** - this ensures you are logged into npm and have sufficient privileges to publish Blaster
134-
1. **`./scripts/release`** - this runs `lerna publish --exact`, which is an interactive process. All dependencies are pinned to the versions currently installed. Select the appropriate version bump according to semantic versioning.
134+
1. **`npm run release`** - this runs `lerna publish --exact`, which is an interactive process. All dependencies are pinned to the versions currently installed. Select the appropriate version bump according to semantic versioning.

docs/DocsThemeWrapper.js

-9
This file was deleted.

docs/introduction.md renamed to docs/GettingStarted.mdx

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
---
2+
name: Getting Started
3+
route: /getting-started
4+
---
5+
6+
17
# Getting started
28

39
## Theme Provider
@@ -20,4 +26,4 @@ class App extends React.Component {
2026
return <ThemeProvider theme={theme}>...</ThemeProvider>;
2127
}
2228
}
23-
```
29+
```

docs/Home.mdx

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
name: Home
3+
route: /
4+
order: -1
5+
---
6+
7+
# BlasterJS
8+
9+
This is the start of something beautiful.

docs/colors.md

-86
This file was deleted.

docs/colors/usage.md

-1
This file was deleted.

docs/components.md

-1
This file was deleted.

docs/components/ColorSwatch.js

-30
This file was deleted.

docs/components/ColorSwatchGroup.js

-30
This file was deleted.

docs/contributing.md

-1
This file was deleted.
File renamed without changes.
File renamed without changes.

docz/Home.mdx

-7
This file was deleted.

doczrc.js

+8-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@ export default {
44
title: "BlasterJS",
55
ignore: "./templates/index.mdx",
66
repository: "https://github.com/raster-foundry/blasterjs",
7-
ordering: "ascending",
87
propsParser: false,
9-
debug: true,
8+
debug: false,
109
description:
1110
"React Styled-components UI library designed and built by Azavea",
12-
indexHtml: "docz/index.html",
13-
wrapper: "docz/wrapper.js"
11+
indexHtml: "docs/index.html",
12+
wrapper: "docs/wrapper.js",
13+
menu: ["Home", "Getting Started", "Components"],
14+
codeSandbox: false,
15+
themeConfig: {
16+
showPlaygroundEditor: true
17+
}
1418
};

netlify.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# This is the directory that you are publishing from (relative to root of your repo)
1111
publish = "./.docz/dist"
1212
# This will be your default build command
13-
command = "yarn install && yarn run build-docz"
13+
command = "npm install && npm run build-docz"
1414
environment = { CI = "1" }
1515

1616
[[headers]]

0 commit comments

Comments
 (0)