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.

Sign up for GitHub

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

Upgrade dev tools #26

Merged
merged 3 commits into from
Aug 27, 2024
Merged

Upgrade dev tools #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b35cce
Upgrade dev tools
Pessimistress Aug 26, 2024
87a94e8
alpha.7
Pessimistress Aug 27, 2024
2f85f9b
alpha.9
Pessimistress Aug 27, 2024
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
1 change: 1 addition & 0 deletions .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ dist/
coverage/
test/
*.md
**/wip/
10 changes: 2 additions & 8 deletions .eslintrc.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
const {getESLintConfig} = require('ocular-dev-tools/configuration');
const {getESLintConfig} = require('@vis.gl/dev-tools/configuration');

module.exports = getESLintConfig({
overrides: {parser: '',
parserOptions: {
project: ['./tsconfig.json'],
ecmaVersion: 2020
},
overrides: {
env: {
browser: true,
es2020: true,
node: true
},

overrides: [
{
// scripts use devDependencies
Expand All @@ -26,7 +21,6 @@ module.exports = getESLintConfig({
files: ['modules/**/*.ts', 'modules/**/*.js'],
rules: {
'no-use-before-define': 0,
'import/no-unresolved': 0,
'import/named': 0,
'@typescript-eslint/ban-ts-comment': 0 // We do need our ts-ignores
}
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,11 @@ on:
jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [20]

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: volta-cli/action@2d68418f32546fd191eb666e232b321d5726484d # v4.1.1
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'

- name: Install dependencies
Expand All @@ -34,6 +30,7 @@ jobs:
- name: Run tests
run: |
yarn test ci
yarn lint

- name: Coveralls
uses: coverallsapp/github-action@09b709cf6a16e30b0808ba050c7a6e8a5ef13f8d # v1.2.5
Expand Down
10 changes: 2 additions & 8 deletions .ocularrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,8 @@ import {resolve} from 'path';

export default {
lint: {
paths: ['dev-docs', 'docs', 'modules', 'examples', 'test'] // 'website'
// extensions: ['js', 'md']
},

babel: false,

typescript: {
project: 'tsconfig.build.json'
paths: ['dev-docs', 'docs', 'modules', 'examples', 'test'], // 'website'
extensions: ['js', 'mjs', 'jsx', 'ts', 'tsx', 'd.ts', 'md']
},

aliases: {
Expand Down
3 changes: 0 additions & 3 deletions .prettierrc.cjs
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions Dockerfile
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions docker-compose.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion modules/core/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.module.json",
"extends": "../../tsconfig.json",
"include": ["src/**/*"],
"exclude": ["node_modules"],
"compilerOptions": {
Expand Down
2 changes: 1 addition & 1 deletion modules/culling/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.module.json",
"extends": "../../tsconfig.json",
"include": ["src/**/*"],
"exclude": ["node_modules"],
"compilerOptions": {
Expand Down
2 changes: 1 addition & 1 deletion modules/dggs-geohash/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.module.json",
"extends": "../../tsconfig.json",
"include": ["src/**/*"],
"exclude": ["node_modules"],
"compilerOptions": {
Expand Down
2 changes: 1 addition & 1 deletion modules/dggs-quadkey/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.module.json",
"extends": "../../tsconfig.json",
"include": ["src/**/*"],
"exclude": ["node_modules"],
"compilerOptions": {
Expand Down
2 changes: 1 addition & 1 deletion modules/dggs-s2/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.module.json",
"extends": "../../tsconfig.json",
"include": ["src/**/*"],
"exclude": ["node_modules"],
"compilerOptions": {
Expand Down
2 changes: 1 addition & 1 deletion modules/geoid/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.module.json",
"extends": "../../tsconfig.json",
"include": ["src/**/*"],
"exclude": ["node_modules"],
"compilerOptions": {
Expand Down
2 changes: 1 addition & 1 deletion modules/geospatial/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.module.json",
"extends": "../../tsconfig.json",
"include": ["src/**/*"],
"exclude": ["node_modules"],
"compilerOptions": {
Expand Down
2 changes: 1 addition & 1 deletion modules/main/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.module.json",
"extends": "../../tsconfig.json",
"include": ["src/**/*"],
"exclude": ["node_modules"],
"compilerOptions": {
Expand Down
2 changes: 1 addition & 1 deletion modules/polygon/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.module.json",
"extends": "../../tsconfig.json",
"include": ["src/**/*"],
"exclude": ["node_modules"],
"compilerOptions": {
Expand Down
2 changes: 1 addition & 1 deletion modules/proj4/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.module.json",
"extends": "../../tsconfig.json",
"include": ["src/**/*"],
"exclude": ["node_modules"],
"compilerOptions": {
Expand Down
2 changes: 1 addition & 1 deletion modules/sun/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.module.json",
"extends": "../../tsconfig.json",
"include": ["src/**/*"],
"exclude": ["node_modules"],
"compilerOptions": {
Expand Down
2 changes: 1 addition & 1 deletion modules/types/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.module.json",
"extends": "../../tsconfig.json",
"include": ["src/**/*"],
"exclude": ["node_modules"],
"compilerOptions": {
Expand Down
4 changes: 2 additions & 2 deletions modules/web-mercator/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"extends": "../../tsconfig.module.json",
"extends": "../../tsconfig.json",
"include": ["src/**/*"],
"exclude": ["node_modules"],
"compilerOptions": {
"noImplicitAny": false, // gl-matrix is a mess...
"noImplicitAny": false,
"composite": true,
"rootDir": "src",
"outDir": "dist"
Expand Down
20 changes: 12 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,22 @@
"examples/*"
],
"scripts": {
"bootstrap": "ocular-bootstrap",
"clean": "ocular-clean",
"build": "npm run clean && time ocular-build",
"bootstrap": "yarn && ocular-bootstrap && npm run build",
"build": "ocular-clean && time ocular-build",
"cover": "ocular-test cover",
"lint": "ocular-lint",
"metrics": "ocular-metrics",
"publish-beta": "ocular-publish beta",
"publish-prod": "ocular-publish prod",
"test": "ocular-test"
"publish-beta": "ocular-publish version-only-beta",
"publish-prod": "ocular-publish version-only-prod",
"test": "ocular-test",
"test-pre-commit": "ocular-lint pre-commit && ocular-test node"
},
"devDependencies": {
"@probe.gl/bench": "^4.0.0",
"@turf/destination": "^6.0.1",
"@types/tape-promise": "^4.0.1",
"ocular-dev-tools": "2.0.0-alpha.34",
"@vis.gl/dev-tools": "1.0.0-alpha.9",
"@vis.gl/ts-plugins": "1.0.0-alpha.9",
"pre-commit": "^1.2.2",
"puppeteer": "^22.0.0",
"tap-spec": "^5.0.0"
Expand All @@ -38,5 +39,8 @@
"volta": {
"node": "20.15.1",
"yarn": "4.3.1"
}
},
"pre-commit": [
"test-pre-commit"
]
}
5 changes: 0 additions & 5 deletions scripts/add-js-to-imports.sh
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions tsconfig.build.json
View file
Open in desktop

This file was deleted.

16 changes: 14 additions & 2 deletions tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"moduleResolution": "node",
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"noEmit": true,
"baseUrl": ".",
"useDefineForClassFields": false,

// BEGIN TYPE CHECK SETTINGS
"skipLibCheck": true,
Expand Down Expand Up @@ -64,7 +64,19 @@
"@math.gl/web-mercator/*": ["modules/web-mercator/src/*"],
"@math.gl/web-mercator/test/*": ["modules/web-mercator/test/*"],
"test/*": ["test/*"]
}
},
"plugins": [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this be managed with some "extend": "..." syntax so that we don't need to duplicate this everywhere?

{
"transform": "@vis.gl/ts-plugins/ts-transform-append-extension",
"extensions": [".js"],
"after": true
},
{
"transform": "@vis.gl/ts-plugins/ts-transform-append-extension",
"extensions": [".js"],
"afterDeclarations": true
}
]
},
"include":[
"modules/*/src",
Expand Down
26 changes: 0 additions & 26 deletions tsconfig.module.json
View file
Open in desktop

This file was deleted.

Loading
Loading