Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1764 from h3poteto/fix/command 

Fix npm command to yarn
This commit is contained in:
AkiraFukushima 2020-09-13 17:16:00 +09:00 committed by GitHub
parent 789cccf643 82690e5cba
commit 3bbc6498fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml
View File

@ -17,7 +17,7 @@ jobs:
- node_modules-{{ arch }}-node12.13.1-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }} - node_modules-{{ arch }}-node12.13.1-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }}
- run: - run:
name: Install packages name: Install packages
command: npm install command: yarn install
- save_cache: - save_cache:
name: Saving cache - node_modules name: Saving cache - node_modules
key: node_modules-{{ arch }}-node12.13.1-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }} key: node_modules-{{ arch }}-node12.13.1-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }}
@ -25,4 +25,4 @@ jobs:
- node_modules - node_modules
- run: - run:
name: spec name: spec
command: npm run spec command: yarn run spec

2
DEVELOPMENT.md
View File

@ -52,7 +52,7 @@ and register your KeyChain.
Then, create a Mac App ID like `org.whalebird.desktop`. Then, create a Mac App ID like `org.whalebird.desktop`.
```bash ```bash
$ npm run build:mas $ yarn run build:mas
# This command automatically loads the certificates from you keychain. # This command automatically loads the certificates from you keychain.
$ ./appStore.sh $ ./appStore.sh

16
Makefile
View File

@ -5,22 +5,22 @@ VERSION = 1.0.0
all: build mac linux win32 win64 all: build mac linux win32 win64
install: package.json install: package.json
npm install yarn install
build: install build: install
npm run build yarn run build
mac: mac:
npm run package:mac yarn run package:mac
mv build/Whalebird-${VERSION}-mac.dmg build/Whalebird-${VERSION}-darwin-x64.dmg mv build/Whalebird-${VERSION}-mac.dmg build/Whalebird-${VERSION}-darwin-x64.dmg
cd build; shasum -a 256 Whalebird-${VERSION}-darwin-x64.dmg >> sha256sum.txt cd build; shasum -a 256 Whalebird-${VERSION}-darwin-x64.dmg >> sha256sum.txt
mas: mas:
npm run build:mas yarn run build:mas
./appStore.sh ./appStore.sh
linux: 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-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-x86_64.rpm build/Whalebird-${VERSION}-linux-x64.rpm
mv build/Whalebird-${VERSION}-linux-i386.deb build/Whalebird-${VERSION}-linux-ia32.deb 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 cd build; shasum -a 256 Whalebird-${VERSION}-linux-x64.tar.bz2 >> sha256sum.txt
win32: win32:
npm run package:win32 yarn run package:win32
mv build/Whalebird-${VERSION}-win.exe build/Whalebird-${VERSION}-windows-ia32.exe mv build/Whalebird-${VERSION}-win.exe build/Whalebird-${VERSION}-windows-ia32.exe
cd build; shasum -a 256 Whalebird-${VERSION}-windows-ia32.exe >> sha256sum.txt cd build; shasum -a 256 Whalebird-${VERSION}-windows-ia32.exe >> sha256sum.txt
win64: win64:
npm run package:win64 yarn run package:win64
mv build/Whalebird-${VERSION}-win.exe build/Whalebird-${VERSION}-windows-x64.exe mv build/Whalebird-${VERSION}-win.exe build/Whalebird-${VERSION}-windows-x64.exe
cd build; shasum -a 256 Whalebird-${VERSION}-windows-x64.exe >> sha256sum.txt cd build; shasum -a 256 Whalebird-${VERSION}-windows-x64.exe >> sha256sum.txt
clean: clean:
npm run build:clean yarn run build:clean

14
package.json
View File

@ -27,19 +27,19 @@
"build": "node .electron-vue/build.js", "build": "node .electron-vue/build.js",
"build:clean": "cross-env BUILD_TARGET=clean 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:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js",
"build:mac": "npm run build && npm run package:mac", "build:mac": "yarn run build && yarn run package:mac",
"build:linux": "npm run build && npm run package:linux", "build:linux": "yarn run build && yarn run package:linux",
"build:win32": "npm run build && npm run package:win32", "build:win32": "yarn run build && yarn run package:win32",
"build:win64": "npm run build && npm run package:win64", "build:win64": "yarn run build && yarn 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: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:mac": "electron-builder --mac --x64",
"package:linux": "electron-builder --linux", "package:linux": "electron-builder --linux",
"package:win32": "electron-builder --win --ia32", "package:win32": "electron-builder --win --ia32",
"package:win64": "electron-builder --win --x64", "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: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", "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" "spec": "NODE_ENV=test jest -u --maxWorkers=3"
}, },
"build": { "build": {