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

Jump to bottom

Marklet v1.4 #19

Open
wants to merge 54 commits into
base: master
Choose a base branch
from
Open

Marklet v1.4 #19

wants to merge 54 commits into from
+1,292 −1,081

Conversation

shigma
Copy link
Collaborator

@shigma shigma commented Oct 31, 2018 •
edited
Loading

v1.4 的大部分任务现已完成，包括下列内容：

  • 完整的 dev-server，能够与 client 进行数据交换，实现 watch，edit 功能
  • 简单的 project manager，能够观测目录内变化以及入口配置的变化并实时更新

下个版本计划的任务：

  • init 功能，从给定文件夹中初始化出索引并生成入口文件
  • build 功能，利用 vue-server-renderer 实现服务端渲染
  • 进一步优化 dev-server 的界面，结合索引渲染文件树，提供更加直接的新建，保存，重命名，删除等功能，实现 marklet 的语法上色

一些在合并前可以考虑完成的事务：

  • MarkletModel 中的 changed 和 origin 属性未实现
  • ContentManager 中应该与 localStorage 进行配合实现数据存取
  • switchTo 方法如果结合 history.pushState 会有更好的效果
  • 在 project 模式下实现多种路径访问 localhost 以查看不同的文件
  • 在 file 模式且无初始文件的情况下保存将自动生成 FileManager 实例（目前这种情况下是无法保存的）

注意：合并前请手动发版！

npm run bootstrap
npm run build:prod
node build/publish cli dev-server marklet --minor --publish

shigma and others added 30 commits October 22, 2018 15:25
@shigma
fix pretty print
898eaa1
@shigma
add some bindings
82300b1
@shigma
merge edit and watch into marklet.env
8c1cf2c
@shigma
bump version
7138b39
@shigma
initialize values
3d603a2 
在 client 中暴露了一个全局变量 marklet，拥有 type, sourceType, config, vm 等属性，会通过 initialize.js 进行初始化
@shigma
marklet handling event bus
9c6324c
@shigma
server framework
b325aaa
@jjyyxx
tiny improvement
f362533
@shigma
add some adjustments
cc73038 
1. core updated to v3.2.4
2. update cli readme file
3. disallow server-client communication when filepath is absent
@shigma
fix no editor error when watching
3a78f15
@shigma
mnemonic
a7428b1
@shigma
structure change to menus.json
c271c7e
@shigma
add some adjustments
d0c8a25 
尝试增加了对层叠式菜单的支持
@shigma
cli options support filepath
9c41872
@jjyyxx
path fix
7b775ef
@jjyyxx
Relatively comprehensive file watch mode
5b77714 
Focus on impl at present,
code style issues (such as oop) shall be postponed.
@jjyyxx
split code
28a83a4
@shigma
menubar
f755233
@shigma
almost done
c3b1038
@shigma
some structural change
07ee5ae
@shigma
add some adjustments
fde21c8
@shigma
Merge branch 'menu' into dev
d4a234d
@shigma
upfate structure
abb9470 
将 server 和 client 分离……
@shigma
project framework
c2e0107
@shigma
trying to add mnemonic support
87c1a4c
@shigma
add some adjustments
964473d 
1. 将一些 API 更换了名称
2. 去除了 inject 的使用
3. 修改了 $menuManager 上 $ref 的实现
4. 解决了多次按 Alt 失效的问题
@jjyyxx
simple proj impl
1a9c353
@shigma
refactor
56fe695
@shigma
add some adjustments
c5a7541
@shigma
Merge branch 'menu' into dev
1ab4e0b
jjyyxx and others added 24 commits October 26, 2018 00:34
@jjyyxx
Merge pull request #17 from obstudio/menu-refactor
8e64282 
Menu refactor
@shigma
add some adjustments
4c5e2e5
@shigma
tried to set colors on editor
a7a5626 
...... BUT FAILED
@shigma
Merge branch 'menu' into dev
32967bb
@jjyyxx
lazy content
b256b42
@jjyyxx
merge
797a8dd
@shigma
fix entries
8ad5d0a 
1. 修复了事件接口不统一的 bug
2. 修复了 project 没有初始化的 bug
3. 将 project 模式对应的 sourceType 改为 project，过去的 type 改为 serverType
@shigma
cli into server
fcdec72
@shigma
parse config
754abcc
@shigma
add some adjustments
8d697c4
@shigma
fix test & check parse options
c662e22
@jjyyxx
Merge pull request #18 from obstudio/project-config
a72056a 
Project config
@shigma
fix some bugs
9b75c8e 
1. 修复一处 serverType 写成 type 的问题
2. 修复 test 无法获取深层 data 的问题
3. 修复 dirtree 错误过滤文件夹的问题
@shigma
Merge branch 'project-config' into dev
dda77a9
@shigma
file init
2b9e3c4
@jjyyxx
fix a critical typo
84f0783
@jjyyxx
Merge branch 'dev' of https://github.com/obstudio/Marklet into dev
fe35b1e
@shigma
explorer
37d5599
@shigma
path in title
76500db
@shigma
switch document
74be6b2
@shigma
using obui
f8eaaf4
@shigma
abstract manager
dbbac47
@shigma
client refactor
97c4bc2
@shigma
save
67b7d3d
@shigma shigma added the version New version label Oct 31, 2018
@shigma shigma requested a review from jjyyxx October 31, 2018 13:30
jjyyxx
jjyyxx approved these changes Oct 31, 2018
View reviewed changes
Copy link
Member

@jjyyxx jjyyxx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jjyyxx jjyyxx jjyyxx approved these changes

Assignees

@jjyyxx jjyyxx

@shigma shigma

Labels
version New version
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@shigma @jjyyxx