Use more yarn.

lodash · Oct 13, 2016 · 4b21b75 · 4b21b75
1 parent 0b04309
commit 4b21b75
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -80,8 +80,8 @@ install:
 
   # Use lodash-cli from GitHub.
   - git clone --depth=10 --branch=master git://github.com/lodash/lodash-cli ./node_modules/lodash-cli
-  - mkdir -p ./node_modules/lodash-cli/node_modules/lodash && cd $_ && cp ../../../../lodash.js ./lodash.js && cp ../../../../package.json ./package.json
-  - cd ../../ && npm i --production && cd ../../
+  - mkdir -p ./node_modules/lodash-cli/node_modules/lodash; cd $_; cp ../../../../lodash.js ./lodash.js; cp ../../../../package.json ./package.json
+  - cd ../../; npm i --production; cd ../../
 
 script:
   # Detect code coverage.
@@ -98,7 +98,8 @@ script:
   - |
       if [ $ISTANBUL = false ]; then
         node ./node_modules/lodash-cli/bin/lodash -o ./dist/lodash.js
-        node ./node_modules/lodash-cli/bin/lodash modularize exports=node -o ./ && node ./node_modules/lodash-cli/bin/lodash -d -o ./lodash.js
+        node ./node_modules/lodash-cli/bin/lodash modularize exports=node -o ./
+        node ./node_modules/lodash-cli/bin/lodash -d -o ./lodash.js
         if [ $SAUCE_LABS = false ]; then
           cd ./test
           $BIN $OPTION ./test.js ../lodash.js
@@ -112,7 +113,7 @@ script:
   - |
       if [ $SAUCE_LABS = true ]; then
         node ./node_modules/lodash-cli/bin/lodash core -o ./dist/lodash.core.js
-        npm run build
+        yarn run build
         $BIN ./test/saucelabs.js name="lodash tests"     runner="test/index.html?build=../dist/lodash.js&noglobals=true"     tags="development"
         $BIN ./test/saucelabs.js name="lodash tests"     runner="test/index.html?build=../dist/lodash.min.js&noglobals=true" tags="production"
         $BIN ./test/saucelabs.js name="lodash-fp tests"  runner="test/fp.html?noglobals=true"                                tags="development"

diff --git a/package.json b/package.json
@@ -6,26 +6,26 @@
   "main": "lodash.js",
   "engines": { "node": ">=4.0.0" },
   "scripts": {
-    "build": "npm run build:main && npm run build:fp",
+    "build": "yarn run build:main && yarn run build:fp",
     "build:fp": "node lib/fp/build-dist.js",
     "build:fp-modules": "node lib/fp/build-modules.js",
     "build:main": "node lib/main/build-dist.js",
     "build:main-modules": "node lib/main/build-modules.js",
-    "doc": "node lib/main/build-doc github && npm run test:doc",
+    "doc": "node lib/main/build-doc github && yarn run test:doc",
     "doc:fp": "node lib/fp/build-doc",
     "doc:site": "node lib/main/build-doc site",
-    "doc:sitehtml": "optional-dev-dependency marky-markdown@^8.1.0 && npm run doc:site && node lib/main/build-site",
-    "pretest": "npm run build",
-    "style": "npm run style:main && npm run style:fp && npm run style:perf && npm run style:test",
+    "doc:sitehtml": "optional-dev-dependency marky-markdown@^8.1.0 && yarn run doc:site && node lib/main/build-site",
+    "pretest": "yarn run build",
+    "style": "yarn run style:main && yarn run style:fp && yarn run style:perf && yarn run style:test",
     "style:fp": "jscs fp/*.js lib/**/*.js",
     "style:main": "jscs lodash.js",
     "style:perf": "jscs perf/*.js perf/**/*.js",
     "style:test": "jscs test/*.js test/**/*.js",
-    "test": "npm run test:main && npm run test:fp",
+    "test": "yarn run test:main && yarn run test:fp",
     "test:doc": "markdown-doctest doc/*.md",
     "test:fp": "node test/test-fp",
     "test:main": "node test/test",
-    "validate": "npm run style && npm run test"
+    "validate": "yarn run style && yarn run test"
   },
   "devDependencies": {
     "async": "^2.0.1",