Skip to content

Commit 24d4d91

Browse files
h-ikedah-ikeda
authored
Merge branch 'master' into shape-component
2 parents f678f53 + e4a7872 commit 24d4d91

23 files changed

+623
-614
lines changed

‎.github/workflows/publish.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,10 @@ jobs:
3030
- name: Install dependencies
3131
run: yarn install --frozen-lockfile
3232
- name: Build
33-
run: |
34-
$(yarn bin rollup) -c docs/rollup.config.js
35-
for d in src/*/
36-
do
37-
mkdir -p docs/components/`basename $d`
38-
$(yarn bin vuedoc.md) ${d}vgl-*.js --output docs/components/`basename $d` --level 2 --ignore-name --ignore-computed --ignore-data
39-
done
33+
run: $(yarn bin rollup) -c docs/rollup.config.js
4034
- name: Commit
4135
run: |
42-
rm .gitignore
36+
rm docs/.gitignore
4337
git add .
4438
git commit -m "v$(node -pe require\(\"./package.json\"\).version)" --author="$GIT_USER"
4539
env:

‎Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
source "https://rubygems.org"
22

33
# Added at 2017-09-22 05:46:57 +0000 by ubuntu:
4-
gem "github-pages", "~> 202", :group => [:jekyll_plugins]
4+
gem "github-pages", "~> 203", :group => [:jekyll_plugins]

‎Gemfile.lock

Lines changed: 64 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.11.1)
5-
i18n (~> 0.7)
4+
activesupport (6.0.1)
5+
concurrent-ruby (~> 1.0, >= 1.0.2)
6+
i18n (>= 0.7, < 2)
67
minitest (~> 5.1)
7-
thread_safe (~> 0.3, >= 0.3.4)
88
tzinfo (~> 1.1)
9+
zeitwerk (~> 2.2)
910
addressable (2.7.0)
1011
public_suffix (>= 2.0.2, < 5.0)
1112
coffee-script (2.4.1)
@@ -25,33 +26,32 @@ GEM
2526
ffi (>= 1.3.0)
2627
eventmachine (1.2.7)
2728
execjs (2.7.0)
28-
faraday (0.17.0)
29+
faraday (0.17.1)
2930
multipart-post (>= 1.2, < 3)
30-
ffi (1.11.1)
31+
ffi (1.11.3)
3132
forwardable-extended (2.6.0)
3233
gemoji (3.0.1)
33-
github-pages (202)
34-
activesupport (= 4.2.11.1)
34+
github-pages (203)
3535
github-pages-health-check (= 1.16.1)
3636
jekyll (= 3.8.5)
37-
jekyll-avatar (= 0.6.0)
37+
jekyll-avatar (= 0.7.0)
3838
jekyll-coffeescript (= 1.1.1)
3939
jekyll-commonmark-ghpages (= 0.1.6)
4040
jekyll-default-layout (= 0.1.4)
41-
jekyll-feed (= 0.11.0)
41+
jekyll-feed (= 0.13.0)
4242
jekyll-gist (= 1.5.0)
4343
jekyll-github-metadata (= 2.12.1)
44-
jekyll-mentions (= 1.4.1)
45-
jekyll-optional-front-matter (= 0.3.0)
44+
jekyll-mentions (= 1.5.1)
45+
jekyll-optional-front-matter (= 0.3.2)
4646
jekyll-paginate (= 1.1.0)
47-
jekyll-readme-index (= 0.2.0)
48-
jekyll-redirect-from (= 0.14.0)
49-
jekyll-relative-links (= 0.6.0)
50-
jekyll-remote-theme (= 0.4.0)
47+
jekyll-readme-index (= 0.3.0)
48+
jekyll-redirect-from (= 0.15.0)
49+
jekyll-relative-links (= 0.6.1)
50+
jekyll-remote-theme (= 0.4.1)
5151
jekyll-sass-converter (= 1.5.2)
52-
jekyll-seo-tag (= 2.5.0)
53-
jekyll-sitemap (= 1.2.0)
54-
jekyll-swiss (= 0.4.0)
52+
jekyll-seo-tag (= 2.6.1)
53+
jekyll-sitemap (= 1.4.0)
54+
jekyll-swiss (= 1.0.0)
5555
jekyll-theme-architect (= 0.1.1)
5656
jekyll-theme-cayman (= 0.1.1)
5757
jekyll-theme-dinky (= 0.1.1)
@@ -61,27 +61,26 @@ GEM
6161
jekyll-theme-midnight (= 0.1.1)
6262
jekyll-theme-minimal (= 0.1.1)
6363
jekyll-theme-modernist (= 0.1.1)
64-
jekyll-theme-primer (= 0.5.3)
64+
jekyll-theme-primer (= 0.5.4)
6565
jekyll-theme-slate (= 0.1.1)
6666
jekyll-theme-tactile (= 0.1.1)
6767
jekyll-theme-time-machine (= 0.1.1)
68-
jekyll-titles-from-headings (= 0.5.1)
69-
jemoji (= 0.10.2)
68+
jekyll-titles-from-headings (= 0.5.3)
69+
jemoji (= 0.11.1)
7070
kramdown (= 1.17.0)
71-
liquid (= 4.0.0)
72-
listen (= 3.1.5)
71+
liquid (= 4.0.3)
7372
mercenary (~> 0.3)
74-
minima (= 2.5.0)
73+
minima (= 2.5.1)
7574
nokogiri (>= 1.10.4, < 2.0)
76-
rouge (= 3.11.0)
75+
rouge (= 3.13.0)
7776
terminal-table (~> 1.4)
7877
github-pages-health-check (1.16.1)
7978
addressable (~> 2.3)
8079
dnsruby (~> 1.60)
8180
octokit (~> 4.0)
8281
public_suffix (~> 3.0)
8382
typhoeus (~> 1.3)
84-
html-pipeline (2.12.0)
83+
html-pipeline (2.12.2)
8584
activesupport (>= 2)
8685
nokogiri (>= 1.4)
8786
http_parser.rb (0.6.0)
@@ -100,8 +99,8 @@ GEM
10099
pathutil (~> 0.9)
101100
rouge (>= 1.7, < 4)
102101
safe_yaml (~> 1.0)
103-
jekyll-avatar (0.6.0)
104-
jekyll (~> 3.0)
102+
jekyll-avatar (0.7.0)
103+
jekyll (>= 3.0, < 5.0)
105104
jekyll-coffeescript (1.1.1)
106105
coffee-script (~> 2.2)
107106
coffee-script-source (~> 1.11.1)
@@ -114,36 +113,36 @@ GEM
114113
rouge (>= 2.0, < 4.0)
115114
jekyll-default-layout (0.1.4)
116115
jekyll (~> 3.0)
117-
jekyll-feed (0.11.0)
118-
jekyll (~> 3.3)
116+
jekyll-feed (0.13.0)
117+
jekyll (>= 3.7, < 5.0)
119118
jekyll-gist (1.5.0)
120119
octokit (~> 4.2)
121120
jekyll-github-metadata (2.12.1)
122121
jekyll (~> 3.4)
123122
octokit (~> 4.0, != 4.4.0)
124-
jekyll-mentions (1.4.1)
123+
jekyll-mentions (1.5.1)
125124
html-pipeline (~> 2.3)
126-
jekyll (~> 3.0)
127-
jekyll-optional-front-matter (0.3.0)
128-
jekyll (~> 3.0)
125+
jekyll (>= 3.7, < 5.0)
126+
jekyll-optional-front-matter (0.3.2)
127+
jekyll (>= 3.0, < 5.0)
129128
jekyll-paginate (1.1.0)
130-
jekyll-readme-index (0.2.0)
131-
jekyll (~> 3.0)
132-
jekyll-redirect-from (0.14.0)
133-
jekyll (~> 3.3)
134-
jekyll-relative-links (0.6.0)
135-
jekyll (~> 3.3)
136-
jekyll-remote-theme (0.4.0)
129+
jekyll-readme-index (0.3.0)
130+
jekyll (>= 3.0, < 5.0)
131+
jekyll-redirect-from (0.15.0)
132+
jekyll (>= 3.3, < 5.0)
133+
jekyll-relative-links (0.6.1)
134+
jekyll (>= 3.3, < 5.0)
135+
jekyll-remote-theme (0.4.1)
137136
addressable (~> 2.0)
138-
jekyll (~> 3.5)
139-
rubyzip (>= 1.2.1, < 3.0)
137+
jekyll (>= 3.5, < 5.0)
138+
rubyzip (>= 1.3.0)
140139
jekyll-sass-converter (1.5.2)
141140
sass (~> 3.4)
142-
jekyll-seo-tag (2.5.0)
143-
jekyll (~> 3.3)
144-
jekyll-sitemap (1.2.0)
145-
jekyll (~> 3.3)
146-
jekyll-swiss (0.4.0)
141+
jekyll-seo-tag (2.6.1)
142+
jekyll (>= 3.3, < 5.0)
143+
jekyll-sitemap (1.4.0)
144+
jekyll (>= 3.7, < 5.0)
145+
jekyll-swiss (1.0.0)
147146
jekyll-theme-architect (0.1.1)
148147
jekyll (~> 3.5)
149148
jekyll-seo-tag (~> 2.0)
@@ -171,8 +170,8 @@ GEM
171170
jekyll-theme-modernist (0.1.1)
172171
jekyll (~> 3.5)
173172
jekyll-seo-tag (~> 2.0)
174-
jekyll-theme-primer (0.5.3)
175-
jekyll (~> 3.5)
173+
jekyll-theme-primer (0.5.4)
174+
jekyll (> 3.5, < 5.0)
176175
jekyll-github-metadata (~> 2.9)
177176
jekyll-seo-tag (~> 2.0)
178177
jekyll-theme-slate (0.1.1)
@@ -184,29 +183,28 @@ GEM
184183
jekyll-theme-time-machine (0.1.1)
185184
jekyll (~> 3.5)
186185
jekyll-seo-tag (~> 2.0)
187-
jekyll-titles-from-headings (0.5.1)
188-
jekyll (~> 3.3)
186+
jekyll-titles-from-headings (0.5.3)
187+
jekyll (>= 3.3, < 5.0)
189188
jekyll-watch (2.2.1)
190189
listen (~> 3.0)
191-
jemoji (0.10.2)
190+
jemoji (0.11.1)
192191
gemoji (~> 3.0)
193192
html-pipeline (~> 2.2)
194-
jekyll (~> 3.0)
193+
jekyll (>= 3.0, < 5.0)
195194
kramdown (1.17.0)
196-
liquid (4.0.0)
197-
listen (3.1.5)
198-
rb-fsevent (~> 0.9, >= 0.9.4)
199-
rb-inotify (~> 0.9, >= 0.9.7)
200-
ruby_dep (~> 1.2)
195+
liquid (4.0.3)
196+
listen (3.2.1)
197+
rb-fsevent (~> 0.10, >= 0.10.3)
198+
rb-inotify (~> 0.9, >= 0.9.10)
201199
mercenary (0.3.6)
202200
mini_portile2 (2.4.0)
203-
minima (2.5.0)
204-
jekyll (~> 3.5)
201+
minima (2.5.1)
202+
jekyll (>= 3.5, < 5.0)
205203
jekyll-feed (~> 0.9)
206204
jekyll-seo-tag (~> 2.1)
207-
minitest (5.12.2)
205+
minitest (5.13.0)
208206
multipart-post (2.1.1)
209-
nokogiri (1.10.5)
207+
nokogiri (1.10.7)
210208
mini_portile2 (~> 2.4.0)
211209
octokit (4.14.0)
212210
sawyer (~> 0.8.0, >= 0.5.3)
@@ -216,10 +214,9 @@ GEM
216214
rb-fsevent (0.10.3)
217215
rb-inotify (0.10.0)
218216
ffi (~> 1.0)
219-
rouge (3.11.0)
217+
rouge (3.13.0)
220218
ruby-enum (0.7.2)
221219
i18n
222-
ruby_dep (1.5.0)
223220
rubyzip (2.0.0)
224221
safe_yaml (1.0.5)
225222
sass (3.7.4)
@@ -238,12 +235,13 @@ GEM
238235
tzinfo (1.2.5)
239236
thread_safe (~> 0.1)
240237
unicode-display_width (1.6.0)
238+
zeitwerk (2.2.2)
241239

242240
PLATFORMS
243241
ruby
244242

245243
DEPENDENCIES
246-
github-pages (~> 202)
244+
github-pages (~> 203)
247245

248246
BUNDLED WITH
249247
2.0.2

‎docs/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
components/
21
js/
2+
components/

‎docs/_config.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
1-
theme: jekyll-theme-architect
2-
google_analytics: UA-23493957-4
1+
remote_theme: pmarsceill/just-the-docs
2+
logo: assets/img/logo.svg
3+
ga_tracking: UA-23493957-4
4+
ga_publisher: pub-3600741293730423
5+
ga_search: '6643788418'
36
title: VueGL
7+
description: Vue.js components rendering 3D graphics reactively via Three.js
8+
aux_links:
9+
View project on GitHub: //github.com/vue-gl/vue-gl
410
plugins:
11+
- jekyll-seo-tag
512
- jekyll-sitemap
613
defaults:
714
- scope:
815
path: examples
916
values:
1017
layout: example
11-
- scope:
12-
path: components
13-
values:
14-
layout: component
18+
search_enabled: false
19+
nav_exclude: true
1520
exclude:
1621
- rollup.config.js
22+
- .gitignore
23+
- rollup-plugins

‎docs/_includes/head_custom.html

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{% if site.ga_publisher != nil %}
2+
<script
3+
async
4+
data-ad-client="ca-{{ site.ga_publisher }}"
5+
src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"
6+
></script>
7+
{% if site.ga_search != nil %}
8+
<script
9+
async
10+
src="https://cse.google.com/cse.js?cx=partner-{{ site.ga_publisher }}:{{ site.ga_search }}"
11+
></script>
12+
{% endif %}
13+
{% endif %}

0 commit comments

Comments
 (0)