Skip to content

Commit

Permalink
Merge pull request #1 from palantir/master
Browse files Browse the repository at this point in the history
Merge blueprint
  • Loading branch information
cathyxz authored Aug 20, 2017
2 parents fd8c319 + c43289f commit 6aff221
Show file tree
Hide file tree
Showing 58 changed files with 36,330 additions and 19,147 deletions.
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ npm-debug.log
lerna-debug.log
package-lock.json

# Gradle
.gradle/
.node/

# Sass
.sass-cache/

Expand Down
22 changes: 16 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,23 @@ The other packages (`site-docs` and `site-landing`) are not published to NPM as
We use [Lerna](https://lernajs.io/) to manage inter-package dependencies in this monorepo.
Builds are orchestrated via [Gulp](http://gulpjs.com/) tasks.

__Prerequisite__: Node.js v6 or v7
__Prerequisites__: Node.js v6+, Yarn v0.28+

1. `git clone` this repository (or fork if you lack permissions)
1. `npm install` to install build dependencies
1. `npm run bootstrap` to install and link each package using [Lerna](https://lernajs.io/)
1. `npm run gulp` to compile and start the server and watcher
1. Open your browser to [localhost:9000/packages/site-docs/dist/](http://localhost:9000/packages/site-docs/dist/)
1. `git clone` this repository (or fork if you lack permissions).
1. `yarn` to install dependencies at the root of the repo.
1. `yarn bootstrap` to install package dependencies install and symlink them using [Lerna](https://lernajs.io/).
1. `yarn gulp` to compile and start the server and watcher.
1. Open your browser to [localhost:9000/packages/site-docs/dist/](http://localhost:9000/packages/site-docs/dist/).

### Updating build dependencies

1. `yarn add <package-name>` or `yarn upgrade <package-name>`.
1. Commit the result.

### Updating package dependencies

1. Update the relevant `package.json` file. Make sure to retain the `^` semver range.
1. Run `yarn bootstrap` and commit the result.

## Contributing

Expand Down
36 changes: 25 additions & 11 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,41 @@ general:
- packages/table/preview
# GH Pages content
- docs

machine:
pre:
- mkdir ~/yarn
environment:
YARN_VERSION: 0.28.4
PATH: $PATH:$HOME/$CIRCLE_PROJECT_REPONAME/node_modules/.bin
node:
version: 6.1.0
version: 7.10.0

dependencies:
cache_directories:
- packages/core/node_modules
- packages/datetime/node_modules
- packages/docs/node_modules
- packages/labs/node_modules
- packages/site-docs/node_modules
- packages/site-landing/node_modules
- packages/table/node_modules
- ~/yarn
- ~/.cache/yarn
- ~/$CIRCLE_PROJECT_REPONAME/packages/core/node_modules
- ~/$CIRCLE_PROJECT_REPONAME/packages/datetime/node_modules
- ~/$CIRCLE_PROJECT_REPONAME/packages/docs/node_modules
- ~/$CIRCLE_PROJECT_REPONAME/packages/labs/node_modules
- ~/$CIRCLE_PROJECT_REPONAME/packages/site-docs/node_modules
- ~/$CIRCLE_PROJECT_REPONAME/packages/site-landing/node_modules
- ~/$CIRCLE_PROJECT_REPONAME/packages/table/node_modules
# non-zero exit codes in `dependencies` group will fail the build early
# so these following commands will block the build and prevent tests
post:
- lerna bootstrap
- npm run build:gulp
override:
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERSION
- yarn install --pure-lockfile
- echo "Checking if yarn.lock changed..." && git diff --exit-code
- yarn bootstrap
- yarn build:gulp

test:
override:
- gulp check
- gulp test

deployment:
preview:
branch: /.*/
Expand Down
2 changes: 1 addition & 1 deletion docs/blueprint-landing.css
Original file line number Diff line number Diff line change
Expand Up @@ -4940,7 +4940,7 @@ span.pt-icon {
.pt-icon-paragraph::before {
content: "\E76C"; }

.pt-icon-banl-account::before {
.pt-icon-bank-account::before {
content: "\E76F"; }

.pt-icon-cell-tower::before {
Expand Down
Loading

0 comments on commit 6aff221

Please sign in to comment.