@vcmap/plugin-cli 2.0.8 → 2.0.9

package/assets/helloWorld/.gitlab-ci.yml

@@ -11,6 +11,7 @@ stages:
   - deploy
   - version
   - publish
+  - deployCluster
 
 .template: &job_definition
   only:
@@ -109,8 +110,10 @@ stopEnvironment:
     action: stop
 
 deployStagingCluster:
-  <<: *staging_build_template
   stage: deployCluster
+  except:
+    variables:
+      - $PUBLISH
   inherit:
     variables: false
   variables:

package/assets/helloWorld/src/helloWorld.vue

@@ -19,10 +19,10 @@
 </template>
 
 <script>
-  import { inject } from '@vue/composition-api';
+  import { inject } from 'vue';
   import { VcsButton } from '@vcmap/ui';
 
-  export const windowId = 'hello_world_window_id';
+  export const windowId = 'hello_world_window_id_plugin-cli';
 
   export default {
     name: 'HelloWorld',

package/assets/helloWorld/src/index.js

@@ -53,13 +53,13 @@ export default function(config) {
     i18n: {
       en: {
         helloWorld: {
-          helloWorld: 'Hello World',
+          helloWorld: '@vcmap/plugin-cli - Hello World',
           close: 'Close',
         },
       },
       de: {
         helloWorld: {
-          helloWorld: 'Hallo Welt',
+          helloWorld: '@vcmap/plugin-cli - Hallo Welt',
           close: 'Schließen',
         },
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/plugin-cli",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "description": "A CLI to help develop and build plugins for the VC Map",
   "main": "index.js",
   "type": "module",

package/src/buildStagingApp.js

@@ -1,11 +1,12 @@
-import fs from 'fs';
-import { cp, copyFile, writeFile } from 'fs/promises';
+import { cp, copyFile, writeFile, rm, mkdir } from 'fs/promises';
 import path from 'path';
-import { getContext } from './context.js';
+import fs from 'fs';
+import { getContext, resolveContext } from './context.js';
 import { getConfigJson } from './hostingHelpers.js';
 import { getPluginName } from './packageJsonHelpers.js';
 import buildModule, { getDefaultConfig } from './build.js';
 import setupMapUi from './setupMapUi.js';
+import { replaceAssets } from './pack.js';
 
 
 /**
@@ -16,14 +17,25 @@ export default async function buildStagingApp() {
   const pluginName = await getPluginName();
   const distPath = path.join(getContext(), 'dist');
   // Clear dist folder
-  await fs.rm(distPath, { recursive: true, force: true });
-  await fs.mkdir(distPath);
+  await rm(distPath, { recursive: true, force: true });
+  await mkdir(distPath);
   await setupMapUi();
   const { buildPluginsForPreview } = await import('@vcmap/ui/build/buildHelpers.js');
   await buildPluginsForPreview(getDefaultConfig(), true);
-  await fs.promises.mkdir(path.join(distPath, 'plugins', pluginName), { recursive: true });
+  await mkdir(path.join(distPath, 'plugins', pluginName), { recursive: true });
 
   await buildModule({ outputPath: `plugins/${pluginName}`, keepDistFolder: true });
+
+  // copy assets folder if exists
+  if (fs.existsSync(resolveContext('plugin-assets'))) {
+    await replaceAssets(path.join(distPath, 'plugins', pluginName, 'index.js'), pluginName);
+    await cp(
+      resolveContext('plugin-assets'),
+      path.join(distPath, 'plugins', pluginName, 'plugin-assets'),
+      { recursive: true },
+    );
+  }
+
   await copyFile(
     path.join(getContext(), 'node_modules', '@vcmap', 'ui', 'dist', 'index.html'),
     path.join(distPath, 'index.html'),

package/src/create.js

@@ -168,7 +168,7 @@ export default async function create() {
     { title: 'pack', value: { pack: 'vcmplugin pack' }, selected: true },
     { title: 'start', value: { start: 'vcmplugin serve' }, selected: true },
     { title: 'preview', value: { preview: 'vcmplugin preview' }, selected: true },
-    { title: 'buildStagingApp', value: { preview: 'vcmplugin buildStagingApp' }, selected: true },
+    { title: 'buildStagingApp', value: { buildStagingApp: 'vcmplugin buildStagingApp' }, selected: true },
     { title: 'lint', value: { lint: 'eslint "{src,tests}/**/*.{js,vue}"' }, selected: true },
   ];
 
@@ -176,7 +176,8 @@ export default async function create() {
     { title: '@vcmap/core', value: '@vcmap/core' },
     { title: '@vcmap/cesium', value: '@vcmap/cesium' },
     { title: 'ol', value: 'ol@~6.13.0' },
-    { title: '@vue/composition-api', value: '@vue/composition-api@~1.4.5' },
+    { title: 'vue', value: 'vue@~2.7.3' },
+    { title: 'vuetify', value: 'vue@~2.6.7' },
   ];
 
   const questions = [

package/src/pack.js

@@ -3,17 +3,18 @@ import { readFile, writeFile } from 'fs/promises';
 import archiver from 'archiver';
 import { logger } from '@vcsuite/cli-logger';
 import { getPluginName } from './packageJsonHelpers.js';
-import { resolveContext, getContext } from './context.js';
+import { resolveContext } from './context.js';
 import build from './build.js';
 
 /**
+ * @param {string} fileName
  * @param {string} name
  * @returns {Promise<void>}
  */
-async function replaceAssets(name) {
-  let indexJSContent = await readFile(getContext('dist', 'index.js'));
-  indexJSContent = indexJSContent.replace(/\.?\/?(plugin-assets)\//g, `plugins/${name}/$1/`);
-  await writeFile(getContext('dist', 'index.js'), indexJSContent);
+export async function replaceAssets(fileName, name) {
+  let fileContent = await readFile(fileName, { encoding: 'utf8' });
+  fileContent = fileContent.replace(/\.?\/?(plugin-assets)\//g, `plugins/${name}/$1/`);
+  await writeFile(fileName, fileContent);
 }
 
 /**
@@ -93,7 +94,7 @@ export default async function pack() {
   const pluginName = await getPluginName();
   logger.spin(`building plugin: ${pluginName}`);
   await build({});
-  await replaceAssets(pluginName);
+  await replaceAssets(resolveContext('dist', 'index.js'), pluginName);
   logger.debug('fixed asset paths');
   await ensureConfigJson();
   logger.debug('ensuring config.json');