app-bundler 0.2.11 → 0.2.12

package/lib/bundler.js

@@ -7877,7 +7877,7 @@ class DataInliner extends BaseRewriter_1.BaseRewriter {
                 await this.rewriteImport(resource, res);
                 continue;
             }
-            console.error('CJS not implemented');
+            await this.rewriteRequire(resource, res);
         }
     }
     accepts(type) {
@@ -7902,6 +7902,25 @@ class DataInliner extends BaseRewriter_1.BaseRewriter {
         resource.dependencies.splice(i, 1);
         this.solution.outputResources.remove(dep.resource);
     }
+    rewriteRequire(resource, dep) {
+        let rgx = new RegExp(`require\\s*\\(\\s*['"]${dep.url}['"]\\s*\\)\\s*;?`);
+        let match = rgx.exec(resource.content);
+        if (match == null) {
+            console.error(`No require found for ${dep.url} in ${resource.filename}`);
+            return;
+        }
+        let name = match.groups.name;
+        let json = dep.resource.content;
+        if (typeof json !== 'string') {
+            json = JSON.stringify(json);
+        }
+        let code = `${json}`;
+        let content = resource.content.replace(match[0], code);
+        resource.content = content;
+        let i = resource.dependencies.indexOf(dep);
+        resource.dependencies.splice(i, 1);
+        this.solution.outputResources.remove(dep.resource);
+    }
 }
 exports.DataInliner = DataInliner;
 ;

package/lib/cli.js

@@ -7879,7 +7879,7 @@ class DataInliner extends BaseRewriter_1.BaseRewriter {
                 await this.rewriteImport(resource, res);
                 continue;
             }
-            console.error('CJS not implemented');
+            await this.rewriteRequire(resource, res);
         }
     }
     accepts(type) {
@@ -7904,6 +7904,25 @@ class DataInliner extends BaseRewriter_1.BaseRewriter {
         resource.dependencies.splice(i, 1);
         this.solution.outputResources.remove(dep.resource);
     }
+    rewriteRequire(resource, dep) {
+        let rgx = new RegExp(`require\\s*\\(\\s*['"]${dep.url}['"]\\s*\\)\\s*;?`);
+        let match = rgx.exec(resource.content);
+        if (match == null) {
+            console.error(`No require found for ${dep.url} in ${resource.filename}`);
+            return;
+        }
+        let name = match.groups.name;
+        let json = dep.resource.content;
+        if (typeof json !== 'string') {
+            json = JSON.stringify(json);
+        }
+        let code = `${json}`;
+        let content = resource.content.replace(match[0], code);
+        resource.content = content;
+        let i = resource.dependencies.indexOf(dep);
+        resource.dependencies.splice(i, 1);
+        this.solution.outputResources.remove(dep.resource);
+    }
 }
 exports.DataInliner = DataInliner;
 ;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "app-bundler",
-    "version": "0.2.11",
+    "version": "0.2.12",
     "description": "",
     "main": "lib/bundler.js",
     "bin": {

package/tsconfig.json

@@ -7,7 +7,7 @@
         },
 
         "outDir": "ts-temp",
-        "lib": ["es2015", "es2015.promise", "es2016", "dom"],
+        "lib": ["es2018", "dom"],
         "typeRoots": [
             "node_modules/@types",
             "typings",
@@ -16,7 +16,7 @@
         ],
         "types": ["node", "assertion", "atma-utest", "jquery"],
         "declaration": true,
-        "target": "es5",
+        "target": "ES2018",
         "module": "commonjs",
         "sourceMap": false,
         "experimentalDecorators": true