Skip to content

Commit efdf04e

Browse files
melponmelpon
committed
全てのパッケージを最新にした
1 parent bf96f17 commit efdf04e

19 files changed

+7965
-6694
lines changed

‎.babelrc

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎babel.config.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
module.exports = {
2+
presets: [
3+
["@babel/preset-env", {
4+
"modules": false
5+
}]
6+
],
7+
plugins: [
8+
"@babel/plugin-transform-runtime",
9+
"@babel/plugin-transform-object-assign",
10+
"@babel/plugin-proposal-function-bind",
11+
"@babel/plugin-proposal-class-properties",
12+
"@babel/plugin-transform-async-to-generator"
13+
]
14+
}
15+

‎css/kunai/site/navbar.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
@import '../variables.css';
22

33

4+
$toggle-size: 2.5rem;
5+
46
nav[role="navigation"] {
57
background: $nav-bg;
68

@@ -53,7 +55,6 @@ nav[role="navigation"] {
5355
}
5456
}
5557

56-
$toggle-size: 2.5rem;
5758
.navbar-header {
5859
display: flex;
5960
position: relative;

‎css/kunai/site/sidebar.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
$cl-tree-border: #999;
44

5-
@define-mixin mini-hr-base {
5+
@mixin mini-hr-base {
66
content: "";
77
display: block;
88
width: 100%;
@@ -11,19 +11,19 @@ $cl-tree-border: #999;
1111
margin-bottom: .2rem;
1212
}
1313

14-
@define-mixin mini-hr {
14+
@mixin mini-hr {
1515
@mixin mini-hr-base;
1616
$cl: rgba(210, 220, 240, 0.5);
1717
background: linear-gradient(to right, transparent, transparent 15%, $cl 30%, $cl 70%, transparent 85%, transparent 100%);
1818
}
1919

20-
@define-mixin mini-right-hr {
20+
@mixin mini-right-hr {
2121
@mixin mini-hr-base;
2222
$cl: rgba(210, 220, 240, 0.5);
2323
background: linear-gradient(to right, transparent, transparent 15%, $cl 30%, $cl 70%, $cl 100%);
2424
}
2525

26-
@define-mixin big-hr {
26+
@mixin big-hr {
2727
@mixin mini-hr-base;
2828
$cl: rgba(210, 220, 240, 0.5);
2929
background: linear-gradient(to right, transparent, $cl 15%, $cl 85%, transparent 100%);

‎css/kunai/site/tree.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@define-mixin tree $cl-border {
1+
@mixin tree $cl-border {
22
$tree-grid: 1px solid $cl-border;
33
$bg-tree: #fbfbfb;
44
$plus-size: 1.6rem;

‎css/kunai/variables.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $cl-over-gray: rgba(255,255,255,0.75);
2424
$sh-inv: 0 1px 0 #444;
2525

2626

27-
@define-mixin box-reset {
27+
@mixin box-reset {
2828
box-sizing: content-box;
2929
}
3030

‎html/char16_32.hbs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,18 @@
3232
<link rel="mask-icon" href="/static/favicons/safari-pinned-tab.svg?cachebust=01592608848f97681ca2b3a230528e8bc65d8cc2" color="#f5f8fc">
3333
<meta name="theme-color" content="#f5f8fc">
3434

35-
<link rel="stylesheet" href="/static/pygments/default.css?cachebust=01592608848f97681ca2b3a230528e8bc65d8cc2">
35+
<!-- <link rel="stylesheet" href="/static/pygments/default.css?cachebust=01592608848f97681ca2b3a230528e8bc65d8cc2"> -->
3636
<!-- <link rel="stylesheet" href="/static/css/root.css"> -->
3737

3838

3939

4040

41-
41+
<!--
4242
<link href="/static/kunai/css/kunai-stage-0.css?cachebust=01592608848f97681ca2b3a230528e8bc65d8cc2" rel="stylesheet">
4343
<link href="/static/kunai/css/kunai-stage-1.css?cachebust=01592608848f97681ca2b3a230528e8bc65d8cc2" rel="stylesheet">
4444
<link href="/static/kunai/css/kunai-stage-2.css?cachebust=01592608848f97681ca2b3a230528e8bc65d8cc2" rel="stylesheet">
4545
<link href="/static/kunai/css/kunai-stage-3.css?cachebust=01592608848f97681ca2b3a230528e8bc65d8cc2" rel="stylesheet">
46+
-->
4647

4748
</head>
4849
<body>

‎js/kunai.js

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,16 @@ import {Yata} from './kunai/yata'
99

1010
import './codemirror-themes'
1111

12-
import * as Nagato from 'nagato'
1312
import {CRSearch} from 'crsearch'
1413

14+
class DummyLogger {
15+
debug() {}
16+
info() {}
17+
warn() {}
18+
error() {}
19+
disableBacktrace() {}
20+
makeContext() { return this; }
21+
};
1522

1623
class Kunai {
1724
static defaultOptions = {
@@ -23,13 +30,7 @@ class Kunai {
2330
// $('body').addClass('js').removeClass('no-js')
2431

2532
this.opts = Object.assign({}, Kunai.defaultOptions, opts)
26-
this.log = new Nagato.Logger(
27-
'Kunai',
28-
new Nagato.Option(Object.assign({}, this.opts, {
29-
icon: {text: '\u{1F5E1}', color: '#2244AA'}
30-
}))
31-
)
32-
33+
this.log = new DummyLogger()
3334

3435
try {
3536
this.log.disableBacktrace(true)
@@ -84,18 +85,12 @@ class Kunai {
8485
}
8586

8687
async initSidebar() {
87-
this.ui.sidebar = new UI.Sidebar(new Nagato.Logger(
88-
['Kunai', 'UI'],
89-
this.log.opts
90-
))
88+
this.ui.sidebar = new UI.Sidebar(new DummyLogger())
9189
return this.ui.sidebar
9290
}
9391

9492
async initUI() {
95-
const l = new Nagato.Logger(
96-
['Kunai', 'UI'],
97-
this.log.opts
98-
)
93+
const l = new DummyLogger()
9994

10095
this.ui.navbar = new UI.Navbar(l)
10196
this.ui.content = new UI.Content(l)

‎js/kunai/code/cpp.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
import {ID} from './id'
22

3-
import {Logger} from 'nagato'
4-
5-
63
class CPP {
74
constructor(log, id, buf, hints) {
85
this.id = id
9-
this.log = log.makeContext(`CPP #${this.id.key}`, new Logger.Option({icon: {text: '\u{1F4BB}', color: '#2244FF'}}))
6+
this.log = log.makeContext(`CPP #${this.id.key}`)
107
this.buf = buf
118
this.parse(hints)
129
}

‎js/kunai/meta/meta.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ import {PageKey} from './page-key'
44
import * as Net from '../net'
55
import * as Code from '../code'
66

7-
import {Logger} from 'nagato'
8-
97
import URL from 'url-parse'
108
import * as CM from 'commonmark'
119

@@ -14,7 +12,7 @@ class Meta {
1412
static PageKey = PageKey
1513

1614
constructor(log, config, mdinfo, onCodeFound) {
17-
this.log = log.makeContext(`Meta`, new Logger.Option({icon: {text: '\u{262F}', color: '#AAA'}}))
15+
this.log = log.makeContext(`Meta`)
1816
this.config = config
1917
this.codes = new Code.Pool(this.log)
2018

‎js/kunai/ui/sidebar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class Sidebar {
88
this.log.debug('initialzing...')
99

1010
this.kc = new KC.Config({
11-
'article.md': require('../../../kunai_configs/current/article.md'),
11+
'article.md': require('../../../kunai_configs/current/article.md').default,
1212
'cpp.json': require('../../../kunai_configs/current/cpp.json'),
1313
})
1414

‎js/kunai/wand.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {NetworkError} from './error'
22

33
import {default as Numeral} from 'numeral'
4-
import {Logger} from 'nagato'
54

65
import URL from 'url-parse'
76

@@ -127,7 +126,7 @@ class Wand {
127126
}
128127

129128
constructor(log, opts = new Map) {
130-
this.log = log.makeContext(`Wand`, new Logger.Option({icon: {text: '\u{1F32D}', color: '#CCAA14'}}))
129+
this.log = log.makeContext()
131130
this.opts = new Map([...Wand.defaults, ...opts])
132131
this.log.info('三へ( へ՞ਊ ՞)へ ﾊｯﾊｯ')
133132
}

‎js/kunai/yata.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import * as Mirror from './mirror'
22
import {KunaiError} from './error'
33

4-
import {Logger} from 'nagato'
5-
64
import {default as CodeMirror} from 'codemirror'
75
import * as js from 'codemirror/mode/clike/clike'
86

@@ -38,7 +36,7 @@ class Yata {
3836
this.console = null
3937
this.cmRefreshTimers = new Map
4038

41-
this.log = log.makeContext(`Yata ${this.code.id}`, new Logger.Option({icon: {text: '\u{1F426}', color: '#222'}}))
39+
this.log = log.makeContext(`Yata ${this.code.id}`)
4240
this.opts = Object.assign({}, Mirror.DefaultOptions, opts)
4341

4442
this.tools = new Map

0 commit comments

Comments
 (0)