From 6bda27de377fb6852264802a52cfeabd886eba4c Mon Sep 17 00:00:00 2001 From: hu de yi Date: Thu, 10 Apr 2025 14:14:57 +0800 Subject: [PATCH] try typing layer-gltf module --- packages/layer-gltf/package.json | 17 ++++++++++------- packages/layer-gltf/rollup.config.js | 4 ++++ packages/layer-gltf/tsconfig.json | 17 +++++++++++++++++ 3 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 packages/layer-gltf/tsconfig.json diff --git a/packages/layer-gltf/package.json b/packages/layer-gltf/package.json index 3e7c6f4431..7c86fea825 100644 --- a/packages/layer-gltf/package.json +++ b/packages/layer-gltf/package.json @@ -9,18 +9,17 @@ }, "main": "dist/maptalks.gltf.js", "module": "dist/maptalks.gltf.es.js", + "types": "dist/index.d.ts", "unpkg": "dist/maptalks.gltf.js", "jsdelivr": "dist/maptalks.gltf.js", "files": [ - "dist/maptalks.gltf.js", - "dist/maptalks.gltf.js.map", - "dist/maptalks.gltf.es.js", - "dist/maptalks.gltf.es.js.map" + "dist" ], "scripts": { + "tsc": "tsc", "clean": "rimraf dist", "dev": "rollup -w -c rollup.config.js", - "build": "npm run clean && npm run lint && rollup --environment BUILD:production -c rollup.config.js", + "build": "npm run clean && npm run lint && npm run tsc && rollup --environment BUILD:production -c rollup.config.js", "build-dev": "rollup -c rollup.config.js", "pretest": "cd ../gltf-loader && npm run build && cd ../gl && npm run build && cd ../analysis && npm run build && cd ../layer-gltf && npm run build", "test": "karma start --single-run", @@ -37,6 +36,7 @@ "@rollup/plugin-node-resolve": "^15.2.3", "@rollup/plugin-replace": "^5.0.5", "@rollup/plugin-terser": "0.4.4", + "@rollup/plugin-typescript": "^11.1.6", "eslint": "^8.57.0", "eslint-plugin-mocha": "^10.5.0", "expect.js": "^0.3.1", @@ -49,7 +49,10 @@ "karma-mocha-reporter": "^2.2.5", "maptalks": "workspace:*", "mocha": "^10.3.0", - "rollup": "^4.17.2" + "rollup": "^4.17.2", + "tslib": "^2.6.2", + "typescript": "^5.4.2", + "typescript-eslint": "^7.18.0" }, "dependencies": { "@maptalks/feature-filter": "^1.3.0", @@ -57,4 +60,4 @@ "frustum-intersects": "^0.2.4" }, "gitHead": "9eeea4807723d460fa7e09969c6556d53f6bed84" -} +} \ No newline at end of file diff --git a/packages/layer-gltf/rollup.config.js b/packages/layer-gltf/rollup.config.js index a97cdb1890..ff84860528 100644 --- a/packages/layer-gltf/rollup.config.js +++ b/packages/layer-gltf/rollup.config.js @@ -1,6 +1,7 @@ const { nodeResolve: resolve } = require('@rollup/plugin-node-resolve'); const commonjs = require('@rollup/plugin-commonjs'); const terser = require('@rollup/plugin-terser'); +const typescript = require("@rollup/plugin-typescript"); const replace = require('@rollup/plugin-replace'); const pkg = require('./package.json'); @@ -114,6 +115,7 @@ module.exports = [ plugins: [ resolve({}), commonjs(), + typescript(), replace({ // 'this.exports = this.exports || {}': '', '(function (exports) {': 'function (exports) {', @@ -149,6 +151,7 @@ module.exports = [ // https://github.com/mapbox/mapbox-gl-js/pull/6956 ignoreGlobal: true }), + typescript(), glsl() ].concat(plugins), external: ['maptalks', '@maptalks/gl'], @@ -193,6 +196,7 @@ if (production) { // https://github.com/mapbox/mapbox-gl-js/pull/6956 ignoreGlobal: true }), + typescript(), glsl() ].concat(plugins), output: { diff --git a/packages/layer-gltf/tsconfig.json b/packages/layer-gltf/tsconfig.json new file mode 100644 index 0000000000..a805ef7811 --- /dev/null +++ b/packages/layer-gltf/tsconfig.json @@ -0,0 +1,17 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "skipLibCheck": true, + "importHelpers": true, + "lib": ["esnext", "dom"], + "outDir": "./dist/", + "rootDir": "./src", + "baseUrl": "./" + }, + "include": ["src/**/*"], + "exclude": [ + "node_modules", + "dist", + "rollup.config.js" + ] +}