@cmmn/tools 1.6.14 → 1.6.15

package/bundle/rollup.config.js

@@ -14,7 +14,6 @@ import alias from '@rollup/plugin-alias';
 import replace from '@rollup/plugin-replace';
 import sourcemaps from 'rollup-plugin-sourcemaps';
 import {Styles} from "./styles.js";
-
 /**
  * @typedef {import(rollup).RollupOptions} RollupOptions
  * @typedef {import(rollup).OutputOptions} OutputOptions
@@ -91,7 +90,7 @@ export class ConfigCreator {
             name: this.options.global ?? 'global',
             sourcemapPathTransform: sourceMap => {
                 const p = path.relative(this.root, path.resolve(this.outDir, sourceMap));
-                return path.join('/',this.options.package, p);
+                return path.join('/', this.options.package, p);
             }
         }));
     }
@@ -102,19 +101,22 @@ export class ConfigCreator {
             dir: this.outDir,
             inject: false,
             template: (x) => {
-                const inject = Object.keys(x.bundle.bundle).map(key => {
+                let inject = Object.keys(x.bundle.bundle).map(key => {
                     if (key.endsWith('css'))
                         return `<link rel="stylesheet" href="/${key}" >`;
                     if (key.endsWith('js'))
                         return `<script type="module" defer src="/${key}"></script>`;
-                });
-                const importMaps = Object.fromEntries(Object.entries(this.options.external)
-                    .map(([key,value]) => [key.replace('.*', '/'), `/external/${value}`]));
-                const injectImportMaps = `<script type="importmap" >${JSON.stringify({
-                    imports: importMaps
-                })}</script>`;
+                }).join('\n');
+                if (!this.options.minify) {
+                    const importMaps = Object.fromEntries(this.options.external
+                        .map(key => key.replace('.*', '/'))
+                        .map(key => [key, `/external/${this.options.alias[key] ?? key}`]));
+                    inject = `<script type="importmap" >${JSON.stringify({
+                        imports: importMaps
+                    })}</script>` + inject;
+                }
                 const html = fs.readFileSync(path.join(this.root, this.options.html), 'utf8')
-                return html.replace('</head>', injectImportMaps + inject.join('\n') + '</head>');
+                return html.replace('</head>', inject + '</head>');
             }
         });
     }
@@ -194,9 +196,11 @@ export class ConfigCreator {
         ];
         if (this.options.alias) {
             result.unshift(alias({
-                entries: this.options.alias
+                entries: Object.entries(this.options.alias).map(([key, value]) => ({
+                    find: key,
+                    replacement: value
+                }))
             }));
-            console.log(this.options.alias)
         }
         if (this.options.html || this.options.input.endsWith('.html')) {
             result.push(this.html);
@@ -243,7 +247,7 @@ export class ConfigCreator {
                 [this.options.name]: path.join(this.root, this.options.input)
             },
             output: this.output,
-            external: this.getExternals(),
+            external: (this.options.minify && this.options.browser) ? [] : this.getExternals(),
             manualChunks: this.options.chunks,
             onwarn(warning) {
                 switch (warning.code) {

package/compile/compile.js

@@ -1,6 +1,6 @@
 import ts from "ttypescript";
 import {resolve, relative} from 'path';
-
+import fs from "fs";
 const rootDir = process.cwd();
 
 export function compile(...flags) {
@@ -22,12 +22,18 @@ export function compile(...flags) {
         builder.clean(rootDir);
         builder.build(rootDir);
 }
-
+const cleanedBaseDirs = new Set();
 function createProgram(rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences) {
     options.outDir = resolve(options.configFilePath, '../dist/esm');
     options.declarationDir = resolve(options.configFilePath, '../dist/typings');
     options.baseUrl = resolve(options.configFilePath, '../');
     options.tsBuildInfoFile = resolve(options.configFilePath, '../dist/ts.buildinfo');
+    if (!cleanedBaseDirs.has(options.baseUrl)){
+        fs.rmSync(options.outDir, {recursive: true, force: true});
+        fs.rmSync(options.declarationDir, {recursive: true, force: true});
+        fs.rmSync(options.tsBuildInfoFile, {force: true});
+        cleanedBaseDirs.add(options.baseUrl);
+    }
     console.log('\t', relative(process.cwd(), options.baseUrl));
     return ts.createEmitAndSemanticDiagnosticsBuilderProgram(
         rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmmn/tools",
-  "version": "1.6.14",
+  "version": "1.6.15",
   "description": "Compilation, bundling, code generator, testing.",
   "main": "dist/rollup.config.js",
   "type": "module",
@@ -81,5 +81,5 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "ea462e05920a23cb6403537393246235844dce60"
+  "gitHead": "9e836ce57ea7b9e9143ab895e5506570c2b93645"
 }