Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release v2.1.0 #165

Merged
merged 16 commits into from
Apr 20, 2019
Merged

release v2.1.0 #165

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ab737a1
Config of End-to-End & Search window e2e test code (#164)
HyunmoAhn Jan 23, 2019
20ab46a
Add/feature 2.0.4 (#167)
HyunmoAhn Feb 13, 2019
2951f81
code refactoring for readability (#162)
HyunmoAhn Mar 30, 2019
07f3f20
design search-view (#166)
yangjinhwa Apr 14, 2019
9bbfc4c
update taskbar title on widget of windowOS (#171)
HyunmoAhn Apr 15, 2019
f63d36d
fix unit test code
Apr 15, 2019
7cee9e2
adjust package script
Apr 15, 2019
2c6f8d1
adjust webpack config file
Apr 15, 2019
771ffc2
adjust babel config
Apr 17, 2019
59088cf
adjust jest config file
Apr 18, 2019
106db97
adjust electron build config
Apr 18, 2019
2454798
upgrade husky & lint-staged
Apr 18, 2019
83600b3
adjust eslint config
Apr 18, 2019
b64de0c
make compact config and script (#172)
HyunmoAhn Apr 18, 2019
8245160
config release v2.1.0
Apr 18, 2019
2bd987a
update download link latest version
Apr 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
adjust electron build config
  • Loading branch information
HyunMo Ahn committed Apr 18, 2019
commit 106db97c70ba0c770dbdf9f3ac498966761a87ff
0 electron-builder.yml → config/electron-builder.yml
View file
Open in desktop
File renamed without changes.
9 changes: 7 additions & 2 deletions config/webpack/webpack.webview.js → config/webpack/webpack.electron.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
// Webpack config for Electron main.js
const basic = require('./webpack.basic.config');
const { BUILD_PATH } = require('../path');

const { APP_PATH, BUILD_PATH, CONFIG_PATH } = require('../path');

module.exports = {
entry: './app/main.js',
entry: `${APP_PATH}/main.js`,
output: {
filename: '[name].prod.js',
path: BUILD_PATH,
Expand All @@ -17,6 +19,9 @@ module.exports = {
use: [
{
loader: 'babel-loader',
options: {
configFile: `${CONFIG_PATH}/babel/babel.config.js`,
},
},
'eslint-loader',
],
Expand Down
1 change: 1 addition & 0 deletions config/webpack/webpack.prod.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Webpack config for page
const webpackMerge = require('webpack-merge');
const webpackBaseConfig = require('./webpack.basic.config');
const { BUILD_PATH } = require('../path');
Expand Down
21 changes: 11 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@
"start:main": "cross-env NODE_ENV=development electron -r ./config/babel/babel.register.js ./app/main.js",
"start:renderer": "cross-env NODE_ENV=development node -r ./config/babel/babel.register.js ./node_modules/webpack-dev-server/bin/webpack-dev-server --config config/webpack/webpack.dev.config.js --hot --inline --watch",
"watch:main": "nodemon --exec \"yarn start:main\" --ext js --ignore build/ --ignore dist/ --ignore coverage/",
"build": "concurrently \"yarn build:app\" \"yarn build:webview\"",
"build:app": "cross-env NODE_ENV=production webpack --config ./config/webpack/webpack.prod.config.js",
"build:webview": "cross-env NODE_ENV=production webpack --config ./config/webpack/webpack.webview.js",
"build:app:watch": "cross-env NODE_ENV=production webpack --watch --config ./config/webpack/webpack.prod.config.js",
"package": "yarn build && build -c electron-builder.yml -mw",
"package:mac": "yarn build && build -c electron-builder.yml -m",
"package:win": "yarn build && build -c electron-builder.yml -w",
"package:release": "yarn build && build -c electron-builder.yml -mw -p always ",
"build": "concurrently \"yarn build:page\" \"yarn build:electron\"",
"build:page": "cross-env NODE_ENV=production webpack --config ./config/webpack/webpack.prod.config.js",
"build:electron": "cross-env NODE_ENV=production webpack --config config/webpack/webpack.electron.js",
"build:page:watch": "cross-env NODE_ENV=production webpack --watch --config ./config/webpack/webpack.prod.config.js",
"package": "yarn build && build -c ./config/electron-builder.yml -mw",
"package:mac": "yarn build && build -c ./config/electron-builder.yml -m",
"package:win": "yarn build && build -c ./config/electron-builder.yml -w",
"package:release": "yarn build && build -c ./config/electron-builder.yml -mw -p always ",
"test": "jest --config ./config/jest/jest.config.js",
"test:watch": "yarn test -- --watch",
"test:coverage": "yarn test -- --coverage",
"show:coverage": "yarn test:coverage && open ./coverage/lcov-report/index.html",
"e2e": "jest --config config/jest/jest.e2e.config.js",
"e2e:build": "cross-env NODE_ENV=test webpack --config config/webpack/webpack.prod.config.js",
"e2e": "jest --config ./config/jest/jest.e2e.config.js",
"e2e:build": "cross-env NODE_ENV=test webpack --config ./config/webpack/webpack.prod.config.js",
"e2e:watch": "yarn e2e:build && yarn e2e -- --watch",
"coveralls": "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls",
"lint": "eslint app --ext .js,.jsx",
Expand Down Expand Up @@ -50,6 +50,7 @@
"babel-jest": "^23.6.0",
"babel-loader": "^8.0.4",
"babel-plugin-module-resolver": "^3.1.1",
"concurrently": "^4.1.0",
"coveralls": "^3.0.1",
"cross-env": "^5.2.0",
"electron": "2.0.13",
Expand Down
53 changes: 53 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2347,6 +2347,21 @@ concat-stream@1.6.2, concat-stream@^1.5.0:
readable-stream "^2.2.2"
typedarray "^0.0.6"

concurrently@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-4.1.0.tgz#17fdf067da71210685d9ea554423ef239da30d33"
integrity sha512-pwzXCE7qtOB346LyO9eFWpkFJVO3JQZ/qU/feGeaAHiX1M3Rw3zgXKc5cZ8vSH5DGygkjzLFDzA/pwoQDkRNGg==
dependencies:
chalk "^2.4.1"
date-fns "^1.23.0"
lodash "^4.17.10"
read-pkg "^4.0.1"
rxjs "^6.3.3"
spawn-command "^0.0.2-1"
supports-color "^4.5.0"
tree-kill "^1.1.0"
yargs "^12.0.1"

configstore@^3.0.0:
version "3.1.2"
resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
Expand Down Expand Up @@ -2729,6 +2744,11 @@ data-urls@^1.0.0:
whatwg-mimetype "^2.1.0"
whatwg-url "^7.0.0"

date-fns@^1.23.0:
version "1.30.1"
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==

date-fns@^1.27.2:
version "1.29.0"
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
Expand Down Expand Up @@ -7865,6 +7885,15 @@ read-pkg@^2.0.0:
normalize-package-data "^2.3.2"
path-type "^2.0.0"

read-pkg@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc=
dependencies:
normalize-package-data "^2.3.2"
parse-json "^4.0.0"
pify "^3.0.0"

"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6:
version "2.3.6"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
Expand Down Expand Up @@ -8384,6 +8413,13 @@ rxjs@^6.1.0:
dependencies:
tslib "^1.9.0"

rxjs@^6.3.3:
version "6.4.0"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
dependencies:
tslib "^1.9.0"

safe-buffer@5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
Expand Down Expand Up @@ -8800,6 +8836,11 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"

spawn-command@^0.0.2-1:
version "0.0.2-1"
resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0"
integrity sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=

spdx-correct@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
Expand Down Expand Up @@ -9094,6 +9135,13 @@ supports-color@^3.1.2, supports-color@^3.2.3:
dependencies:
has-flag "^1.0.0"

supports-color@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
integrity sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=
dependencies:
has-flag "^2.0.0"

supports-color@^5.1.0, supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
Expand Down Expand Up @@ -9327,6 +9375,11 @@ tr46@^1.0.1:
dependencies:
punycode "^2.1.0"

tree-kill@^1.1.0:
version "1.2.1"
resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a"
integrity sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==

trim-newlines@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
Expand Down