@soleil-se/build-app 1.12.0 → 2.0.0

package/CHANGELOG.md

@@ -0,0 +1,124 @@
+---
+title: Changelog
+---
+
+Baseras på [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) och använder [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [2.0.0] - 2024-10-21
+
+- Ta bort stödet för WebApps 1.
+- Stöd för Svelte 5, bakåtkompatibel med 3 och 4.
+- Ta bort default alias för mer kontroll.
+- Gör det möjligt att ta bort och lägga till tasks utan omstart.
+- Sitevision API:er måste importeras med `@sitevision/api`.
+
+## [1.11.1] - 2024-01-09
+
+- Nypublicering då något gick fel vid publicering av 1.11.0.
+- Ändra homepage länk.
+
+## [1.11.0] - 2024-01-09
+
+- Möjlighet att bygga ihop app utan `user_config.json` och `project_config.json`, vid synkning krävs dock filerna för miljöinformation och autentisering.
+- Nya uppstartskommandon som bakar ihop argument:
+  - `build`: Bygger ihop appen utan att ladda upp.
+  - `watch`: Startar en watcher, när någon de filer som loggas vid uppstart ändras byggs appen ihop och laddas upp till default miljön eller den miljö som anges i `--env` argumentet.
+  - `start`: Bygger först ihop och laddar upp appen till default miljön eller den miljö som anges i `--env` argumentet, därefter startas en watcher.
+  - `deploy`: Bygger ihop, signerar och laddar upp appen till default miljön eller den miljö som anges i `--env` argumentet.
+
+## [1.10.0] - 2023-11-21
+
+- Hantera exporter av `.svelte` filer bättre i `@rollup/plugin-node-resolve`
+- Lägg till ytterliggare replace i `@rollup/plugin-replace` för att ta reda på om koden körs på servern eller i webbläsaren.
+
+## [1.9.0] - 2023-09-20
+
+- Skriv ut information om nuvarande miljö om skriptet startas självstående.
+- Starta en watcher på förändringar i gits checksum om skriptet startas självstående.
+- Modernare default på babel-env.
+
+## [1.8.2] - 2023-07-06
+
+- Lägg till ytterligare introkod för servern som i vissa fall behövs för Svelte 4.
+
+## [1.8.1] - 2023-06-28
+
+- Uppdatera `rollup-plugin-svelte` för att slippa varning kring css.
+
+## [1.8.0] - 2023-06-26
+
+- Stöd för Svelte 4.
+- Lägsta version av Node som stödjs är nu 16.
+
+## [1.7.1] - 2023-06-12
+
+- Justera sökväg för `node_modules` så det fungerar på Mac.
+
+## [1.7.0] - 2023-06-02
+
+- Lägg till appens `node_modules` när dependencies resolvas.
+
+## [1.6.1] - 2023-03-21
+
+- Hantera CSS-filer genererade av klientsidekoden för WebApps 1.
+
+## [1.6.0] - 2023-02-28
+
+- Justera hantering av CSS för att minska risken för duplicerade media queries.
+- Dämpa varning vid import av `@sitevision/api/common/events` då det inte är Node API:et som importeras.
+
+## [1.5.0] - 2023-01-11
+
+- Stöd för att importera SVG-filer som text.
+- Uppdatera Rollup till version 3.
+
+## [1.4.2] - 2022-08-26
+
+- Uppdatera dependencies.
+
+## [1.4.1] - 2022-04-19
+
+- Uppdatera dependencies.
+
+## [1.4.0] - 2022-04-06
+
+- Stöd för flerspråkiga namn på en app i `manifest.json`.
+
+## [1.3.1] - 2022-03-25
+
+- Acceptera även argumentet `--build` för att starta bygge tillsammans med `--watch`.
+
+## [1.3.0] - 2022-03-17
+
+- Läs även in `compilerOptions` från `svelte.config.js`.
+- Kopiera bara `.json` filer från `./src/i18n`.
+
+## [1.2.2] - 2022-03-11
+
+- Skicka med `args.debug` till config tasks.
+
+## [1.2.1] - 2022-03-03
+
+- Slå av `errorOnUnmatchedPattern` för ESLint.
+- Nytt uppstartsmeddelande.
+
+## [1.2.0] - 2022-03-01
+
+- Byt ut `rollup-plugin-filesize` mot en egen version för att bli av deprecation meddelanden.
+- Ta bort banner även vid debug då det är onödig information.
+
+## [1.1.0] - 2022-02-16
+
+- Använd närmsta `svelte.config.js` för preprocessing options.
+
+## [1.0.2] - 2022-02-09
+
+- Ta bort `sass` som felaktigt ligger med som dependency.
+
+## [1.0.1] - 2022-02-08
+
+- Se till att det går att bygga ihop WebApps 1 app utan `index.js`.
+
+## [1.0.0] - 2022-02-08
+
+Första release.

package/config/index.js

@@ -3,25 +3,23 @@ import copy from '../utils/copy.js';
 import configFiles from '../utils/configFiles.js';
 
 export default function config({ src, dest, cache, debug }) {
-  if (src) {
-    return [
-      copy({ src: [`${src}/index.html`, `${src}/config.css`], dest, deep: false }),
-      server({
-        input: `${src}/index.js`,
-        output: `${dest}/index.js`,
-        debug,
-      }),
-      client({
-        input: `${src}/config.js`,
-        output: `${dest}/config.js`,
-        globals: { jquery: 'jQuery' },
-        showSize: false,
-        hydratable: false,
-        cache,
-        debug,
-      }),
-      configFiles({ dest }),
-    ];
-  }
-  return undefined;
+  return [
+    copy({ src: [`${src}/index.html`, `${src}/config.css`], dest, deep: false }),
+    server({
+      input: `${src}/index.js`,
+      output: `${dest}/index.js`,
+      debug,
+    }),
+    client({
+      input: `${src}/config.js`,
+      output: `${dest}/config.js`,
+      globals: { jquery: 'jQuery' },
+      showSize: false,
+      hydratable: false,
+      cache,
+      debug,
+      format: 'iife',
+    }),
+    configFiles({ dest }),
+  ];
 }

package/index.js

@@ -1,86 +1,94 @@
+import fse from 'fs-extra';
 import args from '@soleil-se/build-utils/args';
 import runTasks from '@soleil-se/build-utils/runTasks';
 import task from '@soleil-se/build-utils/task';
 import watch from '@soleil-se/build-utils/watch';
 import { logError, logStartup, logEnviroment, logTimestamp } from '@soleil-se/build-utils/log';
 import createChecksumChecker from '@soleil-se/build-utils/createChecksumChecker';
+import { env, rollup } from '@soleil-se/build-config';
 
-import {
-  input, manifest, addonName, env, rollup, watchPaths, eslintPaths,
-} from './config.js';
-
+import { readManifest } from './manifest.js';
 import { clean, copy, files, zip, eslint } from './utils/index.js';
 import { client, server } from './rollup/index.js';
 import { activate, upload, sign } from './requests/index.js';
 import config from './config/index.js';
 
-const zipPath = `./dist/${manifest.id}-${manifest.version}.zip`;
-
 async function main() {
-  logTimestamp(`${addonName} (${manifest.id})`);
+  const manifest = await readManifest();
+  const zipPath = `./dist/${manifest.id}-${manifest.version}.zip`;
+
+  logTimestamp(`${manifest.name} (${manifest.id})`);
   logStartup(import.meta.url);
+  if (!manifest.bundled) {
+    logError('WebApps 1 is no longer supported. To use WebApps 2 set bundled to true in manifest.json.');
+    process.exit(1);
+  }
   if (!args.project && args.sync && env) {
     logEnviroment(env);
   }
   const tasks = [
     task('clean', clean({ dir: './dist' })),
-    args.eslint && task('eslint', eslint({ src: eslintPaths })),
+    args.eslint && task('eslint', eslint({ src: ['./**/*.{js,svelte}'] })),
     task('copy', [
       copy({ src: './manifest.json', dest: './dist/src' }),
-      copy(manifest.bundled || (input.server || '').startsWith('./src')
-        ? { src: ['./src/manifest.json', './src/appDataDefaults.json', './src/i18n/*.json', './src/config', './src/resource'], dest: './dist' }
-        : { src: ['./src'], dest: './dist' }),
+      copy({ src: ['./src/manifest.json', './src/appDataDefaults.json', './src/i18n/*.json', './src/config', './src/resource'], dest: './dist' }),
     ]),
     task('server', server({
-      input: input.server,
+      input: './src/index.js',
       output: './dist/src/index.js',
       debug: args.debug,
-      bundled: manifest.bundled,
       cache: args.cache,
       extractCss: true,
-    })),
+    }), () => fse.existsSync('./src/index.js')),
     task('client', client({
-      input: input.client,
-      output: manifest.bundled ? './dist/src/main.js' : './dist/src/resource/client/index.js',
-      bundled: manifest.bundled,
+      input: './src/main.js',
+      output: './dist/src/main.js',
       globals: rollup?.client?.globals,
       debug: args.debug,
       cache: args.cache,
       extractCss: true,
-    })),
+    }), () => fse.existsSync('./src/main.js')),
     task('hooks', server({
-      input: input.hooks,
+      input: './src/hooks.js',
       output: './dist/src/hooks.js',
-      bundled: manifest.bundled,
       debug: args.debug,
       cache: args.cache,
       extractCss: true,
-    })),
-    task('config', config({ src: input.config, dest: './dist/src/config', cache: args.cache, debug: args.debug })),
-    task('globalConfig', config({ src: input.globalConfig, dest: './dist/src/config/global', cache: args.cache })),
+    }), () => fse.existsSync('./src/hooks.js')),
+    task('config', config({
+      src: './config',
+      dest: './dist/src/config',
+      cache: args.cache,
+      debug: args.debug,
+    }), () => fse.existsSync('./config')),
+    task('globalConfig', config({
+      src: './config_global',
+      dest: './dist/src/config/global',
+      cache: args.cache,
+    }), () => fse.existsSync('./config_global')),
     task('files', files({ manifest, dest: './dist' })),
     task('zip', zip({ src: './dist/src', dest: zipPath })),
   ];
 
   if (args.sign ?? env?.sign ?? env?.production) {
-    tasks.push(task('sign', sign({ src: zipPath, addonName, manifest })));
+    tasks.push(task('sign', sign({ src: zipPath })));
   }
 
   if (args.sync) {
     tasks.push(task('upload', upload({
       src: zipPath,
-      addonName,
-      manifest,
       force: args.force || !env?.production,
     })));
 
-    if (args.sync && args.activate) {
-      tasks.push(task('activate', activate(addonName)));
+    if (args.activate) {
+      tasks.push(task('activate', activate()));
     }
   }
 
   if (args.watch) {
-    watch(watchPaths, () => runTasks(tasks));
+    watch('./**/*', () => runTasks(tasks), {
+      ignored: ['./dist/**/*', './node_modules/**/*', './*.md', './.*', 'package-lock.json', 'yarn.lock', './*config*.*'],
+    });
     if (!args.project) createChecksumChecker();
   } else {
     await runTasks(tasks);

package/manifest.js

@@ -0,0 +1,19 @@
+import fse from 'fs-extra';
+import config from '@soleil-se/build-config';
+
+import isObject from './api/isObject.js';
+
+export function getAddonName(manifest) {
+  return isObject(manifest.name) ? manifest.name[config.addonNameLang || 'sv'] : manifest.name;
+}
+
+export async function readManifest() {
+  let manifest = {};
+  if (fse.existsSync('./manifest.json')) {
+    manifest = await fse.readJson('./manifest.json');
+  } else if (fse.existsSync('./src/manifest.json')) {
+    manifest = await fse.readJson('./src/manifest.json');
+  }
+  manifest.name = getAddonName(manifest);
+  return manifest;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soleil-se/build-app",
-  "version": "1.12.0",
+  "version": "2.0.0",
   "bin": {
     "build-app": "./bin/index.js",
     "sv-app-build": "./bin/index.js"
@@ -10,47 +10,46 @@
   "license": "UNLICENSED",
   "type": "module",
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=20.0.0"
   },
   "homepage": "https://docs.soleil.se/build/app",
   "dependencies": {
-    "@babel/core": "7.23.6",
-    "@babel/preset-env": "7.23.6",
-    "@rollup/plugin-alias": "5.1.0",
+    "@babel/core": "7.25.8",
+    "@babel/preset-env": "7.25.8",
+    "@rollup/plugin-alias": "5.1.1",
     "@rollup/plugin-babel": "6.0.4",
-    "@rollup/plugin-commonjs": "25.0.7",
+    "@rollup/plugin-commonjs": "28.0.1",
     "@rollup/plugin-json": "6.1.0",
-    "@rollup/plugin-node-resolve": "15.2.3",
-    "@rollup/plugin-replace": "5.0.5",
+    "@rollup/plugin-node-resolve": "15.3.0",
+    "@rollup/plugin-replace": "6.0.1",
     "@rollup/plugin-terser": "0.4.4",
-    "archiver": "6.0.1",
-    "autoprefixer": "10.4.16",
+    "archiver": "7.0.1",
+    "autoprefixer": "10.4.20",
     "babel-plugin-transform-async-to-promises": "0.8.18",
     "chalk": "5.3.0",
-    "find-up": "6.3.0",
-    "form-data": "4.0.0",
+    "find-up": "7.0.0",
+    "form-data": "4.0.1",
     "fs-extra": "11.2.0",
-    "glob": "^10.3.10",
-    "got": "13.0.0",
+    "glob": "^11.0.0",
+    "got": "14.4.3",
     "gzip-size": "7.0.0",
     "lodash-es": "4.17.21",
     "minimist": "^1.2.8",
-    "postcss": "8.4.32",
-    "postcss-pxtorem": "6.0.0",
+    "postcss": "8.4.47",
+    "postcss-pxtorem": "6.1.0",
     "pretty-bytes": "6.1.1",
-    "prompts": "^2.4.2",
-    "rollup": "3.29.4",
-    "rollup-plugin-cleanup": "3.2.1",
+    "prompts": "2.4.2",
+    "rollup": "4.24.0",
     "rollup-plugin-postcss": "4.0.2",
     "rollup-plugin-string": "3.0.0",
-    "rollup-plugin-svelte": "7.1.6",
+    "rollup-plugin-svelte": "7.2.2",
     "slash": "5.1.0",
-    "svelte-preprocess": "5.1.3",
-    "@soleil-se/build-config": "1.2.0",
-    "@soleil-se/build-utils": "1.6.0"
+    "svelte-preprocess": "6.0.3",
+    "@soleil-se/build-config": "1.3.0",
+    "@soleil-se/build-utils": "1.7.0"
   },
   "devDependencies": {
-    "svelte": "4.2.8"
+    "svelte": "5.0.2"
   },
   "scripts": {},
   "description": "Script for building WebApps, RESTApps and Widgets with Svelte in Sitevision.",

package/requests/activateAddon.js

@@ -1,25 +1,11 @@
 import chalk from 'chalk';
-import fse from 'fs-extra';
 
 import { logSuccess } from '@soleil-se/build-utils/log';
 
+import { readManifest } from '../manifest.js';
 import addonRequest from './api/addonRequest.js';
 import handleError from './api/handleError.js';
 
-function readManifestFile() {
-  try {
-    if (fse.existsSync('./manifest.json')) {
-      return fse.readJsonSync('./manifest.json');
-    }
-    if (fse.existsSync('./src/manifest.json')) {
-      return fse.readJsonSync('./src/manifest.json');
-    }
-    throw new Error('Could not find manifest.json...');
-  } catch (e) {
-    throw new Error('Unable to parse manifest.json...');
-  }
-}
-
 function getPropertiesUri(type, id, version) {
   switch (type.toLowerCase()) {
     case 'webapp':
@@ -32,10 +18,9 @@ function getPropertiesUri(type, id, version) {
   }
 }
 
-export default async function activateAddon(addonName) {
+export default async function activateAddon(name) {
   try {
-    const manifest = readManifestFile();
-    const { id, version, type } = manifest;
+    const { id, version, type } = await readManifest();
 
     const { 'jcr:uuid': customModuleExecutableId } = await addonRequest({
       url: getPropertiesUri(type, id, version),
@@ -43,12 +28,12 @@ export default async function activateAddon(addonName) {
     });
 
     await addonRequest({
-      url: `Addon%20Repository/${encodeURIComponent(addonName)}/activatecustommoduleexecutable`,
+      url: `Addon%20Repository/${encodeURIComponent(name)}/activatecustommoduleexecutable`,
       method: 'PUT',
       searchParams: { customModuleExecutableId },
     });
 
-    logSuccess(`${type} ${chalk.white(`${addonName} (${id}@${version})`)} activated successfully!`);
+    logSuccess(`${type} ${chalk.white(`${name} (${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(addonName) {
+export default async function addonExists(name) {
   try {
     const addons = await addonRequest('Addon%20Repository/nodes', {
       method: 'GET',
     });
-    return !!addons.find((addon) => addon.name === addonName);
+    return !!addons.find((addon) => addon.name === name);
   } catch (error) {
     return handleError(error);
   }

package/requests/api/addonRequest.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/no-unresolved
 import got from 'got';
 import config from '@soleil-se/build-config';
 

package/requests/createAddon.js

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

package/requests/index.js

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

package/requests/signAddon.js

@@ -2,6 +2,7 @@ import { basename } from 'path';
 import fse from 'fs-extra';
 import chalk from 'chalk';
 import prompts from 'prompts';
+// eslint-disable-next-line import/no-unresolved
 import got from 'got';
 import FormData from 'form-data';
 import { logSuccess } from '@soleil-se/build-utils/log';
@@ -51,14 +52,14 @@ async function signRequest(path) {
   }).buffer();
 }
 
-export default async function signAddon({ src, addonName, manifest }) {
+export default async function signAddon({ src, 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(`${addonName} (${manifest.id})`)} signed successfully!`);
+    logSuccess(`${manifest.type} ${chalk.white(`${manifest.name} (${manifest.id})`)} signed successfully!`);
   } catch (error) {
     handleError(error);
   }

package/requests/uploadAddon.js

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

package/rollup/api/getAliasPlugin.js

@@ -8,24 +8,15 @@ const resolveAlias = (root, aliases = {}) => Object.entries(aliases)
     [key]: path.resolve(root, value),
   }), {});
 
-const clientAlias = config?.projectRoot ? resolveAlias(config.projectRoot, {
-  '#api/webapps': './server_src/webapps/api',
-  '#api': './server_src/api',
-  '#components': './server_src/webapps/components',
-  ...config?.rollup?.client?.alias,
-}) : {};
+const clientAlias = config?.projectRoot
+  ? resolveAlias(config.projectRoot, config?.rollup?.client?.alias) : {};
 
 export function getAliasClientPlugin() {
   return alias({ entries: clientAlias });
 }
 
-const serverAlias = config?.projectRoot ? resolveAlias(config.projectRoot, {
-  '#api/webapps': './server_src/webapps/api',
-  '#api/restapps': './server_src/restapps/api',
-  '#api': './server_src/api',
-  '#components': './server_src/webapps/components',
-  ...config?.rollup?.server?.alias,
-}) : {};
+const serverAlias = config?.projectRoot
+  ? resolveAlias(config.projectRoot, config?.rollup?.server?.alias) : {};
 
 export function getAliasServerPlugin() {
   return alias({ entries: serverAlias });

package/rollup/api/getBabelPlugin.js

@@ -2,9 +2,8 @@ import { babel } from '@rollup/plugin-babel';
 
 const commonOptions = {
   babelrc: false,
-  extensions: ['.js', '.mjs', '.html', '.svelte'],
+  extensions: ['.js', '.mjs', '.html', '.svelte', '.cjs'],
   babelHelpers: 'bundled',
-  plugins: ['babel-plugin-transform-async-to-promises'],
 };
 
 export function getBabelClientPlugin() {
@@ -29,6 +28,7 @@ export function getBabelClientPlugin() {
 export function getBabelServerPlugin() {
   return babel({
     ...commonOptions,
+    plugins: ['babel-plugin-transform-async-to-promises'],
     presets: [
       ['@babel/preset-env', {
         exclude: ['@babel/plugin-transform-arrow-functions'],

package/rollup/api/getSveltePlugin.js

@@ -2,6 +2,7 @@ import { dirname } from 'path';
 import { findUpSync } from 'find-up';
 import fse from 'fs-extra';
 import { kebabCase } from 'lodash-es';
+import { createRequire } from 'module';
 
 import preprocessOptions from './common/preprocessOptions.js';
 
@@ -30,6 +31,13 @@ async function getPreprocess(svelteConfig) {
   return sveltePreprocess(preprocessOptions);
 }
 
+function isLegacy() {
+  const require = createRequire(import.meta.url);
+  // eslint-disable-next-line import/no-extraneous-dependencies
+  const { version } = require('svelte/package.json');
+  return version.startsWith('3') || version.startsWith('4');
+}
+
 export default async function getSveltePlugin({
   input, debug = false, extractCss = true, ssr, hydratable = true,
 }) {
@@ -41,12 +49,16 @@ export default async function getSveltePlugin({
       preprocess: await getPreprocess(svelteConfig),
       emitCss: extractCss,
       compilerOptions: {
+        css: !extractCss ? 'injected' : undefined,
         ...svelteConfig.compilerOptions,
-        generate: ssr ? 'ssr' : 'dom',
-        hydratable,
+        generate: ssr ? 'server' : 'client',
         dev: debug,
-        enableSourcemap: debug,
         cssHash,
+        ...(isLegacy() ? {
+          enableSourcemap: debug,
+          hydratable,
+          generate: ssr ? 'ssr' : 'dom',
+        } : {}),
       },
     });
   }

package/rollup/client.js

@@ -1,6 +1,5 @@
 import { rollup } from 'rollup';
 import json from '@rollup/plugin-json';
-
 import fse from 'fs-extra';
 
 import onwarn from './utils/onwarn.js';
@@ -16,7 +15,7 @@ import getPostcssPlugin from './api/getPostcssPlugin.js';
 import getTerserPlugin from './api/getTerserPlugin.js';
 import getStringPlugin from './api/getStringPlugin.js';
 
-import sitevisionPlugin from './plugins/sitevisionClient.js';
+import sitevisionPlugin from './plugins/sitevision.js';
 import bundleSizePlugin from './plugins/bundleSize.js';
 import amdGlobalsPlugin from './plugins/amdGlobals.js';
 
@@ -27,23 +26,19 @@ export default function rollupClient({
   output,
   extractCss = false,
   showSize = true,
-  bundled,
   hydratable,
   cache = true,
+  format = 'amd',
 } = {}) {
-  if (!input) return false;
-
   let bundleCache;
   let plugins;
 
-  const external = bundled ? getSitevisionClientPackages() : Object.keys(globals);
-
   return async () => {
     if (!fse.existsSync(input)) return Promise.resolve();
 
     plugins = plugins || [
-      bundled ? sitevisionPlugin() : false,
-      bundled ? amdGlobalsPlugin({ globals }) : false,
+      format === 'amd' && amdGlobalsPlugin({ globals }),
+      sitevisionPlugin({ context: 'client' }),
       getReplaceClientPlugin(),
       getAliasClientPlugin(),
       getNodeResolvePlugin({ input }),
@@ -59,7 +54,7 @@ export default function rollupClient({
 
     try {
       const bundle = await rollup({
-        external,
+        external: getSitevisionClientPackages(),
         input,
         plugins,
         onwarn,
@@ -68,9 +63,13 @@ export default function rollupClient({
 
       bundleCache = cache && bundle.cache;
       return bundle.write({
+        // name: format === 'amd' ? 'app' : undefined,
+        // banner: format === 'amd' ? 'define(function (require) {' : undefined,
+        // footer: format === 'amd' ? 'return app; });' : undefined,
+        // format: 'iife',
+        format,
         file: output,
         globals,
-        format: bundled ? 'amd' : 'iife',
         sourcemap: debug ? 'inline' : false,
         interop: 'auto',
       });

package/rollup/plugins/{sitevisionClient.js → sitevision.js}

@@ -1,4 +1,4 @@
-export default function sitevisionClient() {
+export default function sitevision({ context } = {}) {
   const ignored = [];
 
   function isSitevisionScope(id) {
@@ -16,14 +16,23 @@ export default function sitevisionClient() {
     return !ignored.includes(id);
   }
 
+  function getVirtualModule(pkg) {
+    if (context === 'server') {
+      return `var ${pkg} = require('${pkg}');\nexport default ${pkg};`;
+    } if (context === 'client') {
+      return `export { default } from '${pkg}';`;
+    }
+    throw new Error('Invalid context, must be either "server" or "client".');
+  }
+
   return {
-    name: 'rollup-plugin-sitevision-client',
+    name: 'rollup-plugin-sitevision',
     resolveId(importee) {
       if (shouldResolve(importee)) {
         // Should be handled as usual.
         return null;
       }
-      // Most likely a SiteVision dependency.
+      // Most likely a Sitevision dependency.
       // Do not ask other plugins or check the file system to find it.
       if (!ignored.includes(importee)) {
         ignored.push(importee);
@@ -37,7 +46,7 @@ export default function sitevisionClient() {
       // The virtual source code for the provided Sitevision dependency.
       const pkg = id.split('/').pop();
       return {
-        code: `export { default } from '${pkg}';`,
+        code: getVirtualModule(pkg),
         syntheticNamedExports: true,
       };
     },

package/rollup/server.js

@@ -1,7 +1,5 @@
 import { rollup } from 'rollup';
 import json from '@rollup/plugin-json';
-import cleanup from 'rollup-plugin-cleanup';
-
 import fse from 'fs-extra';
 
 import onwarn from './utils/onwarn.js';
@@ -16,18 +14,15 @@ import getPostcssPlugin from './api/getPostcssPlugin.js';
 import getTerserPlugin from './api/getTerserPlugin.js';
 import getStringPlugin from './api/getStringPlugin.js';
 
-import sitevision from './plugins/sitevisionServer.js';
+import sitevision from './plugins/sitevision.js';
 
 export default function rollupServer({
   debug,
   input,
   output,
   extractCss = false,
-  bundled,
   cache = true,
 } = {}) {
-  if (!input) return false;
-
   let bundleCache;
   let plugins;
 
@@ -37,7 +32,7 @@ export default function rollupServer({
     plugins = plugins || [
       getReplaceServerPlugin(),
       getAliasServerPlugin(),
-      sitevision(),
+      sitevision({ context: 'server' }),
       json(),
       getStringPlugin(),
       getNodeResolvePlugin({ input }),
@@ -45,7 +40,7 @@ export default function rollupServer({
       await getSveltePlugin({ input, extractCss, ssr: true }),
       getPostcssPlugin({ extractCss, debug }),
       getBabelServerPlugin(),
-      bundled ? getTerserPlugin({ debug }) : cleanup({ maxEmptyLines: 1 }),
+      getTerserPlugin({ debug }),
     ];
 
     try {

package/utils/files.js

@@ -31,12 +31,12 @@ async function moveFileIfExists(src, dest) {
   return fse.move(src, dest, { overwrite: true });
 }
 
-async function manageCss({ type, bundled, dest }) {
+async function manageCss({ type, dest }) {
   const serverOutput = `${dest}/src/index.css`;
-  const clientOutput = bundled ? `${dest}/src/main.css` : `${dest}/src/resource/client/index.css`;
+  const clientOutput = `${dest}/src/main.css`;
   const hooksOutput = `${dest}/src/hooks.css`;
 
-  const cssDest = ['webapp', 'widget'].includes(type.toLowerCase()) ? `${dest}/src/css` : `${dest}/src/resource/client`;
+  const cssDest = ['webapp', 'widget'].includes(type) ? `${dest}/src/css` : `${dest}/src/resource/client`;
 
   if (await hasSameContent(serverOutput, clientOutput)) {
     await fse.remove(serverOutput);
@@ -50,9 +50,9 @@ async function manageCss({ type, bundled, dest }) {
 }
 
 export default function files({ manifest, dest }) {
-  const { type, bundled } = manifest;
-  if (type.toLowerCase() === 'restapp') return manageCss({ type, bundled, dest });
+  const type = manifest.type.toLowerCase();
+  if (type === 'restapp') return manageCss({ type, dest });
   return () => Promise.all(
-    [createMain(dest), createIndex(dest), manageCss({ type, bundled, dest })],
+    [createMain(dest), createIndex(dest), manageCss({ type, dest })],
   );
 }

package/config.js

@@ -1,70 +0,0 @@
-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';
-  return false;
-}
-
-function getServerInput() {
-  if (fse.existsSync('./src/index.js')) return './src/index.js';
-  if (fse.existsSync('./app_src/index.js')) return './app_src/index.js';
-  return false;
-}
-
-function getHooksInput() {
-  if (fse.existsSync('./src/hooks.js')) return './src/hooks.js';
-  if (fse.existsSync('./app_src/hooks.js')) return './app_src/hooks.js';
-  return false;
-}
-
-function getConfigInput() {
-  if (fse.existsSync('./config')) return './config';
-  if (fse.existsSync('./app_config')) return './app_config';
-  return false;
-}
-
-function getGlobalConfigInput() {
-  if (fse.existsSync('./config_global')) return './config_global';
-  if (fse.existsSync('./app_config_global')) return './app_config_global';
-  return false;
-}
-
-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(),
-  server: getServerInput(),
-  hooks: getHooksInput(),
-  config: getConfigInput(),
-  globalConfig: getGlobalConfigInput(),
-};
-
-const folders = [
-  input.client && dirname(input.client),
-  input.server && dirname(input.server),
-  input.hooks && dirname(input.hooks),
-  input.config,
-  input.globalConfig,
-]
-  .filter((folder) => !!folder)
-  .filter((v, i, arr) => arr.indexOf(v) === i);
-
-export const watchPaths = folders.map((folder) => `${folder}/**/*`).concat('./manifest.json');
-export const eslintPaths = folders.map((folder) => `${folder}/**/*.{js,svelte}`);

package/rollup/plugins/sitevisionServer.js

@@ -1,81 +0,0 @@
-import { camelCase } from 'lodash-es';
-import { isAbsolute } from 'path';
-
-const sitevisionPackages = [
-  'underscore',
-  'router',
-  'i18n',
-  'appData',
-  'globalAppData',
-  'appResource',
-  'appInfo',
-  'storage',
-  'oauth2',
-  'privileged',
-  'app',
-  'events',
-  'hooks',
-  'cache',
-];
-
-export default function sitevisionServer() {
-  const ignored = [];
-
-  function startsWithUpperCase(id) {
-    return /^[A-Z]/.test(id);
-  }
-
-  function isSitevisionPath(id) {
-    if (isAbsolute(id) && !id.startsWith('/')) {
-      return false;
-    }
-    return startsWithUpperCase(id);
-  }
-
-  function isExcluded(id) {
-    return sitevisionPackages.includes(id);
-  }
-
-  function isSitevisionScope(id) {
-    return id.startsWith('@sitevision/api');
-  }
-
-  function shouldResolve(importee) {
-    if (isSitevisionScope(importee) || isExcluded(importee) || isSitevisionPath(importee)) {
-      return false;
-    }
-    return true;
-  }
-
-  function shouldLoad(id) {
-    return !ignored.includes(id);
-  }
-
-  return {
-    name: 'rollup-plugin-sitevision-server',
-    resolveId(importee) {
-      if (shouldResolve(importee)) {
-        // Should be handled as usual.
-        return null;
-      }
-      // Most likely a SiteVision dependency.
-      // Do not ask other plugins or check the file system to find it.
-      if (!ignored.includes(importee)) {
-        ignored.push(importee);
-      }
-      return importee;
-    },
-    load(id) {
-      if (shouldLoad(id)) {
-        return null;
-      }
-      // The virtual source code for the provided SiteVision dependency.
-      const pkg = id.split('/').pop();
-      const name = camelCase(pkg);
-      return {
-        code: `var ${name} = require('${pkg}'); export default ${name}`,
-        syntheticNamedExports: true,
-      };
-    },
-  };
-}