Skip to content

Commit fe5f70f

Browse files
committed
Bump discoveryjs
1 parent 228f927 commit fe5f70f

File tree

10 files changed

+483
-2939
lines changed

10 files changed

+483
-2939
lines changed

package-lock.json

Lines changed: 402 additions & 2912 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
{
22
"license": "MIT",
33
"repository": "csstree/docs",
4-
"dependencies": {
5-
"@discoveryjs/view-plugin-highcharts": "^1.0.1"
6-
},
4+
"dependencies": {},
75
"devDependencies": {
8-
"@discoveryjs/discovery": "1.0.0-beta.51",
9-
"@discoveryjs/cli": "^1.15.0",
10-
"css-tree": "^1.1.1",
6+
"highcharts": "^8.0.0",
7+
"@discoveryjs/discovery": "1.0.0-beta.56",
8+
"@discoveryjs/cli": "^2.0.0-beta.8",
9+
"css-tree": "^1.1.2",
1110
"diff": "^4.0.1",
1211
"eslint": "^7.0.0",
1312
"resolve": "^1.5.0"

src/syntax/config.js

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
1-
const path = require('path');
2-
const fetchData = require('./data');
3-
41
module.exports = {
52
name: 'CSS syntax reference (mdn/data & CSSTree)',
6-
data: fetchData,
3+
basedir: __dirname,
74
darkmode: 'disabled',
8-
prepare: path.join(__dirname, 'prepare.js'),
9-
plugins: [
10-
'@discoveryjs/view-plugin-highcharts',
11-
'@discoveryjs/view-plugin-highcharts/index.css'
12-
],
5+
data: './data',
6+
prepare: './prepare',
137
view: {
14-
basedir: __dirname,
15-
libs: {
16-
csstree: '../../node_modules/css-tree/dist/csstree.min.js',
17-
difflib: '../../node_modules/diff/dist/diff.js'
18-
},
198
assets: [
209
'ui/sidebar.css',
2110
'ui/sidebar.js',
11+
'ui/view/chart.css',
12+
'ui/view/chart.js',
2213
'ui/page/default.css',
2314
'ui/page/default.js',
2415
'ui/page/problems.css',

src/syntax/prepare.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* eslint-env browser */
2-
/* global discovery, csstree, ga */
3-
4-
const functionSyntaxes = new WeakMap();
2+
/* global discovery, ga */
3+
const csstree = require('css-tree');
54
const { definitionSyntax } = csstree;
5+
const functionSyntaxes = new WeakMap();
66

77
function syntaxName(syntax) {
88
const { type, name, parent } = syntax || {};

src/syntax/ui/page/default.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,10 @@
1414
font-family: Helvetica;
1515
font-weight: 100;
1616
}
17+
18+
.view-hstack {
19+
display: flex;
20+
}
21+
.view-chart {
22+
flex: 1;
23+
}

src/syntax/ui/view/chart.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@import url('highcharts/css/highcharts.css');
2+
3+
.view-chart .highcharts-data-label text {
4+
font-weight: normal !important;
5+
}

src/syntax/ui/view/chart.js

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/* eslint-env browser */
2+
/* global discovery */
3+
const Highcharts = require('highcharts');
4+
5+
discovery.view.define('chart', function(el, config, data, context) {
6+
const { options } = config;
7+
const label = '<b>{point.y}</b> ({point.percentage:.1f}%)';
8+
const container = el.appendChild(document.createElement('div'));
9+
10+
if (!Array.isArray(data)) {
11+
data = data ? [data] : [];
12+
}
13+
14+
if (data[0] && !data[0].data) {
15+
data = [{ data }];
16+
}
17+
18+
try {
19+
const chart = Highcharts.chart(container, Highcharts.merge({
20+
chart: {
21+
type: 'pie'
22+
},
23+
title: {
24+
text: undefined
25+
},
26+
credits: {
27+
enabled: false
28+
},
29+
tooltip: {
30+
pointFormat: label
31+
},
32+
plotOptions: {
33+
pie: {
34+
cursor: 'pointer',
35+
dataLabels: {
36+
format: '{point.name} – ' + label,
37+
useHTMsL: true
38+
}
39+
}
40+
},
41+
series: data
42+
}, options));
43+
44+
setTimeout(() => {
45+
chart.reflow();
46+
}, 1);
47+
} catch (e) {
48+
discovery.view.render(el, { view: 'fallback', reason: e.message }, data, context);
49+
}
50+
});

src/syntax/ui/view/diff.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-env browser */
2-
/* global discovery, difflib */
3-
2+
/* global discovery */
3+
const difflib = require('diff');
44
const diffType = {
55
char: difflib.diffChars,
66
word: difflib.diffWords,

src/syntax/ui/view/syntax-match-trace.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
/* global discovery, csstree */
1+
/* global discovery */
2+
const csstree = require('css-tree');
23

34
function escapeHtml(str) {
45
return str

src/syntax/ui/view/syntax.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
/* global discovery, csstree */
1+
/* global discovery */
2+
const csstree = require('css-tree');
23

34
function escapeHtml(str) {
45
return str

0 commit comments

Comments
 (0)