Skip to content

Commit fd34fbc

Browse files
Misc package setup fixes (#395)
1 parent 7431f99 commit fd34fbc

File tree

4 files changed

+27
-15
lines changed

4 files changed

+27
-15
lines changed

modules/core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@deck.gl/core": "^7.3.0",
2020
"@deck.gl/layers": "^7.3.0",
2121
"@deck.gl/mesh-layers": "^7.3.0",
22-
"@deck.gl/react": "^7.3.0-beta.8",
22+
"@deck.gl/react": "^7.3.0",
2323
"@streetscape.gl/monochrome": "1.0.1",
2424
"@xviz/parser": "^1.0.1",
2525
"lodash.merge": "^4.6.1",

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"lint": "ocular-lint",
1818
"publish": "ocular-publish",
1919
"test": "ocular-test",
20+
"test-fast": "ocular-lint pre-commit && ocular-test node",
2021
"test-ci": "ocular-test cover && (cat coverage/lcov.info | coveralls)",
2122
"typecheck": "flow check || true"
2223
},
@@ -41,7 +42,7 @@
4142
"eslint-plugin-react": "^7.5.1",
4243
"flow-bin": "^0.80.0",
4344
"jsdom": "^9.11.0",
44-
"ocular-dev-tools": "0.0.27",
45+
"ocular-dev-tools": "0.0.30",
4546
"pre-commit": "^1.2.2",
4647
"react": "^16.4.1",
4748
"react-dom": "^16.4.1",
@@ -54,7 +55,7 @@
5455
},
5556
"pre-commit": [
5657
"copyright-check",
57-
"test"
58+
"test-fast"
5859
],
5960
"private": true
6061
}

website/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const ROOT_DIR = resolve(__dirname, '..');
3333
// Seems to be a Babel bug
3434
// https://github.com/babel/babel-loader/issues/149#issuecomment-191991686
3535
const BABEL_CONFIG = {
36-
presets: ['@babel/preset-env', '@babel/preset-react'],
36+
presets: ['@babel/preset-env', '@babel/preset-react', '@babel/preset-flow'],
3737
plugins: ['@babel/proposal-class-properties']
3838
};
3939

yarn.lock

+22-11
Original file line numberDiff line numberDiff line change
@@ -1360,10 +1360,10 @@
13601360
dependencies:
13611361
"@luma.gl/addons" "^7.3.0"
13621362

1363-
"@deck.gl/react@^7.3.0-beta.8":
1364-
version "7.3.0-beta.8"
1365-
resolved "https://registry.yarnpkg.com/@deck.gl/react/-/react-7.3.0-beta.8.tgz#54a9eb73a07a3a0584cd4f20f55c57d188dfb25f"
1366-
integrity sha512-jqEO1YanHPOA9hosQF0QClvCMcCPZyKIQJHpR9RAFzfPARGOlcuImTcLTNiSCJf2ktXXkxjtADYcMLCXlW6YWQ==
1363+
"@deck.gl/react@^7.3.0":
1364+
version "7.3.1"
1365+
resolved "https://registry.yarnpkg.com/@deck.gl/react/-/react-7.3.1.tgz#d36cec8584cdff134c657a187fdd1733501e8623"
1366+
integrity sha512-8JVE8xMmI8VYqeBkKsWYRhmv2HL2+m2RadlrKCLPPJons97yRA4bP39iz52tnulJl9Lw5Ophd/suQf/hnvd/DA==
13671367
dependencies:
13681368
prop-types "^15.6.0"
13691369

@@ -10090,7 +10090,7 @@ locate-path@^3.0.0:
1009010090
p-locate "^3.0.0"
1009110091
path-exists "^3.0.0"
1009210092

10093-
lodash._reinterpolate@~3.0.0:
10093+
lodash._reinterpolate@^3.0.0, lodash._reinterpolate@~3.0.0:
1009410094
version "3.0.0"
1009510095
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
1009610096
integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
@@ -10148,6 +10148,14 @@ lodash.template@^4.0.2:
1014810148
lodash._reinterpolate "~3.0.0"
1014910149
lodash.templatesettings "^4.0.0"
1015010150

10151+
lodash.template@^4.5.0:
10152+
version "4.5.0"
10153+
resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
10154+
integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
10155+
dependencies:
10156+
lodash._reinterpolate "^3.0.0"
10157+
lodash.templatesettings "^4.0.0"
10158+
1015110159
lodash.templatesettings@^4.0.0:
1015210160
version "4.1.0"
1015310161
resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
@@ -11277,10 +11285,10 @@ octokit-pagination-methods@^1.1.0:
1127711285
resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4"
1127811286
integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==
1127911287

11280-
11281-
version "0.0.27"
11282-
resolved "https://registry.yarnpkg.com/ocular-dev-tools/-/ocular-dev-tools-0.0.27.tgz#6d66ab938c404ba37ff910c3f80817d099a72782"
11283-
integrity sha512-OrKiIfiku6a1PmzZS9ahBVXPK3i1v9zDeKoSXwar4esglyUrU7nOpV9hd2qZ+c00AcDlyH28y0i9pIWqpZQZJA==
11288+
11289+
version "0.0.30"
11290+
resolved "https://registry.yarnpkg.com/ocular-dev-tools/-/ocular-dev-tools-0.0.30.tgz#97a7afb34ee876a9157a0671026743ca4898ce92"
11291+
integrity sha512-6epl7UZXD6N3cfnqmwwSXNsFShBRV8JPBf9kEZIYsesN7tvWltcZz+2aJHNbEVz2QJcYASW7+JhHCbCEoVO4OA==
1128411292
dependencies:
1128511293
"@babel/cli" "^7.0.0"
1128611294
"@babel/core" "^7.0.0"
@@ -11292,8 +11300,11 @@ [email protected]:
1129211300
eslint "^4.13.1"
1129311301
eslint-config-prettier "^2.9.0"
1129411302
eslint-config-uber-es2015 "^3.0.0"
11303+
handlebars "^4.1.2"
1129511304
html-webpack-plugin "^3.2.0"
1129611305
lerna "^3.14.1"
11306+
lodash "^4.17.13"
11307+
lodash.template "^4.5.0"
1129711308
module-alias "^2.0.0"
1129811309
nyc "^13.3.0"
1129911310
prettier "1.14.3"
@@ -12111,9 +12122,9 @@ proto-list@~1.2.1:
1211112122
resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
1211212123
integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
1211312124

12114-
"protobufjs@git+https://github.com/jlisee/protobuf.js.git#ed8e699671da6f9a169074aa0f2a160cefe0844a":
12125+
"protobufjs@https://github.com/jlisee/protobuf.js#ed8e699671da6f9a169074aa0f2a160cefe0844a":
1211512126
version "6.8.8"
12116-
resolved "git+https://github.com/jlisee/protobuf.js.git#ed8e699671da6f9a169074aa0f2a160cefe0844a"
12127+
resolved "https://github.com/jlisee/protobuf.js#ed8e699671da6f9a169074aa0f2a160cefe0844a"
1211712128
dependencies:
1211812129
"@protobufjs/aspromise" "^1.1.2"
1211912130
"@protobufjs/base64" "^1.1.2"

0 commit comments

Comments
 (0)