Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Chore]: Upgraded to node 12/14 #1326

Merged
merged 2 commits into from Dec 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/npmpublish.yml
Expand Up @@ -8,13 +8,13 @@ jobs:
publish-npm:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2.1.1
- uses: actions/setup-node@v1
with:
node-version: 10
node-version: 12
registry-url: https://registry.npmjs.org/
- run: npm install -g yarn
- run: yarn --ignore
- run: yarn
- run: npm publish
env:
NODE_AUTH_TOKEN: ${{secrets.npm_token}}
44 changes: 44 additions & 0 deletions .github/workflows/test.yml
@@ -0,0 +1,44 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Node.js CI

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [12.x]

steps:
- uses: actions/checkout@v2.1.1

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install XVFB
run: sudo apt-get install xvfb

- name: Install YARN
run: npm install -g yarn

- name: Install Dependecies
run: yarn

- name: Test
run: xvfb-run --auto-servernum yarn cover

- name: Coveralls
uses: coverallsapp/github-action@v1.1.2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .nvmrc
@@ -1 +1 @@
10.15.0
12.19.0
33 changes: 0 additions & 33 deletions .travis.yml

This file was deleted.

5 changes: 2 additions & 3 deletions package.json
Expand Up @@ -27,8 +27,7 @@
"test-browser-drive": "NODE_ENV=test node ./test/browser-drive.js",
"test-e2e": "NODE_ENV=test HEADLESS=true SLOWMO=true jest",
"test": "npm run lint && npm run test-node && npm run test-browser",
"cover": "nyc --reporter html --reporter cobertura --reporter json-summary npm test && nyc report",
"coveralls": "nyc npm test && nyc report --reporter cobertura --reporter=text-lcov | coveralls",
"cover": "nyc --reporter=lcov --reporter html npm test",
"start": "npm run install-and-start -- examples/demo-app start-local",
"start:deck": "npm run install-and-start -- examples/demo-app start-local-deck",
"start:deck-src": "npm run install-and-start -- examples/demo-app start-local-deck-src",
Expand Down Expand Up @@ -270,7 +269,7 @@
]
},
"engines": {
"node": ">=10.0.0"
"node": ">=12.0.0"
},
"maintainers": [
"Shan He <heshan0131@gmail.com>",
Expand Down
3 changes: 1 addition & 2 deletions src/components/index.js
Expand Up @@ -176,8 +176,7 @@ export {
} from './side-panel/layer-panel/layer-configurator';

// map components
export {default as MapLegend} from 'components/map/map-legend'

export {default as MapLegend} from 'components/map/map-legend';

export * from './common/styled-components';
import * as Icons from './common/icons';
Expand Down
3 changes: 2 additions & 1 deletion src/localization/ca.js
Expand Up @@ -317,7 +317,8 @@ export default {
tokenPlaceholder: "Enganxa el teu token d'accés a Mapbox",
tokenMisuseWarning:
'* Si no proporciones el teu propi token, el mapa podria fallar en qualsevol moment quan reemplacem el nostre token per evitar abusos. ',
tokenDisclaimer: 'Pots canviar el toke de Mapbox més endavant fent servir aquestes instruccions: ',
tokenDisclaimer:
'Pots canviar el toke de Mapbox més endavant fent servir aquestes instruccions: ',
tokenUpdate: 'Com actualitzar un token preexistent.',
modeTitle: 'Mode mapa',
modeSubtitle1: 'Selecciona mode app. Més ',
Expand Down
6 changes: 4 additions & 2 deletions src/localization/es.js
Expand Up @@ -150,7 +150,8 @@ export default {
highPrecisionRendering: 'Representación de alta precisión',
highPrecisionRenderingDescription: 'La precisión alta tendrá un rendimiento más bajo',
height: 'Altura',
heightDescription: 'Haz clic en el botón de arriba a la derecha del mapa per cambiar a vista 3D',
heightDescription:
'Haz clic en el botón de arriba a la derecha del mapa per cambiar a vista 3D',
fill: 'Rellenar',
enablePolygonHeight: 'Activar la altura del polígono',
showWireframe: 'Muestra esquemàtico',
Expand Down Expand Up @@ -317,7 +318,8 @@ export default {
tokenPlaceholder: 'Enganchar tu token de acceso a Mapbox',
tokenMisuseWarning:
'* Si no proporcionas tu propio token, el mapa podría fallar en cualquier momento cuando reemplacemos nuestro token para evitar abusos. ',
tokenDisclaimer: 'Puedes cambiar el token de Mapbox posteriormente utilizando estas instrucciones: ',
tokenDisclaimer:
'Puedes cambiar el token de Mapbox posteriormente utilizando estas instrucciones: ',
tokenUpdate: 'Como actualitzar un token preexistente.',
modeTitle: 'Modo mapa',
modeSubtitle1: 'Seleccionar modo app. Más ',
Expand Down
7 changes: 6 additions & 1 deletion src/processors/index.js
Expand Up @@ -31,6 +31,11 @@ export {
} from './data-processor';

// File Handlers
export {readFileInBatches, processFileData, filesToDataPayload, isKeplerGlMap} from './file-handler';
export {
readFileInBatches,
processFileData,
filesToDataPayload,
isKeplerGlMap
} from './file-handler';

export {Processors as default} from './data-processor';