From f5ebef1f755f16d2f40bc45dd305fe300a125bf9 Mon Sep 17 00:00:00 2001 From: LooSheng Date: Mon, 28 Mar 2022 11:18:43 +0800 Subject: [PATCH 1/2] fix: tags respect base path --- src/index.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/index.ts b/src/index.ts index 78794fd..2c7c843 100644 --- a/src/index.ts +++ b/src/index.ts @@ -121,16 +121,18 @@ function vitePluginCesium( tag: 'link', attrs: { rel: 'stylesheet', - href: normalizePath( - path.join(CESIUM_BASE_URL, 'Widgets/widgets.css') - ) + href: + base + + normalizePath(path.join(CESIUM_BASE_URL, 'Widgets/widgets.css')) } } ]; if (isBuild && !rebuildCesium) { tags.push({ tag: 'script', - attrs: { src: normalizePath(path.join(base, 'cesium/Cesium.js')) } + attrs: { + src: base + normalizePath(path.join(CESIUM_BASE_URL, 'Cesium.js')) + } }); } return tags; From 557fb83c0233c52c25cf9cc29a357922ba269c27 Mon Sep 17 00:00:00 2001 From: LooSheng Date: Mon, 28 Mar 2022 11:30:17 +0800 Subject: [PATCH 2/2] chore: update .prettierrc --- .prettierrc | 2 +- src/index.ts | 34 +++++++--------------------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/.prettierrc b/.prettierrc index b89bc72..e8809ee 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,5 @@ semi: true tabWidth: 2 singleQuote: true -printWidth: 80 +printWidth: 120 trailingComma: none \ No newline at end of file diff --git a/src/index.ts b/src/index.ts index 2c7c843..1607ff0 100644 --- a/src/index.ts +++ b/src/index.ts @@ -77,37 +77,19 @@ function vitePluginCesium( }, configureServer({ middlewares }) { - const cesiumPath = path.join( - cesiumBuildRootPath, - devMinifyCesium ? 'Cesium' : 'CesiumUnminified' - ); + const cesiumPath = path.join(cesiumBuildRootPath, devMinifyCesium ? 'Cesium' : 'CesiumUnminified'); middlewares.use(CESIUM_BASE_URL, serveStatic(cesiumPath)); }, async closeBundle() { if (isBuild) { try { - await fs.copy( - path.join(cesiumBuildPath, 'Assets'), - path.join(outDir, 'cesium/Assets') - ); - await fs.copy( - path.join(cesiumBuildPath, 'ThirdParty'), - path.join(outDir, 'cesium/ThirdParty') - ); - await fs.copy( - path.join(cesiumBuildPath, 'Workers'), - path.join(outDir, 'cesium/Workers') - ); - await fs.copy( - path.join(cesiumBuildPath, 'Widgets'), - path.join(outDir, 'cesium/Widgets') - ); + await fs.copy(path.join(cesiumBuildPath, 'Assets'), path.join(outDir, 'cesium/Assets')); + await fs.copy(path.join(cesiumBuildPath, 'ThirdParty'), path.join(outDir, 'cesium/ThirdParty')); + await fs.copy(path.join(cesiumBuildPath, 'Workers'), path.join(outDir, 'cesium/Workers')); + await fs.copy(path.join(cesiumBuildPath, 'Widgets'), path.join(outDir, 'cesium/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/Cesium.js')); } } catch (err) { console.error('copy failed', err); @@ -121,9 +103,7 @@ function vitePluginCesium( tag: 'link', attrs: { rel: 'stylesheet', - href: - base + - normalizePath(path.join(CESIUM_BASE_URL, 'Widgets/widgets.css')) + href: base + normalizePath(path.join(CESIUM_BASE_URL, 'Widgets/widgets.css')) } } ];