@soleil-se/build-app 1.2.2 → 1.3.1

package/config/index.js

@@ -5,8 +5,7 @@ import configFiles from '../utils/configFiles.js';
 export default function config({ src, dest, cache, debug }) {
   if (src) {
     return [
-      copy({ src: `${src}/index.html`, dest }),
-      copy({ src: `${src}/config.css`, dest }),
+      copy({ src: [`${src}/index.html`, `${src}/config.css`], dest, deep: false }),
       server({
         input: `${src}/index.js`,
         output: `${dest}/index.js`,

package/index.js

@@ -27,7 +27,7 @@ async function main() {
     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', './src/config', './src/resource'], dest: './dist/src' }
+        ? { src: ['./src/manifest.json', './src/appDataDefaults.json', './src/i18n/*.json', './src/config', './src/resource'], dest: './dist' }
         : { src: ['./src'], dest: './dist' }),
     ]),
     task('server', server({
@@ -82,7 +82,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.2.2",
+  "version": "1.3.1",
   "bin": {
     "build-app": "./bin/index.js",
     "sv-app-build": "./bin/index.js"
@@ -31,6 +31,7 @@
     "find-up": "6.3.0",
     "form-data": "4.0.0",
     "fs-extra": "10.0.1",
+    "glob": "^7.2.0",
     "got": "12.0.1",
     "gzip-size": "7.0.0",
     "lodash-es": "4.17.21",

package/rollup/api/getSveltePlugin.js

@@ -19,11 +19,13 @@ const cssHash = ({ hash, css, name }) => {
   return `${kebabCase(validClass)}-${hash(css)}`;
 };
 
-const getPreprocess = async () => {
+const getSvelteConfig = async () => {
   const svelteConfigPath = findUpSync('svelte.config.js');
-  if (svelteConfigPath) {
-    return import(`file://${svelteConfigPath}`).then((pkg) => pkg.default.preprocess);
-  }
+  return svelteConfigPath ? import(`file://${svelteConfigPath}`).then((pkg) => pkg.default) : {};
+};
+
+const getPreprocess = async (svelteConfig) => {
+  if (svelteConfig.preprocess) return svelteConfig.preprocess;
   const sveltePreprocess = await import('svelte-preprocess').then((pkg) => pkg.default);
   return sveltePreprocess(preprocessOptions);
 };
@@ -34,13 +36,17 @@ export default async function getSveltePlugin({
   if (hasSvelte(input)) {
     const svelte = await import('rollup-plugin-svelte').then((pkg) => pkg.default);
 
+    const svelteConfig = await getSvelteConfig();
+
     return svelte({
-      preprocess: await getPreprocess(),
+      preprocess: await getPreprocess(svelteConfig),
       emitCss,
       compilerOptions: {
+        ...svelteConfig.compilerOptions,
         generate: ssr ? 'ssr' : 'dom',
         hydratable,
         dev: debug,
+        enableSourcemap: debug,
         cssHash,
       },
     });

package/rollup/server.js

@@ -62,7 +62,7 @@ export default function rollupServer({
       bundleCache = cache && bundle.cache;
       await bundle.write({
         file: output,
-        intro: 'var Promise = Promise || { resolve: () => {} };',
+        intro: 'var Promise = Promise || { resolve: () => {} }; var global = global || this; var self = global; var setTimeout = setTimeout || function(cb) { cb() };',
         format: 'iife',
       });
 

package/utils/copy.js

@@ -1,12 +1,16 @@
 import fse from 'fs-extra';
-import { basename, join } from 'path';
+import { resolve, join, basename } from 'path';
+import glob from 'glob';
 
-export default function copy({ src, dest }) {
-  const files = Array.isArray(src) ? src : [src];
+export default function copy({ src, dest, deep = true }) {
+  const patterns = Array.isArray(src) ? src : [src];
 
-  return () => Promise.all(
-    files.map((file) => (
-      fse.existsSync(file) ? fse.copy(file, join(dest, basename(file))) : Promise.resolve()
-    )),
-  );
+  return () => {
+    const files = patterns.map((pattern) => glob.sync(pattern)).flat();
+
+    return Promise.all(files.map((file) => {
+      const path = deep ? resolve(dest, file) : join(dest, basename(file));
+      return fse.copy(file, path);
+    }));
+  };
 }