Skip to content

Commit eeee7c0

Browse files
cpsievertcpsievert
committed
Merge pull request #354 from ropensci/fix/deps
Fix #325. Upgrade to plotlyjs 1.2.1
2 parents 326303a + 2898b14 commit eeee7c0

File tree

5 files changed

+235
-20
lines changed

5 files changed

+235
-20
lines changed

‎DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: plotly
22
Title: Create Interactive Web Graphics via Plotly's JavaScript Graphing Library
3-
Version: 2.0.15
3+
Version: 2.0.16
44
Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
55
email = "[email protected]"),
66
person("Chris", "Parmer", role = c("aut", "cph"),

‎NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2.0.16 -- 16 Dec 2015
2+
3+
Fix #325
4+
15
2.0.15 -- 13 Dec 2015
26

37
Fix #346

‎inst/htmlwidgets/lib/plotlyjs/plotly-latest.min.js

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

‎inst/htmlwidgets/plotly.yaml

Lines changed: 189 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,192 @@
11
dependencies:
2-
- name: plotlyjs
2+
plotly.js:
3+
name: plotly.js
4+
version: 1.2.1
5+
src: htmlwidgets/lib/plotlyjs
6+
script: plotly-latest.min.js
7+
3d-view:
8+
name: 3d-view
9+
version: 2.0.0
10+
src: htmlwidgets/lib/plotlyjs
11+
script: plotly-latest.min.js
12+
alpha-shape:
13+
name: alpha-shape
14+
version: 1.0.0
15+
src: htmlwidgets/lib/plotlyjs
16+
script: plotly-latest.min.js
17+
arraytools:
18+
name: arraytools
19+
version: 1.0.0
20+
src: htmlwidgets/lib/plotlyjs
21+
script: plotly-latest.min.js
22+
convex-hull:
23+
name: convex-hull
24+
version: 1.0.3
25+
src: htmlwidgets/lib/plotlyjs
26+
script: plotly-latest.min.js
27+
d3:
28+
name: d3
29+
version: 3.5.6
30+
src: htmlwidgets/lib/plotlyjs
31+
script: plotly-latest.min.js
32+
delaunay-triangulate:
33+
name: delaunay-triangulate
34+
version: 1.1.6
35+
src: htmlwidgets/lib/plotlyjs
36+
script: plotly-latest.min.js
37+
es6-promise:
38+
name: es6-promise
39+
version: 3.0.2
40+
src: htmlwidgets/lib/plotlyjs
41+
script: plotly-latest.min.js
42+
fast-isnumeric:
43+
name: fast-isnumeric
44+
version: 1.1.1
45+
src: htmlwidgets/lib/plotlyjs
46+
script: plotly-latest.min.js
47+
fs-extra:
48+
name: fs-extra
49+
version: 0.26.2
50+
src: htmlwidgets/lib/plotlyjs
51+
script: plotly-latest.min.js
52+
gl-error2d:
53+
name: gl-error2d
54+
version: 1.0.0
55+
src: htmlwidgets/lib/plotlyjs
56+
script: plotly-latest.min.js
57+
gl-error3d:
58+
name: gl-error3d
59+
version: 1.0.0
60+
src: htmlwidgets/lib/plotlyjs
61+
script: plotly-latest.min.js
62+
gl-line2d:
63+
name: gl-line2d
64+
version: 1.2.1
65+
src: htmlwidgets/lib/plotlyjs
66+
script: plotly-latest.min.js
67+
gl-line3d:
68+
name: gl-line3d
69+
version: 1.0.1
70+
src: htmlwidgets/lib/plotlyjs
71+
script: plotly-latest.min.js
72+
gl-mat4:
73+
name: gl-mat4
74+
version: 1.1.2
75+
src: htmlwidgets/lib/plotlyjs
76+
script: plotly-latest.min.js
77+
gl-mesh3d:
78+
name: gl-mesh3d
79+
version: 1.0.4
80+
src: htmlwidgets/lib/plotlyjs
81+
script: plotly-latest.min.js
82+
gl-plot2d:
83+
name: gl-plot2d
84+
version: 1.1.6
85+
src: htmlwidgets/lib/plotlyjs
86+
script: plotly-latest.min.js
87+
gl-plot3d:
88+
name: gl-plot3d
89+
version: 1.3.0
90+
src: htmlwidgets/lib/plotlyjs
91+
script: plotly-latest.min.js
92+
gl-scatter2d:
93+
name: gl-scatter2d
94+
version: 1.0.5
95+
src: htmlwidgets/lib/plotlyjs
96+
script: plotly-latest.min.js
97+
gl-scatter2d-fancy:
98+
name: gl-scatter2d-fancy
399
version: 1.1.1
4-
src: "htmlwidgets/lib/plotlyjs"
100+
src: htmlwidgets/lib/plotlyjs
101+
script: plotly-latest.min.js
102+
gl-scatter3d:
103+
name: gl-scatter3d
104+
version: 1.0.4
105+
src: htmlwidgets/lib/plotlyjs
106+
script: plotly-latest.min.js
107+
gl-select-box:
108+
name: gl-select-box
109+
version: 1.0.1
110+
src: htmlwidgets/lib/plotlyjs
111+
script: plotly-latest.min.js
112+
gl-spikes2d:
113+
name: gl-spikes2d
114+
version: 1.0.1
115+
src: htmlwidgets/lib/plotlyjs
116+
script: plotly-latest.min.js
117+
gl-surface3d:
118+
name: gl-surface3d
119+
version: 1.0.6
120+
src: htmlwidgets/lib/plotlyjs
121+
script: plotly-latest.min.js
122+
mouse-change:
123+
name: mouse-change
124+
version: 1.1.1
125+
src: htmlwidgets/lib/plotlyjs
126+
script: plotly-latest.min.js
127+
mouse-wheel:
128+
name: mouse-wheel
129+
version: 1.0.2
130+
src: htmlwidgets/lib/plotlyjs
131+
script: plotly-latest.min.js
132+
ndarray:
133+
name: ndarray
134+
version: 1.0.16
135+
src: htmlwidgets/lib/plotlyjs
136+
script: plotly-latest.min.js
137+
ndarray-fill:
138+
name: ndarray-fill
139+
version: 1.0.1
140+
src: htmlwidgets/lib/plotlyjs
141+
script: plotly-latest.min.js
142+
ndarray-homography:
143+
name: ndarray-homography
144+
version: 1.0.0
145+
src: htmlwidgets/lib/plotlyjs
146+
script: plotly-latest.min.js
147+
ndarray-ops:
148+
name: ndarray-ops
149+
version: 1.2.2
150+
src: htmlwidgets/lib/plotlyjs
151+
script: plotly-latest.min.js
152+
node-sass:
153+
name: node-sass
154+
version: 3.4.1
155+
src: htmlwidgets/lib/plotlyjs
156+
script: plotly-latest.min.js
157+
right-now:
158+
name: right-now
159+
version: 1.0.0
160+
src: htmlwidgets/lib/plotlyjs
161+
script: plotly-latest.min.js
162+
robust-orientation:
163+
name: robust-orientation
164+
version: 1.1.3
165+
src: htmlwidgets/lib/plotlyjs
166+
script: plotly-latest.min.js
167+
sane-topojson:
168+
name: sane-topojson
169+
version: 1.2.0
170+
src: htmlwidgets/lib/plotlyjs
171+
script: plotly-latest.min.js
172+
superscript-text:
173+
name: superscript-text
174+
version: 1.0.0
175+
src: htmlwidgets/lib/plotlyjs
176+
script: plotly-latest.min.js
177+
tinycolor2:
178+
name: tinycolor2
179+
version: 1.1.2
180+
src: htmlwidgets/lib/plotlyjs
181+
script: plotly-latest.min.js
182+
topojson:
183+
name: topojson
184+
version: 1.6.19
185+
src: htmlwidgets/lib/plotlyjs
186+
script: plotly-latest.min.js
187+
xml2js:
188+
name: xml2js
189+
version: 0.4.15
190+
src: htmlwidgets/lib/plotlyjs
5191
script: plotly-latest.min.js
192+

‎inst/plotlyjs.R

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,27 @@ download.file(
77
"https://raw.githubusercontent.com/plotly/plotly.js/master/LICENSE",
88
"inst/htmlwidgets/lib/plotlyjs/LICENSE"
99
)
10+
11+
12+
# find plotlyjs dependencies and write yaml file
13+
library(jsonlite)
14+
pkg <- fromJSON("https://raw.githubusercontent.com/plotly/plotly.js/master/package.json")
15+
deps <- pkg$dependencies
16+
nms <- c(pkg$name, names(deps))
17+
deps <- c(pkg$version, sub("^\\^", "", as.character(deps)))
18+
19+
f <- function(x, y) {
20+
list(name = x,
21+
version = y,
22+
src = "htmlwidgets/lib/plotlyjs",
23+
script = "plotly-latest.min.js"
24+
)
25+
}
26+
27+
28+
29+
depz <- list(dependencies = Map(f, nms, deps))
30+
writeLines(yaml::as.yaml(depz), "inst/htmlwidgets/plotly.yaml")
31+
32+
33+

0 commit comments

Comments
 (0)