Skip to content

Commit

Permalink
Merge pull request #70 from cdlab-sit/release/v0.2.0
Browse files Browse the repository at this point in the history
Release v0.2.0
  • Loading branch information
Sota-Watanabe authored Sep 23, 2020
2 parents f2d7625 + 959e43a commit e2d4900
Show file tree
Hide file tree
Showing 19 changed files with 303 additions and 154 deletions.
54 changes: 54 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Release

on:
push:
tags:
- 'v*'

jobs:
build:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [ macos-latest ]

steps:
- uses: actions/checkout@v2

- name: Setup Node.js environment
uses: actions/setup-node@v1

- name: Install packages
run: npm install

- name: Build
run: npm run build

- name: Archive for macOS
if: matrix.os == 'macos-latest'
run: cd build/Release/${{ github.event.repository.name }}-darwin-x64/ && zip -r ${{ github.event.repository.name }}-macOS.zip *.app

- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: ${{ github.ref }}
body: |
変更内容は CHANGELOG.md をご覧ください。
draft: false
prerelease: false

- name: Upload Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: build/Release/XenonText-darwin-x64/${{ github.event.repository.name }}-macOS.zip
asset_name: ${{ github.event.repository.name }}-macOS.zip
asset_content_type: application/zip
3 changes: 2 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"trailingComma": "all",
"tabWidth": 2,
"semi": true,
"singleQuote": true
"singleQuote": true,
"endOfLine":"auto"
}
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# CHANGELOG

## v0.2.0 (2020-09-24)
**追加機能**
- タブが増えるとスクロールできるようになり、一覧性が向上しました。 #64
- ファイルから言語を判断して、シンタックスハイライトが付くようになりました。 #66
- タイトルバーにファイル名が表示されるようになりました。 #67

**修正**
- 日本語入力時のズレを軽減しました。 #65

その他、軽微な修正が含まれます。

## v0.1.0 (2020-08-29)
- 初めてのリリース
45 changes: 4 additions & 41 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,43 +1,6 @@
# editor
[Electron](https://www.electronjs.org/)[React](https://ja.reactjs.org/) でテキストエディタを作る
# XenonText

## やること
- ファイルの作成
- ファイルの読み書き
- テキストの編集
*シンプルなエディタを駆け出しエンジニアに*

## 環境
```
Node.js: 10.20.0
```

## 開発
### リポジトリ準備
```
$ git clone https://github.com/cdlab-sit/editor.git
$ cd editor
```

### インストール
```
$ npm install
```

### 開発
ホットリロードに対応しています。
```
# ファイル監視
$ npm run watch
# 実行
$ npm run dev
```

### 実行
```
$ npm start
```

### ビルド
```
$ npm run build
```
- [リリースページ](https://cdlab-sit.github.io/XenonText/)
- [ドキュメント](https://cdlab-sit.github.io/XenonText/documentation/)
79 changes: 61 additions & 18 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "XenonText",
"version": "0.1.0",
"description": "Electron + React でテキストエディタを作る",
"version": "0.2.0",
"description": "シンプルなエディタを駆け出しエンジニアに",
"author": "CDLab",
"main": "main.js",
"scripts": {
Expand All @@ -21,9 +21,10 @@
"css:tailwind": "tailwindcss build src/style.css -o dist/style.css",
"icon:mac": "png2icns icon/icon.png -o icon/icon.icns"
},
"homepage": "https://cdlab-sit.github.io/XenonText/",
"repository": {
"type": "git",
"url": "git+https://github.com/cdlab-sit/editor.git"
"url": "git+https://github.com/cdlab-sit/XenonText.git"
},
"keywords": [
"xenontext",
Expand Down Expand Up @@ -60,6 +61,7 @@
"dependencies": {
"ace-builds": "^1.4.11",
"electron": "^8.2.5",
"electron-devtools-installer": "^3.1.1",
"prop-types": "^15.7.2",
"react": "^16.13.1",
"react-ace": "^8.1.0",
Expand Down
10 changes: 10 additions & 0 deletions src/main/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import { BrowserWindow, app } from 'electron';
import fs from 'fs';
import installExtension, {
REACT_DEVELOPER_TOOLS,
REDUX_DEVTOOLS,
} from 'electron-devtools-installer';

const createWindow = () => {
// ブラウザウインドウを作成
Expand All @@ -19,6 +23,12 @@ const createWindow = () => {
* 開発者ツールを開く
* win.webContents.openDevTools();
*/

installExtension([REDUX_DEVTOOLS, REACT_DEVELOPER_TOOLS])
// eslint-disable-next-line no-console
.then((name) => console.log(name))
// eslint-disable-next-line no-console
.catch((err) => console.log(err));
};

if (process.env.NODE_ENV === 'development') {
Expand Down
Loading

0 comments on commit e2d4900

Please sign in to comment.