Skip to content

Commit

Permalink
Un-revert npm-to-yarn PR
Browse files Browse the repository at this point in the history
  • Loading branch information
mqp committed Jul 26, 2018
1 parent bb5ff42 commit cf78181
Show file tree
Hide file tree
Showing 12 changed files with 12,526 additions and 8,062 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Expand Up @@ -57,8 +57,8 @@ typings/
# dotenv environment variables file
.env

# Ignore public folder with webpack build output
public/
# Ignore dist folder with webpack build output
dist/

.DS_Store

Expand Down
16 changes: 8 additions & 8 deletions .travis.yml
@@ -1,10 +1,10 @@
language: node_js
node_js: "9"
cache: yarn
before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.5.1
- export PATH="$HOME/.yarn/bin:$PATH"
install: yarn
node_js: "10"
cache:
directories:
- "$HOME/.npm"
install:
- npm ci
script:
- yarn lint
- ./scripts/check-yarn-lock.sh
- npm run lint
- npm run build
9 changes: 5 additions & 4 deletions README.md
Expand Up @@ -5,20 +5,21 @@ A prototype client demonstrating a multi-user experience in WebVR. Built with

## Getting Started

To run the social client, run:
To run the client, run:

```sh
git clone https://github.com/mozilla/hubs.git
yarn install
yarn start
cd hubs
npm ci
npm start
```

## Building Static Files

To bundle javascript and generate the html templates, run:

```sh
yarn build
npm run build
```

## hubs.local Host Entry
Expand Down

0 comments on commit cf78181

Please sign in to comment.