Merge pull request #57 from ls-yannick/fix-build

Revert "fix: vite root directory not taken into account when set"

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node_version: ['14', '16']
+        node_version: ['16']
         include:
           - os: macos-latest
             node_version: 16

demo/package.json

@@ -9,8 +9,8 @@
     "serve": "vite build && vite preview"
   },
   "devDependencies": {
-    "cesium": "^1.96.0",
+    "cesium": "1.96.0",
-    "vite": "^3.0.4",
+    "vite": "3.0.4",
     "vite-plugin-cesium": "link:.."
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-cesium",
-  "version": "1.2.22",
+  "version": "1.2.23",
   "description": "Cesium library plugin for Vite",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

src/index.ts

@@ -12,6 +12,7 @@ interface VitePluginCesiumOptions {
   devMinifyCesium?: boolean;
   cesiumBuildRootPath?: string;
   cesiumBuildPath?: string;
+  cesiumBaseUrl?: string;
 }
 
 export default function vitePluginCesium(options: VitePluginCesiumOptions = {}): Plugin {
@@ -19,10 +20,14 @@ export default function vitePluginCesium(options: VitePluginCesiumOptions = {}):
     rebuildCesium = false,
     devMinifyCesium = false,
     cesiumBuildRootPath = 'node_modules/cesium/Build',
-    cesiumBuildPath = 'node_modules/cesium/Build/Cesium/'
+    cesiumBuildPath = 'node_modules/cesium/Build/Cesium/',
+    cesiumBaseUrl = 'cesium/'
   } = options;
 
-  let CESIUM_BASE_URL = 'cesium/';
+  let CESIUM_BASE_URL = cesiumBaseUrl;
+  if (!CESIUM_BASE_URL.endsWith('/')) {
+    CESIUM_BASE_URL += '/';
+  }
   let outDir = 'dist';
   let base: string = '/';
   let isBuild: boolean = false;
@@ -37,11 +42,7 @@ export default function vitePluginCesium(options: VitePluginCesiumOptions = {}):
         if (base === '') base = './';
       }
       if (c.build?.outDir) {
-        if (c.root !== undefined) {
+        outDir = c.build.outDir;
-          outDir = path.join(c.root, c.build.outDir);
-        } else {
-          outDir = c.build.outDir;
-        }
       }
       CESIUM_BASE_URL = path.posix.join(base, CESIUM_BASE_URL);
       const userConfig: UserConfig = {};
@@ -59,7 +60,7 @@ export default function vitePluginCesium(options: VitePluginCesiumOptions = {}):
             chunkSizeWarningLimit: 5000,
             rollupOptions: {
               output: {
-                intro: `window.CESIUM_BASE_URL = "${CESIUM_BASE_URL}";`
+                intro: `window.CESIUM_BASE_URL = ${JSON.stringify(CESIUM_BASE_URL)};`
               }
             }
           };
@@ -88,12 +89,12 @@ export default function vitePluginCesium(options: VitePluginCesiumOptions = {}):
     async closeBundle() {
       if (isBuild) {
         try {
-          await fs.copy(path.join(cesiumBuildPath, 'Assets'), path.join(outDir, 'cesium/Assets'));
+          await fs.copy(path.join(cesiumBuildPath, 'Assets'), path.join(outDir, CESIUM_BASE_URL, 'Assets'));
-          await fs.copy(path.join(cesiumBuildPath, 'ThirdParty'), path.join(outDir, 'cesium/ThirdParty'));
+          await fs.copy(path.join(cesiumBuildPath, 'ThirdParty'), path.join(outDir, CESIUM_BASE_URL, 'ThirdParty'));
-          await fs.copy(path.join(cesiumBuildPath, 'Workers'), path.join(outDir, 'cesium/Workers'));
+          await fs.copy(path.join(cesiumBuildPath, 'Workers'), path.join(outDir, CESIUM_BASE_URL, 'Workers'));
-          await fs.copy(path.join(cesiumBuildPath, 'Widgets'), path.join(outDir, 'cesium/Widgets'));
+          await fs.copy(path.join(cesiumBuildPath, 'Widgets'), path.join(outDir, CESIUM_BASE_URL, 'Widgets'));
           if (!rebuildCesium) {
-            await fs.copy(path.join(cesiumBuildPath, 'Cesium.js'), path.join(outDir, 'cesium/Cesium.js'));
+            await fs.copy(path.join(cesiumBuildPath, 'Cesium.js'), path.join(outDir, CESIUM_BASE_URL, 'Cesium.js'));
           }
         } catch (err) {
           console.error('copy failed', err);