@soleil-se/build-app 1.0.2 → 1.2.0

package/LICENSE.md

@@ -0,0 +1 @@
+(c) Copyright 2021 Soleil AB, all rights reserved.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soleil-se/build-app",
-  "version": "1.0.2",
+  "version": "1.2.0",
   "bin": {
     "build-app": "./bin/index.js",
     "sv-app-build": "./bin/index.js"
@@ -14,41 +14,42 @@
   },
   "homepage": "https://docs.soleil.se/build/app",
   "dependencies": {
-    "@babel/core": "7.16.12",
+    "@babel/core": "7.17.5",
     "@babel/preset-env": "7.16.11",
     "@rollup/plugin-alias": "3.1.9",
-    "@rollup/plugin-babel": "5.3.0",
-    "@rollup/plugin-commonjs": "21.0.1",
+    "@rollup/plugin-babel": "5.3.1",
+    "@rollup/plugin-commonjs": "21.0.2",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "13.1.3",
-    "@rollup/plugin-replace": "3.0.1",
+    "@rollup/plugin-replace": "4.0.0",
     "@soleil-se/build-config": "1.1.1",
     "@soleil-se/build-utils": "1.3.0",
     "archiver": "5.3.0",
-    "autoprefixer": "^10.4.2",
-    "babel-plugin-transform-async-to-promises": "^0.8.18",
+    "autoprefixer": "10.4.2",
+    "babel-plugin-transform-async-to-promises": "0.8.18",
     "chalk": "5.0.0",
-    "find-up": "6.2.0",
+    "find-up": "6.3.0",
     "form-data": "4.0.0",
-    "fs-extra": "10.0.0",
+    "fs-extra": "10.0.1",
     "got": "12.0.1",
+    "gzip-size": "7.0.0",
     "lodash-es": "4.17.21",
-    "postcss": "8.4.6",
-    "postcss-discard-duplicates": "^5.0.2",
-    "postcss-pxtorem": "^6.0.0",
-    "rollup": "2.66.1",
+    "postcss": "8.4.7",
+    "postcss-discard-duplicates": "5.0.3",
+    "postcss-pxtorem": "6.0.0",
+    "pretty-bytes": "6.0.0",
+    "rollup": "2.68.0",
     "rollup-plugin-cleanup": "3.2.1",
-    "rollup-plugin-filesize": "9.1.2",
-    "rollup-plugin-insert": "^1.3.2",
+    "rollup-plugin-insert": "1.3.2",
     "rollup-plugin-postcss": "4.0.2",
     "rollup-plugin-string": "3.0.0",
     "rollup-plugin-svelte": "7.1.0",
     "rollup-plugin-terser": "7.0.2",
     "slash": "4.0.0",
-    "svelte-preprocess": "4.10.2"
+    "svelte-preprocess": "4.10.4"
   },
   "devDependencies": {
-    "svelte": "3.46.3"
+    "svelte": "3.46.4"
   },
   "description": "Script for building WebApps, RESTApps and Widgets with Svelte in Sitevision.",
   "keywords": [

package/rollup/api/getSveltePlugin.js

@@ -5,9 +5,6 @@ import { kebabCase } from 'lodash-es';
 
 import preprocessOptions from './common/preprocessOptions.js';
 
-let svelte;
-let sveltePreprocess;
-
 const validClassRegex = /[^a-z0-9\-_]|^[^a-z]+/gi;
 
 const hasSvelte = (input) => {
@@ -22,15 +19,23 @@ const cssHash = ({ hash, css, name }) => {
   return `${kebabCase(validClass)}-${hash(css)}`;
 };
 
+const getPreprocess = async () => {
+  const svelteConfigPath = findUpSync('svelte.config.js');
+  if (svelteConfigPath) {
+    return import(`file://${svelteConfigPath}`).then((pkg) => pkg.default.preprocess);
+  }
+  const sveltePreprocess = await import('svelte-preprocess').then((pkg) => pkg.default);
+  return sveltePreprocess(preprocessOptions);
+};
+
 export default async function getSveltePlugin({
   input, debug = false, emitCss = true, ssr, hydratable = true,
 }) {
   if (hasSvelte(input)) {
-    svelte = svelte || await import('rollup-plugin-svelte').then((pkg) => pkg.default);
-    sveltePreprocess = sveltePreprocess || await import('svelte-preprocess').then((pkg) => pkg.default);
+    const svelte = await import('rollup-plugin-svelte').then((pkg) => pkg.default);
 
     return svelte({
-      preprocess: sveltePreprocess(preprocessOptions),
+      preprocess: await getPreprocess(),
       emitCss,
       compilerOptions: {
         generate: ssr ? 'ssr' : 'dom',

package/rollup/client.js

@@ -3,7 +3,6 @@ import json from '@rollup/plugin-json';
 
 import fse from 'fs-extra';
 
-import generateBanner from './utils/generateBanner.js';
 import moveCss from './utils/moveCss.js';
 import onwarn from './utils/onwarn.js';
 import getSitevisionClientPackages from './utils/getSitevisionClientPackages.js';
@@ -15,11 +14,12 @@ import getCommonjsPlugin from './api/getCommonjsPlugin.js';
 import getNodeResolvePlugin from './api/getNodeResolvePlugin.js';
 import getSveltePlugin from './api/getSveltePlugin.js';
 import getPostcssPlugin from './api/getPostcssPlugin.js';
-import getFilesizePlugin from './api/getFilesizePlugin.js';
 import getTerserPlugin from './api/getTerserPlugin.js';
-import sitevision from './plugins/sitevision-client.js';
 import getInsertPlugin from './api/getInsertPlugin.js';
 
+import sitevision from './plugins/sitevisionClient.js';
+import bundleSize from './plugins/bundleSize.js';
+
 export default function rollupClient({
   debug,
   globals = {},
@@ -53,7 +53,7 @@ export default function rollupClient({
       getPostcssPlugin({ cssOutput, debug }),
       getBabelClientPlugin(),
       json(),
-      getFilesizePlugin({ showSize }),
+      showSize && bundleSize(),
       getTerserPlugin({ debug }),
     ];
 
@@ -69,7 +69,6 @@ export default function rollupClient({
       bundleCache = cache && bundle.cache;
       await bundle.write({
         file: output,
-        banner: debug && generateBanner(),
         globals,
         format: bundled ? 'amd' : 'iife',
         sourcemap: debug ? 'inline' : false,

package/rollup/plugins/bundleSize.js

@@ -0,0 +1,21 @@
+import { basename } from 'path';
+import { gzipSizeSync } from 'gzip-size';
+import prettyBytes from 'pretty-bytes';
+import chalk from 'chalk';
+
+import { getTimestamp } from '@soleil-se/build-utils/log';
+
+export default function bundleSize() {
+  return {
+    name: 'rollup-plugin-bundle-size',
+    generateBundle({ file }, bundle) {
+      const asset = basename(file);
+      const { code } = bundle[asset];
+
+      const original = prettyBytes(code.length);
+      const gzipped = prettyBytes(gzipSizeSync(code));
+
+      console.log(getTimestamp(), `${chalk.green('Created bundle')} ${file}: ${chalk.yellow(original)} → ${chalk.greenBright(gzipped)} (gzip)`);
+    },
+  };
+}

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

@@ -1,4 +1,4 @@
-export default function sitevision() {
+export default function sitevisionClient() {
   const ignored = [];
 
   function isSitevisionScope(id) {
@@ -17,7 +17,7 @@ export default function sitevision() {
   }
 
   return {
-    name: 'sitevision-imports',
+    name: 'rollup-plugin-sitevision-client',
     resolveId(importee) {
       if (shouldResolve(importee)) {
         // Should be handled as usual.

package/rollup/plugins/{sitevision-server.js → sitevisionServer.js}

@@ -18,7 +18,7 @@ const sitevisionPackages = [
   'cache',
 ];
 
-export default function sitevision() {
+export default function sitevisionServer() {
   const ignored = [];
 
   function startsWithUpperCase(id) {
@@ -52,7 +52,7 @@ export default function sitevision() {
   }
 
   return {
-    name: 'sitevision-imports',
+    name: 'rollup-plugin-sitevision-server',
     resolveId(importee) {
       if (shouldResolve(importee)) {
         // Should be handled as usual.

package/rollup/server.js

@@ -5,10 +5,8 @@ import cleanup from 'rollup-plugin-cleanup';
 
 import fse from 'fs-extra';
 
-import generateBanner from './utils/generateBanner.js';
 import moveCss from './utils/moveCss.js';
 import onwarn from './utils/onwarn.js';
-import sitevision from './plugins/sitevision-server.js';
 
 import { getReplaceServerPlugin } from './api/getReplacePlugin.js';
 import { getAliasServerPlugin } from './api/getAliasPlugin.js';
@@ -20,6 +18,8 @@ import getSveltePlugin from './api/getSveltePlugin.js';
 import getPostcssPlugin from './api/getPostcssPlugin.js';
 import getTerserPlugin from './api/getTerserPlugin.js';
 
+import sitevision from './plugins/sitevisionServer.js';
+
 export default function rollupServer({
   debug,
   input,
@@ -62,7 +62,6 @@ export default function rollupServer({
       bundleCache = cache && bundle.cache;
       await bundle.write({
         file: output,
-        banner: debug && generateBanner(),
         intro: 'var Promise = Promise || { resolve: () => {} };',
         format: 'iife',
       });

package/rollup/api/getFilesizePlugin.js

@@ -1,5 +0,0 @@
-import filesize from 'rollup-plugin-filesize';
-
-export default function getFilesizePlugin({ showSize }) {
-  return showSize ? filesize() : false;
-}

package/rollup/utils/generateBanner.js

@@ -1,9 +0,0 @@
-import { template } from 'lodash-es';
-import fse from 'fs-extra';
-import config from '@soleil-se/build-config';
-
-const { name, version } = fse.readJSONSync(new URL('../../package.json', import.meta.url));
-
-export default function generateBanner() {
-  return template(config.banner)({ date: new Date(), build: `${name} - ${version}` });
-}