@soleil-se/build-app 1.3.0 → 1.4.0

package/api/isObject.js

@@ -0,0 +1,3 @@
+export default function isObject(obj) {
+  return typeof obj === 'object' && obj !== null;
+}

package/config.js

@@ -1,14 +1,19 @@
 import config from '@soleil-se/build-config';
-
 import fse from 'fs-extra';
 import { dirname } from 'path';
 
+import isObject from './api/isObject.js';
+
 function readManifestFile() {
   if (fse.existsSync('./manifest.json')) return fse.readJsonSync('./manifest.json');
   if (fse.existsSync('./src/manifest.json')) return fse.readJsonSync('./src/manifest.json');
   return {};
 }
 
+function getAddonName(manifest, addonNameLang = 'sv') {
+  return isObject(manifest.name) ? manifest.name[addonNameLang] : manifest.name;
+}
+
 function getClientInput() {
   if (fse.existsSync('./src/main.js')) return './src/main.js';
   if (fse.existsSync('./app_src/main.js')) return './app_src/main.js';
@@ -39,8 +44,9 @@ function getGlobalConfigInput() {
   return false;
 }
 
-export const { env, projectRoot, rollup } = config;
+export const { env, projectRoot, rollup, addonNameLang } = config;
 export const manifest = readManifestFile();
+export const addonName = getAddonName(manifest, addonNameLang);
 export const type = manifest.type.toLowerCase();
 export const input = {
   client: getClientInput(),

package/index.js

@@ -6,7 +6,7 @@ import { getTimestamp, logError, logInfo, logStartup } from '@soleil-se/build-ut
 import chalk from 'chalk';
 
 import {
-  input, type, manifest, env, projectRoot, rollup, watchPaths, eslintPaths,
+  input, type, manifest, addonName, env, projectRoot, rollup, watchPaths, eslintPaths,
 } from './config.js';
 
 import { clean, copy, files, zip, eslint } from './utils/index.js';
@@ -18,7 +18,7 @@ const cssOutput = type === 'webapp' ? './dist/src/css/app.css' : './dist/src/res
 const zipPath = `./dist/${manifest.id}-${manifest.version}.zip`;
 
 async function main() {
-  console.log(getTimestamp(), `${manifest.name} (${manifest.id})`);
+  console.log(getTimestamp(), `${addonName} (${manifest.id})`);
   logStartup(import.meta.url);
   logInfo(`Using ${chalk.white('project_config.json')} in ${chalk.white(projectRoot)}`);
   const tasks = [
@@ -62,18 +62,19 @@ async function main() {
   ];
 
   if (args.sign ?? env.sign ?? env.production) {
-    tasks.push(task('sign', sign({ src: zipPath, manifest })));
+    tasks.push(task('sign', sign({ src: zipPath, addonName, manifest })));
   }
 
   if (args.sync) {
     tasks.push(task('upload', upload({
       src: zipPath,
+      addonName,
       manifest,
       force: args.force || !env.production,
     })));
 
     if (args.activate) {
-      tasks.push(task('activate', activate()));
+      tasks.push(task('activate', activate(addonName)));
     }
   }
 
@@ -82,7 +83,7 @@ async function main() {
   } else {
     await runTasks(tasks);
   }
-  if (args.run) await runTasks(tasks);
+  if (args.build || args.run) await runTasks(tasks);
 }
 
 main().catch((e) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soleil-se/build-app",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "bin": {
     "build-app": "./bin/index.js",
     "sv-app-build": "./bin/index.js"
@@ -14,32 +14,32 @@
   },
   "homepage": "https://docs.soleil.se/build/app",
   "dependencies": {
-    "@babel/core": "7.17.5",
+    "@babel/core": "7.17.8",
     "@babel/preset-env": "7.16.11",
     "@rollup/plugin-alias": "3.1.9",
     "@rollup/plugin-babel": "5.3.1",
-    "@rollup/plugin-commonjs": "21.0.2",
+    "@rollup/plugin-commonjs": "21.0.3",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "13.1.3",
     "@rollup/plugin-replace": "4.0.0",
     "@soleil-se/build-config": "1.1.1",
     "@soleil-se/build-utils": "1.4.0",
     "archiver": "5.3.0",
-    "autoprefixer": "10.4.2",
+    "autoprefixer": "10.4.4",
     "babel-plugin-transform-async-to-promises": "0.8.18",
-    "chalk": "5.0.0",
+    "chalk": "5.0.1",
     "find-up": "6.3.0",
     "form-data": "4.0.0",
     "fs-extra": "10.0.1",
     "glob": "^7.2.0",
-    "got": "12.0.1",
+    "got": "12.0.3",
     "gzip-size": "7.0.0",
     "lodash-es": "4.17.21",
-    "postcss": "8.4.7",
+    "postcss": "8.4.12",
     "postcss-discard-duplicates": "5.1.0",
     "postcss-pxtorem": "6.0.0",
     "pretty-bytes": "6.0.0",
-    "rollup": "2.68.0",
+    "rollup": "2.70.1",
     "rollup-plugin-cleanup": "3.2.1",
     "rollup-plugin-insert": "1.3.2",
     "rollup-plugin-postcss": "4.0.2",
@@ -47,7 +47,7 @@
     "rollup-plugin-svelte": "7.1.0",
     "rollup-plugin-terser": "7.0.2",
     "slash": "4.0.0",
-    "svelte-preprocess": "4.10.4"
+    "svelte-preprocess": "4.10.5"
   },
   "devDependencies": {
     "svelte": "3.46.4"

package/requests/activateAddon.js

@@ -31,9 +31,10 @@ function getPropertiesUri(type, id, version) {
   }
 }
 
-export default async function activateAddon() {
+export default async function activateAddon(addonName) {
   try {
-    const { id, version, name, type } = readManifestFile();
+    const manifest = readManifestFile();
+    const { id, version, type } = manifest;
 
     const { 'jcr:uuid': customModuleExecutableId } = await addonRequest({
       url: getPropertiesUri(type, id, version),
@@ -41,12 +42,12 @@ export default async function activateAddon() {
     });
 
     await addonRequest({
-      url: `Addon%20Repository/${encodeURIComponent(name)}/activatecustommoduleexecutable`,
+      url: `Addon%20Repository/${encodeURIComponent(addonName)}/activatecustommoduleexecutable`,
       method: 'PUT',
       searchParams: { customModuleExecutableId },
     });
 
-    logSuccess(`${type} ${chalk.white(`${name} (${id}@${version})`)} activated successfully!`);
+    logSuccess(`${type} ${chalk.white(`${addonName} (${id}@${version})`)} activated successfully!`);
   } catch (error) {
     handleError(error);
   }

package/requests/addonExists.js

@@ -1,12 +1,12 @@
 import handleError from './api/handleError.js';
 import addonRequest from './api/addonRequest.js';
 
-export default async function addonExists({ name }) {
+export default async function addonExists(addonName) {
   try {
     const addons = await addonRequest('Addon%20Repository/nodes', {
       method: 'GET',
     });
-    return !!addons.find((addon) => addon.name === name);
+    return !!addons.find((addon) => addon.name === addonName);
   } catch (error) {
     return handleError(error);
   }

package/requests/createAddon.js

@@ -14,13 +14,13 @@ function getCreateUri(type) {
   }
 }
 
-export default async function createAddon({ id, name, type, category }) {
+export default async function createAddon({ addonName, manifest }) {
   try {
     await addonRequest({
-      url: getCreateUri(type),
-      searchParams: { name, category: category || 'Other' },
+      url: getCreateUri(manifest.type),
+      searchParams: { name: addonName, category: manifest.category || 'Other' },
     });
-    logSuccess(`${type} ${chalk.white(`${name} (${id})`)} created successfully!`);
+    logSuccess(`${manifest.type} ${chalk.white(`${addonName} (${manifest.id})`)} created successfully!`);
   } catch (error) {
     handleError(error);
   }

package/requests/index.js

@@ -4,25 +4,25 @@ import uploadAddon from './uploadAddon.js';
 import activateAddon from './activateAddon.js';
 import signAddon from './signAddon.js';
 
-export function upload({ src, manifest, force }) {
+export function upload({ src, addonName, manifest, force }) {
   return async () => {
     let checkIfExists = true;
     if (checkIfExists) {
-      const exists = await addonExists(manifest);
+      const exists = await addonExists(addonName);
       if (!exists) {
-        await createAddon(manifest);
+        await createAddon({ addonName, manifest });
       }
       checkIfExists = false;
     }
 
-    return uploadAddon({ ...manifest, src, force });
+    return uploadAddon({ src, addonName, manifest, force });
   };
 }
 
-export function activate() {
-  return () => activateAddon();
+export function activate(addonName) {
+  return () => activateAddon(addonName);
 }
 
-export function sign({ src, manifest }) {
-  return () => signAddon({ src, manifest });
+export function sign({ src, addonName, manifest }) {
+  return () => signAddon({ src, addonName, manifest });
 }

package/requests/signAddon.js

@@ -30,14 +30,14 @@ function signRequest(path) {
   }).buffer();
 }
 
-export default async function signAddon({ src, manifest }) {
+export default async function signAddon({ src, addonName, manifest }) {
   try {
     if (!fse.existsSync(src)) throw new Error(`Could not find ${src}`);
 
     const response = await signRequest(src);
     await fse.writeFile(src, response);
 
-    logSuccess(`${manifest.type} ${chalk.white(`${manifest.name} (${manifest.id})`)} signed successfully!`);
+    logSuccess(`${manifest.type} ${chalk.white(`${addonName} (${manifest.id})`)} signed successfully!`);
   } catch (error) {
     handleError(error);
   }

package/requests/uploadAddon.js

@@ -17,7 +17,7 @@ function getUploadUri(type, name) {
   }
 }
 
-export default async function uploadAddon({ id, type, name, src, force }) {
+export default async function uploadAddon({ src, addonName, manifest, force }) {
   try {
     if (!fse.existsSync(src)) {
       throw new Error(`Could not find ${src}`);
@@ -25,11 +25,11 @@ export default async function uploadAddon({ id, type, name, src, force }) {
     const form = new FormData();
     form.append('file', fse.createReadStream(src));
 
-    await addonRequest(getUploadUri(type, name), {
+    await addonRequest(getUploadUri(manifest.type, addonName), {
       searchParams: { force },
       body: form,
     });
-    logSuccess(`${type} ${chalk.white(`${name} (${id})`)} uploaded successfully!`);
+    logSuccess(`${manifest.type} ${chalk.white(`${addonName} (${manifest.id})`)} uploaded successfully!`);
   } catch (error) {
     handleError(error);
   }