Merge pull request #33 from amitgk1/bugfix/package-type-module

Bugfix - cesium is not a function
2022-08-06 18:08:18 +08:00
parent 14fb272710 c8b46297eb
commit 213610a17f
9 changed files with 48 additions and 21 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
    strategy:
      matrix:
        os: [ubuntu-latest]
-        node_version: ['12', '14', '16']
+        node_version: ['14', '16']
        include:
          - os: macos-latest
            node_version: 16
--- a/demo/index.html
+++ b/demo/index.html
@@ -5,7 +5,7 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>cesium-vite</title>
-    <script type="module" src="/src/index.js"></script>
+    <script type="module" src="/src/index.ts"></script>
  </head>

  <body>
--- a/demo/package.json
+++ b/demo/package.json
@@ -2,14 +2,15 @@
  "name": "cesium-demo",
  "version": "1.0.0",
  "license": "MIT",
+  "type": "module",
  "scripts": {
    "dev": "vite",
    "build": "vite build",
    "serve": "vite build && vite preview"
  },
  "devDependencies": {
-    "cesium": "^1.91.0",
-    "vite": "^2.9.1",
+    "cesium": "1.95.0",
+    "vite": "^3.0.4",
    "vite-plugin-cesium": "link:.."
  }
 }
--- a/demo/src/index.ts
+++ b/demo/src/index.ts
--- a/demo/vite.config.ts
+++ b/demo/vite.config.ts
@@ -1,5 +1,6 @@
 import { defineConfig } from 'vite';
 import cesium from 'vite-plugin-cesium';
+
 export default defineConfig({
  plugins: [cesium()]
 });
--- a/package.json
+++ b/package.json
@@ -2,14 +2,23 @@
  "name": "vite-plugin-cesium",
  "version": "1.2.19",
  "description": "Cesium library plugin for Vite",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
  "files": [
    "dist"
  ],
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.js"
+    }
+  },
  "scripts": {
-    "build": "tsc",
-    "dev": "tsc -w"
+    "dev": "tsup --watch",
+    "build": "tsup",
+    "prepare": "npm run build"
  },
  "keywords": [
    "vite",
@@ -36,10 +45,12 @@
    "@types/node": "^14.14.31",
    "@types/serve-static": "^1.13.9",
    "prettier": "^2.2.1",
+    "tsup": "^6.2.1",
    "typescript": "^4.2.2",
-    "vite": "^2.7.1"
+    "vite": "^3.0.4"
  },
  "peerDependencies": {
-    "cesium": "^1.88.0"
+    "cesium": "^1.88.0",
+    "vite": ">=2.7.1"
  }
 }
--- a/src/index.ts
+++ b/src/index.ts
@@ -11,10 +11,10 @@ interface VitePluginCesiumOptions {
  rebuildCesium?: boolean;
  devMinifyCesium?: boolean;
  cesiumBuildRootPath?: string;
-  cesiumBuildPath?: string
+  cesiumBuildPath?: string;
 }

-function vitePluginCesium(options: VitePluginCesiumOptions = {}): Plugin {
+export default function vitePluginCesium(options: VitePluginCesiumOptions = {}): Plugin {
  const {
    rebuildCesium = false,
    devMinifyCesium = false,
@@ -118,5 +118,3 @@ function vitePluginCesium(options: VitePluginCesiumOptions = {}): Plugin {
    }
  };
 }
-
-export default vitePluginCesium;
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,11 +1,17 @@
 {
-    "extends": "@tsconfig/node12/tsconfig.json",
    "include": [
        "src"
    ],
    "compilerOptions": {
        "outDir": "dist",
        "declaration": true,
+        "target": "ES2017",
+        "module": "commonjs",
        "removeComments": false,
-    },
+        "strict": true,
+        "moduleResolution": "node",
+        "esModuleInterop": true,
+        "skipLibCheck": true,
+        "forceConsistentCasingInFileNames": true
+    }
 }
--- a/tsup.config.ts
+++ b/tsup.config.ts
@@ -0,0 +1,10 @@
+import { defineConfig } from 'tsup';
+
+export default defineConfig({
+  entry: ['src/index.ts'],
+  format: ['esm', 'cjs'],
+  splitting: false,
+  clean: true,
+  dts: true,
+  minify: false
+});