Merge pull request #336 from finale-lua/bundle-remove-comments

Rollback #334 and #335

Author: Nick-Mazuk

.github/actions/bundle/dist/index.js

@@ -4501,7 +4501,6 @@ const fs_1 = __importDefault(__nccwpck_require__(7147));
 const path_1 = __importDefault(__nccwpck_require__(1017));
 const helpers_1 = __nccwpck_require__(8092);
 const lua_require_1 = __nccwpck_require__(9083);
-const remove_comments_1 = __nccwpck_require__(6236);
 const wrap_import_1 = __nccwpck_require__(3494);
 exports.files = {};
 const importFileBase = (name, importedFiles, fetcher) => {
@@ -4548,7 +4547,7 @@ const bundleFileBase = (name, importedFiles, mixins, fetcher) => {
     }
     if (fileStack.length > 1)
         fileStack.push((0, lua_require_1.generateLuaRequire)());
-    return fileStack.reverse().map(remove_comments_1.removeComments).join('\n\n');
+    return fileStack.reverse().join('\n\n');
 };
 exports.bundleFileBase = bundleFileBase;
 const bundleFile = (name, sourcePath, mixins) => {
@@ -4677,25 +4676,6 @@ const resolveRequiredFile = (name) => {
 exports.resolveRequiredFile = resolveRequiredFile;
 
 
-/***/ }),
-
-/***/ 6236:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.removeComments = void 0;
-const removeComments = (contents) => {
-    return contents
-        .replace(/--\[\[[^\]]*\]\]/giu, '')
-        .replace(/--.*$/gimu, '')
-        .replace(/\n\n+/gimu, '\n')
-        .replace(/ *$/gimu, '');
-};
-exports.removeComments = removeComments;
-
-
 /***/ }),
 
 /***/ 3494:

.github/actions/bundle/src/bundle.test.ts

@@ -1,6 +1,5 @@
 import { bundleFileBase, ImportedFiles, importFileBase } from './bundle'
 import { generateLuaRequire } from './lua-require'
-import { removeComments } from './remove-comments'
 
 describe('importFile', () => {
     it('files can be imported', () => {
@@ -41,7 +40,7 @@ describe('bundle', () => {
         const bundle = bundleFileBase('a.lua', {}, [], fetcher)
         expect(bundle).toBe(
             [
-                removeComments(generateLuaRequire()),
+                generateLuaRequire(),
                 '',
                 '__imports["b"] = function()',
                 "    local b = require('b')",
@@ -71,7 +70,7 @@ describe('bundle', () => {
         const bundle = bundleFileBase('mixin.lua', {}, ['mixin.FCMControl', 'mixin.FCMString'], fetcher)
         expect(bundle).toBe(
             [
-                removeComments(generateLuaRequire()),
+                generateLuaRequire(),
                 '',
                 '__imports["mixin.FCMControl"] = function()',
                 '    return {}',

.github/actions/bundle/src/bundle.ts

@@ -2,7 +2,6 @@ import fs from 'fs'
 import path from 'path'
 import { getAllImports } from './helpers'
 import { generateLuaRequire, resolveRequiredFile } from './lua-require'
-import { removeComments } from './remove-comments'
 import { wrapImport } from './wrap-import'
 
 export type ImportedFile = {
@@ -59,7 +58,7 @@ export const bundleFileBase = (
     }
 
     if (fileStack.length > 1) fileStack.push(generateLuaRequire())
-    return fileStack.reverse().map(removeComments).join('\n\n')
+    return fileStack.reverse().join('\n\n')
 }
 
 export const bundleFile = (name: string, sourcePath: string, mixins: string[]): string => {