update build system

denis-migdal · Feb 27, 2025 · 4525b83 · 4525b83
1 parent 08786c0
commit 4525b83
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 14 deletions.
diff --git a/V3/assets/auto-vanilla/index.js b/V3/assets/auto-vanilla/index.js
@@ -1,3 +1,5 @@
+import LISS from "@LISS"
+
 const template =
       LISS.template`Hello <em>World</em>`;
 

diff --git a/V3/components/code/highlight.min.js b/V3/components/code/highlight.min.js
@@ -609,4 +609,6 @@ begin:a.concat(/</,a.lookahead(a.concat(n,a.either(/\/>/,/>/,/\s/)))),
 end:/\/?>/,contains:[{className:"name",begin:n,relevance:0,starts:r}]},{
 className:"tag",begin:a.concat(/<\//,a.lookahead(a.concat(n,/>/))),contains:[{
 className:"name",begin:n,relevance:0},{begin:/>/,relevance:0,endsParent:!0}]}]}}
-})();hljs.registerLanguage("xml",e)})();
+})();hljs.registerLanguage("xml",e)})();
+
+export default hljs;
diff --git a/V3/components/code/hl.ts b/V3/components/code/hl.ts
@@ -1,5 +1,5 @@
-// const hljs = require('highlight.js');
-const hljs = require('./highlight.min.js');
+// need to add "export default"...
+import hljs from './highlight.min.js';
 
 export function hl(code: string, language: string): string {
     return hljs.highlight(code, { language }).value;

diff --git a/V3/src/utils/tests/buildTestPage.ts b/V3/src/utils/tests/buildTestPage.ts
@@ -22,12 +22,22 @@ export default function buildTestPage(args: {
                     margin: 0;
                     background-color: white;
                 }
+                :not(:defined) {
+                    visibility: hidden;
+                }
             </style>
             ${
                 args.files === "" || args.files === undefined || args.files?.includes("bry")
                     ? `<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/brython@3/brython.min.js" defer></script>`
                     : ""
             }
+            <script type="importmap">
+            {
+                "imports": {
+                    "@LISS": "${args.liss}"
+                }
+            }
+            </script>
             <script type="module" src='${args.liss}'
                     liss-sw="${args.sw ?? ""}"
                     liss-mode="auto-load"

diff --git a/build/WebpackFramework b/build/WebpackFramework
diff --git a/dist/prod/V3/assets/auto-vanilla/index.js b/dist/prod/V3/assets/auto-vanilla/index.js
@@ -1,3 +1,5 @@
+import LISS from "@LISS"
+
 const template =
       LISS.template`Hello <em>World</em>`;
 

diff --git a/dist/prod/V3/libs/LISS/index.js b/dist/prod/V3/libs/LISS/index.js
diff --git a/dist/prod/V3/libs/LISS/index.js.map b/dist/prod/V3/libs/LISS/index.js.map
diff --git a/dist/prod/V3/skeleton/base/index.js b/dist/prod/V3/skeleton/base/index.js
diff --git a/dist/prod/V3/skeleton/base/index.js.map b/dist/prod/V3/skeleton/base/index.js.map
diff --git a/dist/prod/V3/skeleton/index.js b/dist/prod/V3/skeleton/index.js
diff --git a/dist/prod/V3/skeleton/index.js.map b/dist/prod/V3/skeleton/index.js.map
diff --git a/package.json b/package.json
@@ -2,6 +2,7 @@
     "name": "LISS",
     "version": "2.0.0",
     "description": "[PROJECT_DESC]",
+    "type": "module",
     "repository": {
         "type": "git",
         "url": "git+[PROJECT_REPOSITORY]"

diff --git a/tsconfig.json b/tsconfig.json
@@ -12,6 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "noImplicitOverride": true,
         "noImplicitReturns": true,
+        "allowSyntheticDefaultImports": true,
 
         "module": "esnext",
         "target": "esnext",

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,5 +1,5 @@
-const WF = require("./build/WebpackFramework");
+import buildConfigs from "./build/WebpackFramework/index.js";
 
-module.exports = WF.buildConfigs("./V3/",
-                                "./dist/${version}/V3/",
-                                { "@LISS": "V3/" });
+export default buildConfigs("./V3/",
+                            "./dist/${version}/V3/",
+                            { "@LISS": "V3/" });
+7 −13		index.js
+1 −0		package.json
+2 −2		src/copyAssets.js
+3 −3		src/entries.js
+2 −2		src/rules/CSS.js
+1 −1		src/rules/HTML.js
+1 −1		src/rules/Images.js
+3 −3		src/rules/Markdown.js
+3 −3		src/rules/Typescript.js
+5 −7		src/rules/index.js
+10 −6		src/skeleton.js