From 82690e5cbaa557558d6672c294a4ccb2b77b5d2e Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Sun, 13 Sep 2020 17:13:22 +0900
Subject: [PATCH] Fix npm command to yarn
---
.circleci/config.yml | 4 ++--
DEVELOPMENT.md | 2 +-
Makefile | 16 ++++++++--------
package.json | 14 +++++++-------
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index aef1b221..6ab3b99d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,7 +17,7 @@ jobs:
- node_modules-{{ arch }}-node12.13.1-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }}
- run:
name: Install packages
- command: npm install
+ command: yarn install
- save_cache:
name: Saving cache - node_modules
key: node_modules-{{ arch }}-node12.13.1-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }}
@@ -25,4 +25,4 @@ jobs:
- node_modules
- run:
name: spec
- command: npm run spec
+ command: yarn run spec
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 04338d34..24562b7a 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -52,7 +52,7 @@ and register your KeyChain.
Then, create a Mac App ID like `org.whalebird.desktop`.
```bash
-$ npm run build:mas
+$ yarn run build:mas
# This command automatically loads the certificates from you keychain.
$ ./appStore.sh
diff --git a/Makefile b/Makefile
index 0f1e64d4..f43f9491 100644
--- a/Makefile
+++ b/Makefile
@@ -5,22 +5,22 @@ VERSION = 1.0.0
all: build mac linux win32 win64
install: package.json
- npm install
+ yarn install
build: install
- npm run build
+ yarn run build
mac:
- npm run package:mac
+ yarn run package:mac
mv build/Whalebird-${VERSION}-mac.dmg build/Whalebird-${VERSION}-darwin-x64.dmg
cd build; shasum -a 256 Whalebird-${VERSION}-darwin-x64.dmg >> sha256sum.txt
mas:
- npm run build:mas
+ yarn run build:mas
./appStore.sh
linux:
- npm run package:linux
+ yarn run package:linux
mv build/Whalebird-${VERSION}-linux-amd64.deb build/Whalebird-${VERSION}-linux-x64.deb
mv build/Whalebird-${VERSION}-linux-x86_64.rpm build/Whalebird-${VERSION}-linux-x64.rpm
mv build/Whalebird-${VERSION}-linux-i386.deb build/Whalebird-${VERSION}-linux-ia32.deb
@@ -38,14 +38,14 @@ linux:
cd build; shasum -a 256 Whalebird-${VERSION}-linux-x64.tar.bz2 >> sha256sum.txt
win32:
- npm run package:win32
+ yarn run package:win32
mv build/Whalebird-${VERSION}-win.exe build/Whalebird-${VERSION}-windows-ia32.exe
cd build; shasum -a 256 Whalebird-${VERSION}-windows-ia32.exe >> sha256sum.txt
win64:
- npm run package:win64
+ yarn run package:win64
mv build/Whalebird-${VERSION}-win.exe build/Whalebird-${VERSION}-windows-x64.exe
cd build; shasum -a 256 Whalebird-${VERSION}-windows-x64.exe >> sha256sum.txt
clean:
- npm run build:clean
+ yarn run build:clean
diff --git a/package.json b/package.json
index 93f35217..d86d9c96 100644
--- a/package.json
+++ b/package.json
@@ -27,19 +27,19 @@
"build": "node .electron-vue/build.js",
"build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js",
"build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js",
- "build:mac": "npm run build && npm run package:mac",
- "build:linux": "npm run build && npm run package:linux",
- "build:win32": "npm run build && npm run package:win32",
- "build:win64": "npm run build && npm run package:win64",
- "build:mas": "npm run build:clean && npm run pack && electron-packager ./ 'Whalebird' --platform=mas --arch=x64 --electron-version=10.1.0 --asar.unpackDir='build/sounds' --out=packages --ignore='^/src' --ignore='^/.electron-vue' --ignore='^/.envrc' --ignore='^/packages' --ignore='^/plist' --ignore='^/static' --ignore='^/whalebird.db' --ignore='^/screenshot.png' --prune=true --icon=./build/icons/icon.icns --overwrite --app-bundle-id=org.whalebird.desktop --app-version=$npm_package_config_appVersion --build-version=$npm_package_config_buildVersion --extend-info='./plist/team.plist' --osx-sign --app-category-type=public.app-category.social-networking",
+ "build:mac": "yarn run build && yarn run package:mac",
+ "build:linux": "yarn run build && yarn run package:linux",
+ "build:win32": "yarn run build && yarn run package:win32",
+ "build:win64": "yarn run build && yarn run package:win64",
+ "build:mas": "yarn run build:clean && yarn run pack && electron-packager ./ 'Whalebird' --platform=mas --arch=x64 --electron-version=10.1.0 --asar.unpackDir='build/sounds' --out=packages --ignore='^/src' --ignore='^/.electron-vue' --ignore='^/.envrc' --ignore='^/packages' --ignore='^/plist' --ignore='^/static' --ignore='^/whalebird.db' --ignore='^/screenshot.png' --prune=true --icon=./build/icons/icon.icns --overwrite --app-bundle-id=org.whalebird.desktop --app-version=$npm_package_config_appVersion --build-version=$npm_package_config_buildVersion --extend-info='./plist/team.plist' --osx-sign --app-category-type=public.app-category.social-networking",
"package:mac": "electron-builder --mac --x64",
"package:linux": "electron-builder --linux",
"package:win32": "electron-builder --win --ia32",
"package:win64": "electron-builder --win --x64",
- "pack": "npm run pack:main && npm run pack:renderer",
+ "pack": "yarn run pack:main && yarn run pack:renderer",
"pack:main": "cross-env NODE_ENV=production webpack --mode production --progress --colors --config .electron-vue/webpack.main.config.js",
"pack:renderer": "cross-env NODE_ENV=production webpack --mode production --progress --colors --config .electron-vue/webpack.renderer.config.js",
- "postinstall": "npm run lint:fix",
+ "postinstall": "yarn run lint:fix",
"spec": "NODE_ENV=test jest -u --maxWorkers=3"
},
"build": {