@steambrew/ttc 1.0.4 → 1.0.5

package/Compiler.ts

@@ -3,7 +3,7 @@ import json from '@rollup/plugin-json';
 import commonjs from '@rollup/plugin-commonjs';
 import replace from '@rollup/plugin-replace';
 import typescript from '@rollup/plugin-typescript';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
+import resolve from '@rollup/plugin-node-resolve';
 import terser from '@rollup/plugin-terser';
 import babel from '@rollup/plugin-babel';
 
@@ -110,12 +110,19 @@ function InsertWebkitMillennium(props: TranspilerProps)
 }
 
 function GetPluginComponents(props: TranspilerProps) {
+
+    let tsConfigPath = `./${GetFrontEndDirectory()}/tsconfig.json`
+
+    if (!fs.existsSync(tsConfigPath)) {
+        tsConfigPath = './tsconfig.json'
+    }
+
 	const pluginList = [
         InsertMillennium(props),
         typescript({
-            tsconfig: `./${GetFrontEndDirectory()}/tsconfig.json`
+            tsconfig: tsConfigPath
         }), 
-        nodeResolve(), commonjs(), json(),
+        resolve(), commonjs(), json(),
 		replace({
 			delimiters: ['', ''],
 			preventAssignment: true,
@@ -139,7 +146,7 @@ function GetWebkitPluginComponents(props: TranspilerProps) {
         typescript({
             tsconfig: './webkit/tsconfig.json'
         }), 
-        nodeResolve(), commonjs(), json(),
+        resolve(), commonjs(), json(),
         replace({
 			delimiters: ['', ''],
 			preventAssignment: true,
@@ -193,29 +200,6 @@ export const TranspilerPluginComponent = async (props: TranspilerProps) => {
         }
     }
 
-    const webkitRollupConfig: RollupOptions = {
-        input: `./webkit/index.tsx`,
-        plugins: GetWebkitPluginComponents(props),
-        context: 'window',
-        external: (id) => {
-            if (id === '@steambrew/client') {
-              Logger.Error('The @steambrew/client module should not be included in the webkit module, use @steambrew/webkit instead. Please remove it from the webkit module and try again.')
-              process.exit(1)
-            }
-
-            return id === '@steambrew/webkit'
-        },
-        output: {
-            name: "millennium_main",
-            file: ".millennium/Dist/webkit.js",
-            exports: 'named',
-            format: 'iife',
-            globals: {
-                "@steambrew/webkit": "window.MILLENNIUM_API"
-            },
-        }
-    }
-
     Logger.Info("Starting build; this may take a few moments...")
 
     try {
@@ -223,6 +207,30 @@ export const TranspilerPluginComponent = async (props: TranspilerProps) => {
 
         if (fs.existsSync(`./webkit/index.tsx`)) {
             Logger.Info("Compiling webkit module...")
+            
+            const webkitRollupConfig: RollupOptions = {
+                input: `./webkit/index.tsx`,
+                plugins: GetWebkitPluginComponents(props),
+                context: 'window',
+                external: (id) => {
+                    if (id === '@steambrew/client') {
+                    Logger.Error('The @steambrew/client module should not be included in the webkit module, use @steambrew/webkit instead. Please remove it from the webkit module and try again.')
+                    process.exit(1)
+                    }
+
+                    return id === '@steambrew/webkit'
+                },
+                output: {
+                    name: "millennium_main",
+                    file: ".millennium/Dist/webkit.js",
+                    exports: 'named',
+                    format: 'iife',
+                    globals: {
+                        "@steambrew/webkit": "window.MILLENNIUM_API"
+                    },
+                }
+            }
+
             await (await rollup(webkitRollupConfig)).write(webkitRollupConfig.output as OutputOptions);
         }
         

package/dist/index.js

@@ -9,7 +9,7 @@ import json from '@rollup/plugin-json';
 import commonjs from '@rollup/plugin-commonjs';
 import replace from '@rollup/plugin-replace';
 import typescript from '@rollup/plugin-typescript';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
+import resolve from '@rollup/plugin-node-resolve';
 import terser from '@rollup/plugin-terser';
 import babel from '@rollup/plugin-babel';
 import { performance as performance$1 } from 'perf_hooks';
@@ -236,12 +236,16 @@ function InsertWebkitMillennium(props) {
     return { name: String(), generateBundle };
 }
 function GetPluginComponents(props) {
+    let tsConfigPath = `./${GetFrontEndDirectory()}/tsconfig.json`;
+    if (!fs.existsSync(tsConfigPath)) {
+        tsConfigPath = './tsconfig.json';
+    }
     const pluginList = [
         InsertMillennium(props),
         typescript({
-            tsconfig: `./${GetFrontEndDirectory()}/tsconfig.json`
+            tsconfig: tsConfigPath
         }),
-        nodeResolve(), commonjs(), json(),
+        resolve(), commonjs(), json(),
         replace({
             delimiters: ['', ''],
             preventAssignment: true,
@@ -263,7 +267,7 @@ function GetWebkitPluginComponents(props) {
         typescript({
             tsconfig: './webkit/tsconfig.json'
         }),
-        nodeResolve(), commonjs(), json(),
+        resolve(), commonjs(), json(),
         replace({
             delimiters: ['', ''],
             preventAssignment: true,
@@ -311,32 +315,32 @@ const TranspilerPluginComponent = async (props) => {
             format: 'iife'
         }
     };
-    const webkitRollupConfig = {
-        input: `./webkit/index.tsx`,
-        plugins: GetWebkitPluginComponents(props),
-        context: 'window',
-        external: (id) => {
-            if (id === '@steambrew/client') {
-                Logger.Error('The @steambrew/client module should not be included in the webkit module, use @steambrew/webkit instead. Please remove it from the webkit module and try again.');
-                process.exit(1);
-            }
-            return id === '@steambrew/webkit';
-        },
-        output: {
-            name: "millennium_main",
-            file: ".millennium/Dist/webkit.js",
-            exports: 'named',
-            format: 'iife',
-            globals: {
-                "@steambrew/webkit": "window.MILLENNIUM_API"
-            },
-        }
-    };
     Logger.Info("Starting build; this may take a few moments...");
     try {
         await (await rollup(frontendRollupConfig)).write(frontendRollupConfig.output);
         if (fs.existsSync(`./webkit/index.tsx`)) {
             Logger.Info("Compiling webkit module...");
+            const webkitRollupConfig = {
+                input: `./webkit/index.tsx`,
+                plugins: GetWebkitPluginComponents(props),
+                context: 'window',
+                external: (id) => {
+                    if (id === '@steambrew/client') {
+                        Logger.Error('The @steambrew/client module should not be included in the webkit module, use @steambrew/webkit instead. Please remove it from the webkit module and try again.');
+                        process.exit(1);
+                    }
+                    return id === '@steambrew/webkit';
+                },
+                output: {
+                    name: "millennium_main",
+                    file: ".millennium/Dist/webkit.js",
+                    exports: 'named',
+                    format: 'iife',
+                    globals: {
+                        "@steambrew/webkit": "window.MILLENNIUM_API"
+                    },
+                }
+            };
             await (await rollup(webkitRollupConfig)).write(webkitRollupConfig.output);
         }
         Logger.Info('Build succeeded!', Number((performance.now() - global.PerfStartTime).toFixed(3)), 'ms elapsed.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steambrew/ttc",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",