Skip to content

Commit

Permalink
[chore] move dev env to Node.js 18 (#2399)
Browse files Browse the repository at this point in the history
Signed-off-by: Ib Green <ib@foursquare.com>
Signed-off-by: Ihor Dykhta <dikhta.igor@gmail.com>
  • Loading branch information
igorDykhta committed Oct 25, 2023
1 parent bb55975 commit c8e2a9f
Show file tree
Hide file tree
Showing 25 changed files with 562 additions and 229 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build-publish-pypi.yml
Expand Up @@ -3,7 +3,6 @@ name: Build KeplerGL Python and NPM Packages
on: push

jobs:

build_and_publish:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
Expand All @@ -12,9 +11,9 @@ jobs:
- uses: actions/checkout@v2

- name: Use Node.js 12.x
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: 12.x
node-version: 18.x
registry-url: https://registry.npmjs.org/

- name: Set up Python 3.8
Expand All @@ -30,6 +29,7 @@ jobs:
- name: Build KeplerGL
env:
MapboxAccessTokenJupyter: ${{ secrets.mapbox_jupyter_token }}
NODE_OPTIONS: --openssl-legacy-provider
run: |
python -m virtualenv venv
source venv/bin/activate
Expand All @@ -48,7 +48,7 @@ jobs:
venv/bin/jupyter nbconvert --execute bindings/kepler.gl-jupyter/notebooks/DataFrame.ipynb --to python
python bindings/kepler.gl-jupyter/notebooks/DataFrame.py
- name: Create artifact
- name: Create artifact
uses: actions/upload-artifact@v2
with:
name: keplergl-pypi
Expand All @@ -60,16 +60,16 @@ jobs:
if [[ ${{ github.event.ref }} =~ ^refs/tags/v[0-9]+\.[0-9]+\.[0-9]+-jupyter$ ]]; then
echo ::set-output name=publish::true
fi
- name: Publish KeplerGL to Pypi
if: steps.check-tag.outputs.publish == 'true'
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.pypi_token }}
run: |
python -m twine upload bindings/kepler.gl-jupyter/dist/*.tar.gz
python -m twine upload bindings/kepler.gl-jupyter/dist/*.tar.gz
- name: Publish kepler-jupyter to NPM
- name: Publish kepler-jupyter to NPM
if: steps.check-tag.outputs.publish == 'true'
env:
NODE_AUTH_TOKEN: ${{secrets.npm_token}}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/npmpublish.yml
Expand Up @@ -9,9 +9,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.1.1
- uses: actions/setup-node@v1
- uses: actions/setup-node@v3
with:
node-version: 14
node-version: 18
registry-url: https://registry.npmjs.org/
- run: npm install -g yarn
- run: yarn
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
node-version: [14.x]
node-version: [18.x]

steps:
- uses: actions/checkout@v2.1.1
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
@@ -1 +1 @@
14.21.1
18.18.2
2 changes: 1 addition & 1 deletion bindings/kepler.gl-jupyter/js/package.json
Expand Up @@ -27,7 +27,7 @@
"clean": "rimraf dist/ && rimraf ../keplergl/static/",
"cleanall": "npm run clean && rimraf node_modules/",
"prepublish": "yarn build && yarn build:lab",
"build": "npm run clean && webpack --config ./webpack/build.js && jupyter labextension build .",
"build": "npm run clean && npm run build:lab && webpack --config ./webpack/build.js && jupyter labextension build .",
"build:lab": "rimraf babel/ && mkdir babel && babel lib --out-dir babel",
"test": "echo \"Error: no test specified\" && exit 1",
"lint": "eslint lib webpack --fix",
Expand Down
22 changes: 11 additions & 11 deletions package.json
Expand Up @@ -39,7 +39,7 @@
},
"scripts": {
"bootstrap": "PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true yarn",
"install:example": "cd examples/demo-app && yarn",
"install:example": "NODE_OPTIONS=--openssl-legacy-provider cd examples/demo-app && yarn",
"install:web": "yarn install:example && cd website && yarn",
"install-and-start": "node ./scripts/install-and-start",
"test-fast": "yarn test-node-debug && yarn test-browser-debug",
Expand All @@ -56,10 +56,10 @@
"cover-jest": "yarn jest --coverage --reporter=html --watchAll=false",
"cover-copy": "rm -rf .nyc_output && mkdir .nyc_output && cp tape-coverage/coverage-final.json .nyc_output/tape-coverage-final.json && cp jest-coverage/coverage-final.json .nyc_output/jest-coverage-final.json",
"cover": "yarn cover-jest && yarn cover-tape && yarn cover-copy && nyc report --reporter=json --reporter=html --reporter=lcov",
"start": "yarn install-and-start -- examples/demo-app start-local",
"start:deck": "yarn install-and-start -- examples/demo-app start-local-deck",
"start:deck-src": "yarn install-and-start -- examples/demo-app start-local-deck-src",
"start:loaders-src": "yarn install-and-start -- examples/demo-app start-local-loaders-src",
"start": "NODE_OPTIONS=--openssl-legacy-provider yarn install-and-start -- examples/demo-app start-local",
"start:deck": "NODE_OPTIONS=--openssl-legacy-provider yarn install-and-start -- examples/demo-app start-local-deck",
"start:deck-src": "NODE_OPTIONS=--openssl-legacy-provider yarn install-and-start -- examples/demo-app start-local-deck-src",
"start:loaders-src": "NODE_OPTIONS=--openssl-legacy-provider yarn install-and-start -- examples/demo-app start-local-loaders-src",
"start:open-modal": "yarn install-and-start -- examples/open-modal start-local",
"start:custom-reducer": "yarn install-and-start -- examples/custom-reducer start-local",
"start:replace-component": "yarn install-and-start -- examples/replace-component start-local",
Expand All @@ -69,11 +69,11 @@
"start:web": "yarn install-and-start -- website start",
"start:https": "yarn install-and-start -- examples/demo-app start-local-https",
"start:e2e": "yarn install-and-start -- examples/demo-app start-local-e2e",
"build": "rm -fr dist && babel src/{actions,components,reducers,cloud-providers,localization,tasks} --out-dir dist --source-maps inline --extensions '.ts,.tsx,.js,.jsx' --ignore '**/*.d.ts'",
"build:umd": "webpack --config ./webpack/umd.js --progress --env.prod",
"build": "NODE_OPTIONS=--openssl-legacy-provider rm -fr dist && babel src/{actions,components,reducers,cloud-providers,localization,tasks} --out-dir dist --source-maps inline --extensions '.ts,.tsx,.js,.jsx' --ignore '**/*.d.ts'",
"build:umd": "NODE_OPTIONS=--openssl-legacy-provider webpack --config ./webpack/umd.js --progress --env.prod",
"build:types": "tsc --project tsconfig.production.json",
"analyze": "yarn analyze:bundle",
"analyze:bundle": "webpack --config ./webpack/bundle.js --progress --env.prod",
"analyze:bundle": "NODE_OPTIONS=--openssl-legacy-provider webpack --config ./webpack/bundle.js --progress --env.prod",
"check-licence": "uber-licence --dry",
"add-licence": "uber-licence",
"prepublish": "yarn fix-dependencies && yarn workspaces run stab && yarn workspaces run prepublish && uber-licence && yarn build:umd && yarn build:types",
Expand Down Expand Up @@ -176,7 +176,7 @@
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"gl": "^4.9.2",
"gl": "^6.0.2",
"jest": "^29.5.0",
"jest-environment-jsdom": "^29.5.0",
"jsdom": "^16.4.0",
Expand Down Expand Up @@ -254,14 +254,14 @@
]
},
"engines": {
"node": ">=14"
"node": ">=18"
},
"maintainers": [
"Shan He <heshan0131@gmail.com>",
"Giuseppe Macri <gmacri@uber.com>"
],
"volta": {
"node": "14.21.1",
"node": "18.18.2",
"yarn": "1.22.19"
},
"nx": {
Expand Down
6 changes: 3 additions & 3 deletions src/actions/package.json
Expand Up @@ -20,7 +20,7 @@
},
"scripts": {
"build": "rm -fr dist && babel src --out-dir dist --source-maps inline --extensions '.ts,.tsx,.js,.jsx' --ignore '**/*.d.ts'",
"build:umd": "webpack --config ./webpack/umd.js --progress --env.prod",
"build:umd": "NODE_OPTIONS=--openssl-legacy-provider webpack --config ./webpack/umd.js --progress --env.prod",
"build:types": "tsc --project ./tsconfig.production.json",
"prepublish": "uber-licence && yarn build && yarn build:types",
"stab": "mkdir -p dist && touch dist/index.js"
Expand Down Expand Up @@ -51,14 +51,14 @@
"instrument": false
},
"engines": {
"node": ">=14.21.1"
"node": ">=18.18.2"
},
"maintainers": [
"Shan He <heshan0131@gmail.com>",
"Giuseppe Macri <gmacri@uber.com>"
],
"volta": {
"node": "14.21.1",
"node": "18.18.2",
"yarn": "1.22.17"
}
}
6 changes: 3 additions & 3 deletions src/cloud-providers/package.json
Expand Up @@ -20,7 +20,7 @@
},
"scripts": {
"build": "rm -fr dist && babel src --out-dir dist --source-maps inline --extensions '.ts,.tsx,.js,.jsx' --ignore '**/*.d.ts'",
"build:umd": "webpack --config ./webpack/umd.js --progress --env.prod",
"build:umd": "NODE_OPTIONS=--openssl-legacy-provider webpack --config ./webpack/umd.js --progress --env.prod",
"build:types": "tsc --project ./tsconfig.production.json",
"prepublish": "uber-licence && yarn build && yarn build:types",
"stab": "mkdir -p dist && touch dist/index.js"
Expand All @@ -38,14 +38,14 @@
"instrument": false
},
"engines": {
"node": ">=14.21.1"
"node": ">=18.18.2"
},
"maintainers": [
"Shan He <heshan0131@gmail.com>",
"Giuseppe Macri <gmacri@uber.com>"
],
"volta": {
"node": "14.21.1",
"node": "18.18.2",
"yarn": "1.22.17"
}
}
6 changes: 3 additions & 3 deletions src/components/package.json
Expand Up @@ -20,7 +20,7 @@
},
"scripts": {
"build": "rm -fr dist && babel src --out-dir dist --source-maps inline --extensions '.ts,.tsx,.js,.jsx' --ignore '**/*.d.ts'",
"build:umd": "webpack --config ./webpack/umd.js --progress --env.prod",
"build:umd": "NODE_OPTIONS=--openssl-legacy-provider webpack --config ./webpack/umd.js --progress --env.prod",
"build:types": "tsc --project ./tsconfig.production.json",
"prepublish": "uber-licence && yarn build && yarn build:types",
"stab": "mkdir -p dist && touch dist/index.js"
Expand Down Expand Up @@ -130,14 +130,14 @@
"instrument": false
},
"engines": {
"node": ">=14.21.1"
"node": ">=18.18.2"
},
"maintainers": [
"Shan He <heshan0131@gmail.com>",
"Giuseppe Macri <gmacri@uber.com>"
],
"volta": {
"node": "14.21.1",
"node": "18.18.2",
"yarn": "1.22.17"
}
}
6 changes: 3 additions & 3 deletions src/constants/package.json
Expand Up @@ -20,7 +20,7 @@
},
"scripts": {
"build": "rm -fr dist && babel src --out-dir dist --source-maps inline --extensions '.ts,.tsx,.js,.jsx' --ignore '**/*.d.ts'",
"build:umd": "webpack --config ./webpack/umd.js --progress --env.prod",
"build:umd": "NODE_OPTIONS=--openssl-legacy-provider webpack --config ./webpack/umd.js --progress --env.prod",
"build:types": "tsc --project ./tsconfig.production.json",
"prepublish": "uber-licence && yarn build && yarn build:umd && yarn build:types",
"stab": "mkdir -p dist && touch dist/index.js"
Expand All @@ -43,14 +43,14 @@
"instrument": false
},
"engines": {
"node": ">=14.21.1"
"node": ">=18.18.2"
},
"maintainers": [
"Shan He <heshan0131@gmail.com>",
"Giuseppe Macri <gmacri@uber.com>"
],
"volta": {
"node": "14.21.1",
"node": "18.18.2",
"yarn": "1.22.17"
}
}
6 changes: 3 additions & 3 deletions src/deckgl-layers/package.json
Expand Up @@ -20,7 +20,7 @@
},
"scripts": {
"build": "rm -fr dist && babel src --out-dir dist --source-maps inline --extensions '.ts,.tsx,.js,.jsx' --ignore '**/*.d.ts'",
"build:umd": "webpack --config ./webpack/umd.js --progress --env.prod",
"build:umd": "NODE_OPTIONS=--openssl-legacy-provider webpack --config ./webpack/umd.js --progress --env.prod",
"build:types": "tsc --project ./tsconfig.production.json",
"prepublish": "uber-licence && yarn build && yarn build:types",
"stab": "mkdir -p dist && touch dist/index.js"
Expand Down Expand Up @@ -58,14 +58,14 @@
"instrument": false
},
"engines": {
"node": ">=14.21.1"
"node": ">=18.18.2"
},
"maintainers": [
"Shan He <heshan0131@gmail.com>",
"Giuseppe Macri <gmacri@uber.com>"
],
"volta": {
"node": "14.21.1",
"node": "18.18.2",
"yarn": "1.22.17"
}
}
6 changes: 3 additions & 3 deletions src/effects/package.json
Expand Up @@ -20,7 +20,7 @@
},
"scripts": {
"build": "rm -fr dist && babel src --out-dir dist --source-maps inline --extensions '.ts,.tsx,.js,.jsx' --ignore '**/*.d.ts'",
"build:umd": "webpack --config ./webpack/umd.js --progress --env.prod",
"build:umd": "NODE_OPTIONS=--openssl-legacy-provider webpack --config ./webpack/umd.js --progress --env.prod",
"build:types": "tsc --project ./tsconfig.production.json",
"prepublish": "uber-licence && yarn build && yarn build:types",
"stab": "mkdir -p dist && touch dist/index.js"
Expand All @@ -43,14 +43,14 @@
"instrument": false
},
"engines": {
"node": ">=14.21.1"
"node": ">=18.18.2"
},
"maintainers": [
"Shan He <heshan0131@gmail.com>",
"Giuseppe Macri <gmacri@uber.com>"
],
"volta": {
"node": "14.21.1",
"node": "18.18.2",
"yarn": "1.22.17"
}
}
6 changes: 3 additions & 3 deletions src/layers/package.json
Expand Up @@ -20,7 +20,7 @@
},
"scripts": {
"build": "rm -fr dist && babel src --out-dir dist --source-maps inline --extensions '.ts,.tsx,.js,.jsx' --ignore '**/*.d.ts'",
"build:umd": "webpack --config ./webpack/umd.js --progress --env.prod",
"build:umd": "NODE_OPTIONS=--openssl-legacy-provider webpack --config ./webpack/umd.js --progress --env.prod",
"build:types": "tsc --project ./tsconfig.production.json",
"prepublish": "uber-licence && yarn build && yarn build:types",
"stab": "mkdir -p dist && touch dist/index.js"
Expand Down Expand Up @@ -76,14 +76,14 @@
"instrument": false
},
"engines": {
"node": ">=14.21.1"
"node": ">=18.18.2"
},
"maintainers": [
"Shan He <heshan0131@gmail.com>",
"Giuseppe Macri <gmacri@uber.com>"
],
"volta": {
"node": "14.21.1",
"node": "18.18.2",
"yarn": "1.22.17"
}
}
6 changes: 3 additions & 3 deletions src/localization/package.json
Expand Up @@ -20,7 +20,7 @@
},
"scripts": {
"build": "rm -fr dist && babel src --out-dir dist --source-maps inline --extensions '.ts,.tsx,.js,.jsx' --ignore '**/*.d.ts'",
"build:umd": "webpack --config ./webpack/umd.js --progress --env.prod",
"build:umd": "NODE_OPTIONS=--openssl-legacy-provider webpack --config ./webpack/umd.js --progress --env.prod",
"build:types": "tsc --project ./tsconfig.production.json",
"prepublish": "uber-licence && yarn build && yarn build:types",
"stab": "mkdir -p dist && touch dist/index.js"
Expand All @@ -39,14 +39,14 @@
"instrument": false
},
"engines": {
"node": ">=14.21.1"
"node": ">=18.18.2"
},
"maintainers": [
"Shan He <heshan0131@gmail.com>",
"Giuseppe Macri <gmacri@uber.com>"
],
"volta": {
"node": "14.21.1",
"node": "18.18.2",
"yarn": "1.22.17"
}
}
6 changes: 3 additions & 3 deletions src/processors/package.json
Expand Up @@ -20,7 +20,7 @@
},
"scripts": {
"build": "rm -fr dist && babel src --out-dir dist --source-maps inline --extensions '.ts,.tsx,.js,.jsx' --ignore '**/*.d.ts'",
"build:umd": "webpack --config ./webpack/umd.js --progress --env.prod",
"build:umd": "NODE_OPTIONS=--openssl-legacy-provider webpack --config ./webpack/umd.js --progress --env.prod",
"build:types": "tsc --project ./tsconfig.production.json",
"prepublish": "uber-licence && yarn build && yarn build:types",
"stab": "mkdir -p dist && touch dist/index.js"
Expand Down Expand Up @@ -49,14 +49,14 @@
"instrument": false
},
"engines": {
"node": ">=14.21.1"
"node": ">=18.18.2"
},
"maintainers": [
"Shan He <heshan0131@gmail.com>",
"Giuseppe Macri <gmacri@uber.com>"
],
"volta": {
"node": "14.21.1",
"node": "18.18.2",
"yarn": "1.22.17"
}
}

0 comments on commit c8e2a9f

Please sign in to comment.