Skip to content

Commit

Permalink
Misc package setup fixes (#395)
Browse files Browse the repository at this point in the history
  • Loading branch information
Pessimistress committed Oct 2, 2019
1 parent 7431f99 commit fd34fbc
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 15 deletions.
2 changes: 1 addition & 1 deletion modules/core/package.json
Expand Up @@ -19,7 +19,7 @@
"@deck.gl/core": "^7.3.0",
"@deck.gl/layers": "^7.3.0",
"@deck.gl/mesh-layers": "^7.3.0",
"@deck.gl/react": "^7.3.0-beta.8",
"@deck.gl/react": "^7.3.0",
"@streetscape.gl/monochrome": "1.0.1",
"@xviz/parser": "^1.0.1",
"lodash.merge": "^4.6.1",
Expand Down
5 changes: 3 additions & 2 deletions package.json
Expand Up @@ -17,6 +17,7 @@
"lint": "ocular-lint",
"publish": "ocular-publish",
"test": "ocular-test",
"test-fast": "ocular-lint pre-commit && ocular-test node",
"test-ci": "ocular-test cover && (cat coverage/lcov.info | coveralls)",
"typecheck": "flow check || true"
},
Expand All @@ -41,7 +42,7 @@
"eslint-plugin-react": "^7.5.1",
"flow-bin": "^0.80.0",
"jsdom": "^9.11.0",
"ocular-dev-tools": "0.0.27",
"ocular-dev-tools": "0.0.30",
"pre-commit": "^1.2.2",
"react": "^16.4.1",
"react-dom": "^16.4.1",
Expand All @@ -54,7 +55,7 @@
},
"pre-commit": [
"copyright-check",
"test"
"test-fast"
],
"private": true
}
2 changes: 1 addition & 1 deletion website/webpack.config.js
Expand Up @@ -33,7 +33,7 @@ const ROOT_DIR = resolve(__dirname, '..');
// Seems to be a Babel bug
// https://github.com/babel/babel-loader/issues/149#issuecomment-191991686
const BABEL_CONFIG = {
presets: ['@babel/preset-env', '@babel/preset-react'],
presets: ['@babel/preset-env', '@babel/preset-react', '@babel/preset-flow'],
plugins: ['@babel/proposal-class-properties']
};

Expand Down
33 changes: 22 additions & 11 deletions yarn.lock
Expand Up @@ -1360,10 +1360,10 @@
dependencies:
"@luma.gl/addons" "^7.3.0"

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

Expand Down Expand Up @@ -10090,7 +10090,7 @@ locate-path@^3.0.0:
p-locate "^3.0.0"
path-exists "^3.0.0"

lodash._reinterpolate@~3.0.0:
lodash._reinterpolate@^3.0.0, lodash._reinterpolate@~3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
Expand Down Expand Up @@ -10148,6 +10148,14 @@ lodash.template@^4.0.2:
lodash._reinterpolate "~3.0.0"
lodash.templatesettings "^4.0.0"

lodash.template@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
dependencies:
lodash._reinterpolate "^3.0.0"
lodash.templatesettings "^4.0.0"

lodash.templatesettings@^4.0.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
Expand Down Expand Up @@ -11277,10 +11285,10 @@ octokit-pagination-methods@^1.1.0:
resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4"
integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==

ocular-dev-tools@0.0.27:
version "0.0.27"
resolved "https://registry.yarnpkg.com/ocular-dev-tools/-/ocular-dev-tools-0.0.27.tgz#6d66ab938c404ba37ff910c3f80817d099a72782"
integrity sha512-OrKiIfiku6a1PmzZS9ahBVXPK3i1v9zDeKoSXwar4esglyUrU7nOpV9hd2qZ+c00AcDlyH28y0i9pIWqpZQZJA==
ocular-dev-tools@0.0.30:
version "0.0.30"
resolved "https://registry.yarnpkg.com/ocular-dev-tools/-/ocular-dev-tools-0.0.30.tgz#97a7afb34ee876a9157a0671026743ca4898ce92"
integrity sha512-6epl7UZXD6N3cfnqmwwSXNsFShBRV8JPBf9kEZIYsesN7tvWltcZz+2aJHNbEVz2QJcYASW7+JhHCbCEoVO4OA==
dependencies:
"@babel/cli" "^7.0.0"
"@babel/core" "^7.0.0"
Expand All @@ -11292,8 +11300,11 @@ ocular-dev-tools@0.0.27:
eslint "^4.13.1"
eslint-config-prettier "^2.9.0"
eslint-config-uber-es2015 "^3.0.0"
handlebars "^4.1.2"
html-webpack-plugin "^3.2.0"
lerna "^3.14.1"
lodash "^4.17.13"
lodash.template "^4.5.0"
module-alias "^2.0.0"
nyc "^13.3.0"
prettier "1.14.3"
Expand Down Expand Up @@ -12111,9 +12122,9 @@ proto-list@~1.2.1:
resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=

"protobufjs@git+https://github.com/jlisee/protobuf.js.git#ed8e699671da6f9a169074aa0f2a160cefe0844a":
"protobufjs@https://github.com/jlisee/protobuf.js#ed8e699671da6f9a169074aa0f2a160cefe0844a":
version "6.8.8"
resolved "git+https://github.com/jlisee/protobuf.js.git#ed8e699671da6f9a169074aa0f2a160cefe0844a"
resolved "https://github.com/jlisee/protobuf.js#ed8e699671da6f9a169074aa0f2a160cefe0844a"
dependencies:
"@protobufjs/aspromise" "^1.1.2"
"@protobufjs/base64" "^1.1.2"
Expand Down

0 comments on commit fd34fbc

Please sign in to comment.