@vcmap/plugin-cli 2.1.2 → 2.1.4

package/README.md

@@ -177,7 +177,7 @@ caching more readily.
 The following libraries are provided by the @vcmap/ui in a deployed application. You should define these
 as peer dependencies if you use them in your plugin:
 - @vcmap/core
-- @vcmap/cesium
+- @vcmap-cesium/engine
 - ol
 - vue
 - vuetify
@@ -197,12 +197,12 @@ a plugin and _that the provided index files_ are used (over directly importing f
 
 For instance: 
 ```js
-import Cartesian3 from '@vcmap/cesium/Source/Core/Cartesian3.js';
+import Cartesian3 from '@vcmap-cesium/engine/Source/Core/Cartesian3.js';
 ```
 
 should be rewritten to:
 ```js
-import { Cartesian3 } from '@vcmap/cesium';
+import { Cartesian3 } from '@vcmap-cesium/engine';
 ```
 
 ### What about openlayers?

package/assets/.gitlab-ci.yml

@@ -147,8 +147,8 @@ version:
     - npm version patch -m "%s [skip-ci]"
     - TAG=`git describe --abbrev=0`
     - echo git push git@gitlab:vcsuite/"$CI_PROJECT_PATH".git
-    - git push git@gitlab:vcsuite/"$CI_PROJECT_PATH".git $TAG
-    - git push git@gitlab:vcsuite/"$CI_PROJECT_PATH".git HEAD:$CI_COMMIT_REF_NAME
+    - git push git@gitlab:"$CI_PROJECT_PATH".git $TAG
+    - git push git@gitlab:"$CI_PROJECT_PATH".git HEAD:$CI_COMMIT_REF_NAME
   before_script:
     - mkdir -p ~/.ssh
     - chmod 700 ~/.ssh

package/assets/build/staging/Dockerfile

@@ -0,0 +1,2 @@
+FROM httpd:2-buster
+COPY * /usr/local/apache2/htdocs/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/plugin-cli",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "description": "A CLI to help develop and build plugins for the VC Map",
   "main": "index.js",
   "type": "module",
@@ -40,7 +40,7 @@
     "vue-template-compiler": "~2.7.14"
   },
   "peerDependencies": {
-    "@vcmap/ui": "^5.0.0-rc.17",
+    "@vcmap/ui": "^5.0.0-rc.22",
     "vue": "~2.7.14"
   },
   "peerDependenciesMeta": {

package/src/build.js

@@ -32,12 +32,12 @@ export function getDefaultConfig() {
  */
 export async function getLibraryPaths(pluginName) {
   const { libraries } = await import('@vcmap/ui/build/buildHelpers.js');
-  const pluginPath = path.join('plugins', ...pluginName.split('/'));
+  const pluginPath = path.posix.join('plugins', ...pluginName.split('/'));
   const libraryPaths = {};
   Object.entries(libraries).forEach(([library, assetName]) => {
-    const assetPath = path.join('assets', `${assetName}.js`);
+    const assetPath = path.posix.join('assets', `${assetName}.js`);
 
-    libraryPaths[library] = path.relative(pluginPath, assetPath);
+    libraryPaths[library] = path.posix.relative(pluginPath, assetPath);
   });
   return libraryPaths;
 }

package/src/create.js

@@ -211,7 +211,7 @@ async function createPluginTemplate(options, pluginPath) {
       devDeps.push('@vcsuite/eslint-config');
     }
     if (installVitest) {
-      devDeps.push('vite', 'vitest', '@vitest/coverage-c8', 'jest-canvas-mock', 'jsdom');
+      devDeps.push('vitest', '@vitest/coverage-c8', 'jest-canvas-mock', 'jsdom');
     }
     await installDeps(devDeps, DepType.DEV, pluginPath);
     logger.success('Installed dependencies');
@@ -279,6 +279,11 @@ async function createPlugin(options) {
       path.join(getDirname(), '..', 'assets', '.gitlab-ci.yml'),
       path.join(pluginPath, '.gitlab-ci.yml'),
     );
+    await fs.promises.cp(
+      path.join(getDirname(), '..', 'assets', 'build'),
+      path.join(pluginPath, 'build'),
+      { recursive: true },
+    );
   }
 
   if (options.template) {
@@ -311,7 +316,7 @@ export default async function create() {
 
   const peerDependencyChoices = [
     { title: '@vcmap/core', value: '@vcmap/core' },
-    { title: '@vcmap/cesium', value: '@vcmap/cesium' },
+    { title: '@vcmap-cesium/engine', value: '@vcmap-cesium/engine' },
     { title: 'ol', value: 'ol' },
     { title: 'vue', value: 'vue' },
     { title: 'vuetify', value: 'vuetify' },

package/src/preview.js

@@ -42,7 +42,9 @@ async function getServerOptions(hostedVcm, https) {
   let proxy;
   const normalLibraries = await getLibraryPaths('normal');
   const scopedLibraries = await getLibraryPaths('@scoped/plugin');
-  const alias = {};
+  const alias = {
+    '@cesium/engine': '@vcmap-cesium/engine',
+  };
   setAliases(alias, normalLibraries);
   setAliases(alias, scopedLibraries);
 

package/src/serve.js

@@ -57,6 +57,11 @@ async function getProxy(protocol, port) {
     changeOrigin: true,
     secure: false,
   };
+  // Cesium engine assets are not part of Build
+  proxy['/node_modules/@vcmap-cesium/engine/Build/Assets'] = {
+    target,
+    rewrite: p => p.replace(/Build/, 'Source'),
+  };
   return proxy;
 }
 
@@ -86,6 +91,11 @@ export default async function serve(options) {
   const server = await createServer({
     root: getContext(),
     publicDir: false,
+    resolve: {
+      alias: {
+        '@cesium/engine': '@vcmap-cesium/engine',
+      },
+    },
     optimizeDeps: {
       exclude: [
         '@vcmap/ui',
@@ -97,7 +107,7 @@ export default async function serve(options) {
         'fast-deep-equal',
         'rbush-knn',
         'pbf',
-        '@vcmap/cesium',
+        '@vcmap-cesium/engine',
       ],
     },
     plugins: [