@soleil-se/build-app 1.10.0 → 1.11.2

package/index.js

@@ -4,10 +4,9 @@ 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 chalk from 'chalk';
-import slash from 'slash';
+
 import {
-  input, manifest, addonName, env, projectRoot, rollup, watchPaths, eslintPaths,
+  input, manifest, addonName, env, rollup, watchPaths, eslintPaths,
 } from './config.js';
 
 import { clean, copy, files, zip, eslint } from './utils/index.js';
@@ -20,10 +19,9 @@ const zipPath = `./dist/${manifest.id}-${manifest.version}.zip`;
 async function main() {
   logTimestamp(`${addonName} (${manifest.id})`);
   logStartup(import.meta.url);
-  if (!args.project && env) {
+  if (!args.project && args.sync && env) {
     logEnviroment(env);
   }
-  logTimestamp(`Config: ${chalk.blue(slash(`${projectRoot}/project_config.json`))}`);
   const tasks = [
     task('clean', clean({ dir: './dist' })),
     args.eslint && task('eslint', eslint({ src: eslintPaths })),
@@ -64,7 +62,7 @@ async function main() {
     task('zip', zip({ src: './dist/src', dest: zipPath })),
   ];
 
-  if (args.sign ?? env.sign ?? env.production) {
+  if (args.sign ?? env?.sign ?? env?.production) {
     tasks.push(task('sign', sign({ src: zipPath, addonName, manifest })));
   }
 
@@ -73,10 +71,10 @@ async function main() {
       src: zipPath,
       addonName,
       manifest,
-      force: args.force || !env.production,
+      force: args.force || !env?.production,
     })));
 
-    if (args.activate) {
+    if (args.sync && args.activate) {
       tasks.push(task('activate', activate(addonName)));
     }
   }
@@ -87,7 +85,7 @@ async function main() {
   } else {
     await runTasks(tasks);
   }
-  if (args.build || args.run) await runTasks(tasks);
+  if (args.build) await runTasks(tasks);
 }
 
 main().catch((e) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soleil-se/build-app",
-  "version": "1.10.0",
+  "version": "1.11.2",
   "bin": {
     "build-app": "./bin/index.js",
     "sv-app-build": "./bin/index.js"
@@ -14,12 +14,12 @@
   },
   "homepage": "https://docs.soleil.se/build/app",
   "dependencies": {
-    "@babel/core": "7.23.3",
-    "@babel/preset-env": "7.23.3",
-    "@rollup/plugin-alias": "5.0.1",
+    "@babel/core": "7.23.6",
+    "@babel/preset-env": "7.23.6",
+    "@rollup/plugin-alias": "5.1.0",
     "@rollup/plugin-babel": "6.0.4",
     "@rollup/plugin-commonjs": "25.0.7",
-    "@rollup/plugin-json": "6.0.1",
+    "@rollup/plugin-json": "6.1.0",
     "@rollup/plugin-node-resolve": "15.2.3",
     "@rollup/plugin-replace": "5.0.5",
     "@rollup/plugin-terser": "0.4.4",
@@ -29,26 +29,28 @@
     "chalk": "5.3.0",
     "find-up": "6.3.0",
     "form-data": "4.0.0",
-    "fs-extra": "11.1.1",
+    "fs-extra": "11.2.0",
     "glob": "^10.3.10",
     "got": "13.0.0",
     "gzip-size": "7.0.0",
     "lodash-es": "4.17.21",
-    "postcss": "8.4.31",
+    "minimist": "^1.2.8",
+    "postcss": "8.4.32",
     "postcss-pxtorem": "6.0.0",
     "pretty-bytes": "6.1.1",
+    "prompts": "^2.4.2",
     "rollup": "3.29.4",
     "rollup-plugin-cleanup": "3.2.1",
     "rollup-plugin-postcss": "4.0.2",
     "rollup-plugin-string": "3.0.0",
     "rollup-plugin-svelte": "7.1.6",
     "slash": "5.1.0",
-    "svelte-preprocess": "5.1.0",
-    "@soleil-se/build-config": "1.1.3",
-    "@soleil-se/build-utils": "1.5.1"
+    "svelte-preprocess": "5.1.3",
+    "@soleil-se/build-config": "1.2.0",
+    "@soleil-se/build-utils": "1.6.0"
   },
   "devDependencies": {
-    "svelte": "4.2.7"
+    "svelte": "4.2.8"
   },
   "scripts": {},
   "description": "Script for building WebApps, RESTApps and Widgets with Svelte in Sitevision.",

package/requests/signAddon.js

@@ -1,17 +1,38 @@
 import { basename } from 'path';
 import fse from 'fs-extra';
 import chalk from 'chalk';
+import prompts from 'prompts';
 import got from 'got';
 import FormData from 'form-data';
 import { logSuccess } from '@soleil-se/build-utils/log';
 import config from '@soleil-se/build-config';
-
 import handleError from './api/handleError.js';
 
-const { certificate, auth } = config.webappSign;
-const [username, password] = Buffer.from(auth || '', 'base64').toString().split(':');
+function getCertificate() {
+  if (config.webappSign) return config.webappSign.certificate || '';
+  return prompts({
+    type: 'text',
+    name: 'certificate',
+    message: 'Certificate name? (Leave empty for default)',
+  }).then(({ certificate }) => certificate);
+}
+
+function getAuth() {
+  const { auth } = config.webappSign || {};
+  if (auth) {
+    const [username, password] = Buffer.from(auth || '', 'base64').toString().split(':');
+    return { username, password };
+  }
+  return prompts([
+    { type: 'text', name: 'username', message: 'Username?', validate: (value) => (value ? true : 'Username is required.') },
+    { type: 'password', name: 'password', message: 'Password?', validate: (value) => (value ? true : 'Password is required.') },
+  ]);
+}
 
-function signRequest(path) {
+async function signRequest(path) {
+  const { username, password } = await getAuth();
+  if (!username || !password) throw new Error('Signing aborted...');
+  const certificate = await getCertificate();
   const form = new FormData();
   const filename = basename(path);
   form.append('file', fse.createReadStream(path), {

package/rollup/api/getAliasPlugin.js

@@ -8,24 +8,24 @@ const resolveAlias = (root, aliases = {}) => Object.entries(aliases)
     [key]: path.resolve(root, value),
   }), {});
 
-const clientAlias = resolveAlias(config.projectRoot, {
+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,
-});
+}) : {};
 
 export function getAliasClientPlugin() {
   return alias({ entries: clientAlias });
 }
 
-const serverAlias = resolveAlias(config.projectRoot, {
+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,
-});
+}) : {};
 
 export function getAliasServerPlugin() {
   return alias({ entries: serverAlias });

package/rollup/api/getReplacePlugin.js

@@ -6,7 +6,7 @@ export function getReplaceClientPlugin() {
     "typeof process !== 'undefined' ? process.server : typeof window === 'undefined'": false,
     'process.server': false,
     'process.browser': true,
-    'process.env.NODE_ENV': JSON.stringify(config.env.production ? 'production' : 'development'),
+    'process.env.NODE_ENV': JSON.stringify(config?.env?.production ? 'production' : 'development'),
     preventAssignment: true,
     delimiters: ['', ''],
   });

package/rollup/client.js

@@ -16,8 +16,9 @@ import getPostcssPlugin from './api/getPostcssPlugin.js';
 import getTerserPlugin from './api/getTerserPlugin.js';
 import getStringPlugin from './api/getStringPlugin.js';
 
-import sitevision from './plugins/sitevisionClient.js';
-import bundleSize from './plugins/bundleSize.js';
+import sitevisionPlugin from './plugins/sitevisionClient.js';
+import bundleSizePlugin from './plugins/bundleSize.js';
+import amdGlobalsPlugin from './plugins/amdGlobals.js';
 
 export default function rollupClient({
   debug,
@@ -35,14 +36,14 @@ export default function rollupClient({
   let bundleCache;
   let plugins;
 
-  const external = Object.keys(globals);
-  if (bundled) external.push(...getSitevisionClientPackages());
+  const external = bundled ? getSitevisionClientPackages() : Object.keys(globals);
 
   return async () => {
     if (!fse.existsSync(input)) return Promise.resolve();
 
     plugins = plugins || [
-      bundled ? sitevision() : false,
+      bundled ? sitevisionPlugin() : false,
+      bundled ? amdGlobalsPlugin({ globals }) : false,
       getReplaceClientPlugin(),
       getAliasClientPlugin(),
       getNodeResolvePlugin({ input }),
@@ -52,7 +53,7 @@ export default function rollupClient({
       getBabelClientPlugin(),
       json(),
       getStringPlugin(),
-      showSize && bundleSize(),
+      showSize && bundleSizePlugin(),
       getTerserPlugin({ debug }),
     ];
 

package/rollup/plugins/amdGlobals.js

@@ -0,0 +1,32 @@
+export default function amdGlobals({ globals } = {}) {
+  const ignored = [];
+
+  function shouldLoad(id) {
+    return !ignored.includes(id);
+  }
+
+  return {
+    name: 'rollup-plugin-amd-globals',
+    resolveId(importee) {
+      if (!Object.keys(globals).includes(importee)) {
+        // Should be handled as usual.
+        return null;
+      }
+      // Most likely a global 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 global dependency.
+      return {
+        code: `export default window['${globals[id]}'];`,
+      };
+    },
+  };
+}