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: Upgrade to yarn4 #81

Merged
merged 10 commits into from
May 3, 2024
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ jobs:
steps:
- uses: actions/[email protected]

- name: Use Node.js
uses: actions/[email protected]
with:
node-version: '18.x'
- uses: volta-cli/action@v4

- name: Install dependencies
run: |
yarn install
yarn bootstrap

- name: Run tests
Expand Down
4 changes: 0 additions & 4 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
compressionLevel: mixed

enableGlobalCache: false

nodeLinker: node-modules
4 changes: 2 additions & 2 deletions modules/arrow-layers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
"@math.gl/polygon": "^4.0.0",
"apache-arrow": ">=15",
"threads": "^1.7.0"
},
},
"peerDependencies": {
"@deck.gl/core": "^9.0.12",
"@deck.gl/aggregation-layers": "^9.0.12",
"@deck.gl/core": "^9.0.12",
"@deck.gl/geo-layers": "^9.0.12",
"@deck.gl/layers": "^9.0.12"
},
Expand Down
12 changes: 7 additions & 5 deletions modules/layers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,12 @@
"@deck.gl/layers": "^9.0.12",
"@deck.gl/mesh-layers": "^9.0.12",
"@deck.gl/react": "^9.0.12",
"@loaders.gl/core": "^4.1.4",
"@loaders.gl/i3s": "^4.1.4",
"@loaders.gl/loader-utils": "^4.1.4",
"@loaders.gl/schema": "^4.1.4",
"@loaders.gl/tiles": "^4.1.4"
"@loaders.gl/core": "^4.2.0",
"@loaders.gl/i3s": "^4.2.0",
"@loaders.gl/loader-utils": "^4.2.0",
"@loaders.gl/schema": "^4.2.0",
"@loaders.gl/tiles": "^4.2.0",
"@luma.gl/core": "^9.0.11",
"@luma.gl/engine": "^9.0.11"
}
}
4 changes: 2 additions & 2 deletions modules/react-editable-layers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"dependencies": {
"@deck.gl-community/editable-layers": "^9.0.0-alpha.1",
"@deck.gl-community/react": "0.0.1",
"@loaders.gl/core": "^4.1.4",
"@loaders.gl/wkt": "^4.1.4",
"@loaders.gl/core": "^4.2.0",
"@loaders.gl/wkt": "^4.2.0",
"@maphubs/tokml": "^0.6.1",
"@tmcw/togeojson": "^3.2.0",
"@turf/helpers": "^6.5.0",
Expand Down
13 changes: 11 additions & 2 deletions modules/react-graph-layers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,20 @@
"styled-components": "^4.4.1"
},
"devDependencies": {
"@storybook/addon-knobs": "^6.4.0"
"@storybook/addon-knobs": "^6.4.0",
"@storybook/addons": "^6.4.0",
"@storybook/api": "^6.4.0",
"@storybook/components": "^6.4.0",
"@storybook/core-events": "^6.4.0",
"@storybook/theming": "^6.4.0"
},
"peerDependencies": {
"react": ">=18.2.0",
"react-dom": ">=18.2.0"
},
"eslintIgnore": ["**/*.md", "dist", "node_modules"]
"eslintIgnore": [
"**/*.md",
"dist",
"node_modules"
]
}
3 changes: 1 addition & 2 deletions modules/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"description": "React components for deck.gl",
"license": "MIT",
"version": "0.0.1",
"author": "Georgios Karnas <[email protected]>",
"repository": {
"type": "git",
"url": "https://github.com/uber/@deck.gl-community"
Expand Down Expand Up @@ -36,8 +35,8 @@
"src"
],
"dependencies": {
"@types/styled-react-modal": "^1.2.5",
"@turf/helpers": "^6.5.0",
"@types/styled-react-modal": "^1.2.5",
"prop-types": "^15.8.1",
"styled-components": "^4.4.1",
"styled-react-modal": "^3.1.1",
Expand Down
2 changes: 2 additions & 0 deletions modules/react/src/components/view-control.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// @ts-nocheck

import React, {PureComponent} from 'react';
import PropTypes from 'prop-types';
import styled from 'styled-components';
Expand Down
10 changes: 8 additions & 2 deletions modules/template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
"publishConfig": {
"access": "public"
},
"keywords": ["webgl", "visualization"],
"keywords": [
"webgl",
"visualization"
],
"repository": {
"type": "git",
"url": "https://github.com/visgl/deck.gl-community.gl.git"
Expand All @@ -24,7 +27,10 @@
"import": "./dist/index.js"
}
},
"files": ["dist", "src"],
"files": [
"dist",
"src"
],
"scripts": {
"test": "vitest run",
"test-watch": "vitest"
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"modules/*"
],
"scripts": {
"bootstrap": "PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true yarn && ocular-bootstrap",
"bootstrap": "ocular-bootstrap",
"build": "ocular-clean && ocular-build && lerna run build",
"lint": "ocular-lint",
"prepublishOnly": "ocular-build && node -e \"const fs = require('fs'); const pkg = JSON.parse(fs.readFileSync('./package.json', {encoding: 'utf8'})); delete pkg.engines; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2)); console.log(pkg)\"",
Expand Down Expand Up @@ -66,6 +66,6 @@
},
"volta": {
"node": "18.18.2",
"yarn": "1.22.0"
"yarn": "4.1.1"
}
}
Binary file removed website/.yarn/install-state.gz
Binary file not shown.
13 changes: 8 additions & 5 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"write-heading-ids": "ts-node ../scripts/write-heading-ids.ts"
},
"dependencies": {
"@loaders.gl/i3s": "^3.4.15",
"@loaders.gl/las": "^3.3.1",
"@loaders.gl/obj": "^3.3.1",
"@loaders.gl/ply": "^3.3.1",
"@loaders.gl/i3s": "^4.2.0",
"@loaders.gl/las": "^4.2.0",
"@loaders.gl/obj": "^4.2.0",
"@loaders.gl/ply": "^4.2.0",
"@material-ui/core": "^4.12.4",
"@material-ui/icons": "^4.11.3",
"@material-ui/lab": "^4.0.0-alpha.61",
Expand Down Expand Up @@ -55,5 +55,8 @@
"browserslist": [
">0.2% and supports async-functions",
"not dead"
]
],
"volta": {
"extends": "../package.json"
}
}
Loading
Loading