Skip to content

Commit

Permalink
Merge 738b2c6 into 6bd6305
Browse files Browse the repository at this point in the history
  • Loading branch information
supersonicclay committed Aug 23, 2019
2 parents 6bd6305 + 738b2c6 commit 66020d5
Show file tree
Hide file tree
Showing 9 changed files with 205 additions and 26 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Expand Up @@ -4,5 +4,5 @@
],
"npmClient": "yarn",
"useWorkspaces": true,
"version": "0.14.10"
"version": "0.15.0-alpha.8"
}
5 changes: 1 addition & 4 deletions modules/edit-modes/package.json
Expand Up @@ -2,7 +2,7 @@
"name": "@nebula.gl/edit-modes",
"description": "GeoJSON editing modes for nebula.gl",
"license": "MIT",
"version": "0.14.10",
"version": "0.15.0-alpha.8",
"author": "Georgios Karnas <georgios@uber.com>",
"repository": {
"type": "git",
Expand All @@ -28,9 +28,6 @@
"build": "yarn build-clean && yarn build-es6 && yarn build-es5 && cp ../../README.md .",
"flow": "(cd ../.. && yarn flow)",
"lint": "(cd ../.. && yarn lint)",
"prepublish": "yarn build",
"publish-prod": "yarn build && yarn test && yarn test-dist && npm publish",
"publish-beta": "yarn build && yarn test && yarn test-dist && npm publish --tag beta",
"test": "yarn lint && yarn build && yarn flow && yarn jest",
"test-r": "yarn lint && yarn build && yarn test-node && (cd test/rendering-test && node node-rendering.js)",
"test-fast": "yarn test-node",
Expand Down
7 changes: 2 additions & 5 deletions modules/layers/package.json
Expand Up @@ -2,7 +2,7 @@
"name": "@nebula.gl/layers",
"description": "A suite of 3D-enabled data editing layers, suitable for deck.gl",
"license": "MIT",
"version": "0.14.10",
"version": "0.15.0-alpha.8",
"author": "Georgios Karnas <georgios@uber.com>",
"repository": {
"type": "git",
Expand All @@ -28,9 +28,6 @@
"build": "yarn build-clean && yarn build-es6 && yarn build-es5 && cp ../../README.md .",
"flow": "(cd ../.. && yarn flow)",
"lint": "(cd ../.. && yarn lint)",
"prepublish": "yarn build",
"publish-prod": "yarn build && yarn test && yarn test-dist && npm publish",
"publish-beta": "yarn build && yarn test && yarn test-dist && npm publish --tag beta",
"test": "yarn lint && yarn build && yarn flow && yarn jest",
"test-r": "yarn lint && yarn build && yarn test-node && (cd test/rendering-test && node node-rendering.js)",
"test-fast": "yarn test-node",
Expand All @@ -45,7 +42,7 @@
"test-rendering": "(cd test/rendering-test && webpack-dev-server --config webpack.config.test-rendering.js --progress --hot --open)"
},
"dependencies": {
"@nebula.gl/edit-modes": "0.14.10",
"@nebula.gl/edit-modes": "0.15.0-alpha.8",
"@turf/bbox": ">=4.0.0",
"@turf/bbox-polygon": ">=4.0.0",
"@turf/bearing": ">=4.0.0",
Expand Down
7 changes: 2 additions & 5 deletions modules/main/package.json
Expand Up @@ -2,7 +2,7 @@
"name": "nebula.gl",
"description": "A suite of 3D-enabled data editing overlays, suitable for deck.gl",
"license": "MIT",
"version": "0.14.10",
"version": "0.15.0-alpha.8",
"author": "Georgios Karnas <georgios@uber.com>",
"repository": {
"type": "git",
Expand All @@ -28,9 +28,6 @@
"build": "yarn build-clean && yarn build-es6 && yarn build-es5 && cp ../../README.md .",
"flow": "(cd ../.. && yarn flow)",
"lint": "(cd ../.. && yarn lint)",
"prepublish": "yarn build",
"publish-prod": "yarn build && yarn test && yarn test-dist && npm publish",
"publish-beta": "yarn build && yarn test && yarn test-dist && npm publish --tag beta",
"test": "yarn lint && yarn build && yarn flow && yarn jest",
"test-r": "yarn lint && yarn build && yarn test-node && (cd test/rendering-test && node node-rendering.js)",
"test-fast": "yarn test-node",
Expand All @@ -46,7 +43,7 @@
},
"dependencies": {
"@luma.gl/constants": "^7.0.0",
"@nebula.gl/layers": "0.14.10",
"@nebula.gl/layers": "0.15.0-alpha.8",
"@turf/bbox": ">=4.0.0",
"@turf/bbox-polygon": ">=4.0.0",
"@turf/bearing": ">=4.0.0",
Expand Down
5 changes: 1 addition & 4 deletions modules/overlays/package.json
Expand Up @@ -2,7 +2,7 @@
"name": "@nebula.gl/overlays",
"description": "React overlays for deck.gl",
"license": "MIT",
"version": "0.14.0",
"version": "0.15.0-alpha.8",
"author": "Georgios Karnas <georgios@uber.com>",
"repository": {
"type": "git",
Expand All @@ -28,9 +28,6 @@
"build": "yarn build-clean && yarn build-es6 && yarn build-es5",
"flow": "(cd ../.. && yarn flow)",
"lint": "(cd ../.. && yarn lint)",
"prepublish": "yarn build",
"publish-prod": "yarn build && yarn test && yarn test-dist && npm publish",
"publish-beta": "yarn build && yarn test && yarn test-dist && npm publish --tag beta",
"test": "yarn lint && yarn build && yarn flow && yarn jest",
"test-r": "yarn lint && yarn build && yarn test-node && (cd test/rendering-test && node node-rendering.js)",
"test-fast": "yarn test-node",
Expand Down
7 changes: 2 additions & 5 deletions modules/react-map-gl-draw/package.json
Expand Up @@ -2,7 +2,7 @@
"name": "react-map-gl-draw",
"description": "A lite version editing layer with react",
"license": "MIT",
"version": "0.14.10",
"version": "0.15.0-alpha.8",
"author": "Xintong Xia <xintong@uber.com>",
"repository": {
"type": "git",
Expand All @@ -27,13 +27,10 @@
"build": "yarn build-clean && yarn build-es6 && yarn build-es5",
"flow": "(cd ../.. && yarn flow)",
"lint": "(cd ../.. && yarn lint)",
"prepublish": "yarn build",
"publish-prod": "yarn build && yarn test && yarn test-dist && npm publish",
"publish-beta": "yarn build && yarn test && yarn test-dist && npm publish --tag beta",
"test": "yarn lint && yarn build && yarn flow && yarn jest"
},
"dependencies": {
"@nebula.gl/edit-modes": "0.14.10",
"@nebula.gl/edit-modes": "0.15.0-alpha.8",
"@turf/helpers": "^6.1.4",
"mjolnir.js": "^2.2.1",
"prop-types": "^15.7.2",
Expand Down
6 changes: 4 additions & 2 deletions package.json
Expand Up @@ -20,12 +20,13 @@
"start": "open http://nebula.gl/docs",
"bootstrap": "lerna bootstrap",
"build": "lerna exec npm run build",
"flow-copy-src": "./scripts/flow-copy-src.js",
"pretty": "prettier --write \"{modules,examples,test}/**/*.js\" --loglevel warn",
"lint": "npm run lint-yarn && eslint modules/**/src examples",
"lint-yarn": "!(grep -q unpm.u yarn.lock) && echo 'Lockfile valid.' || (echo 'Please rebuild yarn file using public npmrc' && false)",
"flow": "flow",
"prepublish": "npm run build",
"publish-prod": "npm run bootstrap && npm run build && npm run test && lerna publish --exact && ./scripts/changelog.sh",
"prepack": "npm run bootstrap && npm run test && npm run flow-copy-src",
"postpublish": "./scripts/changelog.sh",
"test": "npm run lint && npm run build && npm run flow && npm run jest",
"test-r": "npm run lint && npm run build && npm run test-node && (cd test/rendering-test && node node-rendering.js)",
"test-fast": "npm run test-node",
Expand Down Expand Up @@ -74,6 +75,7 @@
"eslint-plugin-prettier": "^2.6.0",
"eslint-plugin-react": "^7.5.1",
"flow-bin": "^0.81.0",
"flow-copy-source": "^2.0.3",
"jest": "^24.9.0",
"jsdom": "^9.11.0",
"lerna": "^3.10.7",
Expand Down
41 changes: 41 additions & 0 deletions scripts/flow-copy-src.js
@@ -0,0 +1,41 @@
#!/usr/bin/env node

/*
Copyright (c) 2018 Uber Technologies, Inc.
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
*/

/* eslint-env node */
// @flow

// This file copies flow source files to dist output for all modules
// This way the flow typings will be available in the npm module

const path = require('path');
const { lstatSync, readdirSync } = require('fs');
const { join } = require('path');
const flowCopySource = require('flow-copy-source');

const getDirectories = directory =>
readdirSync(directory)
.map(name => join(directory, name))
.filter(entry => lstatSync(entry).isDirectory());

async function run() {
const directories = getDirectories(path.resolve(__dirname, '../modules'));

for (const directory of directories) {
console.log(`Copying flow source for directory ${directory}`); // eslint-disable-line

await flowCopySource([join(directory, 'src')], join(directory, 'dist-es6'), {
ignore: ['**/*.test.js', 'test/**/*.js']
});

await flowCopySource([join(directory, 'src')], join(directory, 'dist'), {
ignore: ['**/*.test.js', 'test/**/*.js']
});
}
}

run();

0 comments on commit 66020d5

Please sign in to comment.