diff --git a/.ocularrc.js b/.ocularrc.js index 62fd966..5c141c2 100644 --- a/.ocularrc.js +++ b/.ocularrc.js @@ -6,10 +6,6 @@ export default { extensions: ['js', 'mjs', 'jsx', 'ts', 'tsx', 'd.ts', 'md'] }, - typescript: { - project: 'tsconfig.build.json' - }, - aliases: { test: resolve('./test') }, diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 76d131e..0000000 --- a/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM node:8.9.0 - -WORKDIR /math-gl - -COPY package.json yarn.lock /math-gl/ - -RUN yarn diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index a1684e0..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,7 +0,0 @@ -version: '2' -services: - math-gl: - build: . - volumes: - - .:/math-gl - - /math-gl/node_modules/ diff --git a/modules/core/tsconfig.json b/modules/core/tsconfig.json index 628e2e0..3673838 100644 --- a/modules/core/tsconfig.json +++ b/modules/core/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.module.json", + "extends": "../../tsconfig.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/modules/culling/tsconfig.json b/modules/culling/tsconfig.json index bc680c1..b6d0010 100644 --- a/modules/culling/tsconfig.json +++ b/modules/culling/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.module.json", + "extends": "../../tsconfig.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/modules/dggs-geohash/tsconfig.json b/modules/dggs-geohash/tsconfig.json index 3f597bf..9c69bf1 100644 --- a/modules/dggs-geohash/tsconfig.json +++ b/modules/dggs-geohash/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.module.json", + "extends": "../../tsconfig.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/modules/dggs-quadkey/tsconfig.json b/modules/dggs-quadkey/tsconfig.json index 628e2e0..3673838 100644 --- a/modules/dggs-quadkey/tsconfig.json +++ b/modules/dggs-quadkey/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.module.json", + "extends": "../../tsconfig.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/modules/dggs-s2/tsconfig.json b/modules/dggs-s2/tsconfig.json index 628e2e0..3673838 100644 --- a/modules/dggs-s2/tsconfig.json +++ b/modules/dggs-s2/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.module.json", + "extends": "../../tsconfig.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/modules/geoid/tsconfig.json b/modules/geoid/tsconfig.json index bc680c1..b6d0010 100644 --- a/modules/geoid/tsconfig.json +++ b/modules/geoid/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.module.json", + "extends": "../../tsconfig.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/modules/geospatial/tsconfig.json b/modules/geospatial/tsconfig.json index bc680c1..b6d0010 100644 --- a/modules/geospatial/tsconfig.json +++ b/modules/geospatial/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.module.json", + "extends": "../../tsconfig.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/modules/main/tsconfig.json b/modules/main/tsconfig.json index bc680c1..b6d0010 100644 --- a/modules/main/tsconfig.json +++ b/modules/main/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.module.json", + "extends": "../../tsconfig.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/modules/polygon/tsconfig.json b/modules/polygon/tsconfig.json index 7189867..c2211b8 100644 --- a/modules/polygon/tsconfig.json +++ b/modules/polygon/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.module.json", + "extends": "../../tsconfig.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/modules/proj4/tsconfig.json b/modules/proj4/tsconfig.json index bc680c1..b6d0010 100644 --- a/modules/proj4/tsconfig.json +++ b/modules/proj4/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.module.json", + "extends": "../../tsconfig.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/modules/sun/tsconfig.json b/modules/sun/tsconfig.json index 628e2e0..3673838 100644 --- a/modules/sun/tsconfig.json +++ b/modules/sun/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.module.json", + "extends": "../../tsconfig.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/modules/types/tsconfig.json b/modules/types/tsconfig.json index 624e089..c27bee2 100644 --- a/modules/types/tsconfig.json +++ b/modules/types/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.module.json", + "extends": "../../tsconfig.json", "include": ["src/**/*"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/modules/web-mercator/tsconfig.json b/modules/web-mercator/tsconfig.json index 9bf85fd..b231fe1 100644 --- a/modules/web-mercator/tsconfig.json +++ b/modules/web-mercator/tsconfig.json @@ -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" diff --git a/package.json b/package.json index 97c64fc..16b9797 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,8 @@ "@probe.gl/bench": "^4.0.0", "@turf/destination": "^6.0.1", "@types/tape-promise": "^4.0.1", - "@vis.gl/dev-tools": "1.0.0-alpha.3", - "@vis.gl/ts-plugins": "1.0.0-alpha.3", + "@vis.gl/dev-tools": "1.0.0-alpha.7", + "@vis.gl/ts-plugins": "1.0.0-alpha.7", "pre-commit": "^1.2.2", "puppeteer": "^22.0.0", "tap-spec": "^5.0.0" diff --git a/tsconfig.build.json b/tsconfig.build.json deleted file mode 100644 index 86f59aa..0000000 --- a/tsconfig.build.json +++ /dev/null @@ -1,27 +0,0 @@ -// This is a base TS config for the individual packages, mainly for building .d.ts files -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "build": true - // Uncomment to debug - // "listEmittedFiles": true - }, - // Monorepo setup. All modules need to be listed here - "references": [ - {"path": "modules/core"}, - {"path": "modules/culling"}, - {"path": "modules/dggs-geohash"}, - {"path": "modules/dggs-s2"}, - {"path": "modules/dggs-quadkey"}, - {"path": "modules/geoid"}, - {"path": "modules/geospatial"}, - {"path": "modules/main"}, - {"path": "modules/polygon"}, - {"path": "modules/proj4"}, - {"path": "modules/sun"}, - {"path": "modules/web-mercator"} - ], - "include": [ - "modules/*/src" - ] -} diff --git a/tsconfig.json b/tsconfig.json index ad75c16..1c3268b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,8 +12,8 @@ "moduleResolution": "node", "esModuleInterop": true, "allowSyntheticDefaultImports": true, - "noEmit": true, "baseUrl": ".", + "useDefineForClassFields": false, // BEGIN TYPE CHECK SETTINGS "skipLibCheck": true, @@ -64,7 +64,19 @@ "@math.gl/web-mercator/*": ["modules/web-mercator/src/*"], "@math.gl/web-mercator/test/*": ["modules/web-mercator/test/*"], "test/*": ["test/*"] - } + }, + "plugins": [ + { + "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", diff --git a/tsconfig.module.json b/tsconfig.module.json deleted file mode 100644 index e6c7153..0000000 --- a/tsconfig.module.json +++ /dev/null @@ -1,26 +0,0 @@ -// This is the monorepo build config -// needs to be a separate file to avoid importing references into packages -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "build": true, - "esModuleInterop": true, - "declaration": true, - "noEmit": false, - "useDefineForClassFields": false, - // Uncomment to debug - // "listEmittedFiles": true, - "plugins": [ - { - "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 - } - ] - } -} diff --git a/yarn.lock b/yarn.lock index 78ac3b2..d29c4e6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2142,9 +2142,9 @@ __metadata: languageName: node linkType: hard -"@vis.gl/dev-tools@npm:1.0.0-alpha.3": - version: 1.0.0-alpha.3 - resolution: "@vis.gl/dev-tools@npm:1.0.0-alpha.3" +"@vis.gl/dev-tools@npm:1.0.0-alpha.7": + version: 1.0.0-alpha.7 + resolution: "@vis.gl/dev-tools@npm:1.0.0-alpha.7" dependencies: "@esbuild-plugins/node-globals-polyfill": "npm:^0.2.0" "@esbuild-plugins/node-modules-polyfill": "npm:^0.2.0" @@ -2184,19 +2184,19 @@ __metadata: ocular-metrics: scripts/metrics.js ocular-publish: scripts/publish.js ocular-test: scripts/test.js - checksum: 10c0/849a66cca1f7660df0f81b10dd7f2810fe3e77f4d477bb95fa7da3d55eb90066fdb72d06d73caaea939ade0757d9c9b067250a46d9619c1fa320a47c79360573 + checksum: 10c0/9c3289df9550586ac086d3f8ea070ccf8380121562af1f3b88e030ebeb47c218d41b85da685107d5c59a2963fed71d0a40675b2cb0f1aaceddd0374575926866 languageName: node linkType: hard -"@vis.gl/ts-plugins@npm:1.0.0-alpha.3": - version: 1.0.0-alpha.3 - resolution: "@vis.gl/ts-plugins@npm:1.0.0-alpha.3" +"@vis.gl/ts-plugins@npm:1.0.0-alpha.7": + version: 1.0.0-alpha.7 + resolution: "@vis.gl/ts-plugins@npm:1.0.0-alpha.7" dependencies: "@luma.gl/constants": "npm:^9.0.0" minimatch: "npm:^3.0.0" ts-patch: "npm:^3.1.2" typescript: "npm:^5.2.2" - checksum: 10c0/199fc8fe9d0a7b0fb1223996c8815ac8807a0d466af281b1c54a68ce65d07ae8992712ec1d2231e7c79d3c0fcb87156baece483a71c30cbf527c7ef4627998b3 + checksum: 10c0/20fad75ecd7ea544f8262469d2cd102ce8986bc92e457cb94c122aaad9c583ed2097062b3022809eb67cbb951c50c07d339ad7734d4e56b5483a0cf519737f0b languageName: node linkType: hard @@ -9372,8 +9372,8 @@ __metadata: "@probe.gl/bench": "npm:^4.0.0" "@turf/destination": "npm:^6.0.1" "@types/tape-promise": "npm:^4.0.1" - "@vis.gl/dev-tools": "npm:1.0.0-alpha.3" - "@vis.gl/ts-plugins": "npm:1.0.0-alpha.3" + "@vis.gl/dev-tools": "npm:1.0.0-alpha.7" + "@vis.gl/ts-plugins": "npm:1.0.0-alpha.7" pre-commit: "npm:^1.2.2" puppeteer: "npm:^22.0.0" tap-spec: "npm:^5.0.0"