@cilix/lightjs 0.0.19 → 0.0.21

package/cli.js

@@ -154,21 +154,23 @@ for (let i = 0; i < process.argv.length; i++) {
   }
 }
 
+const PORT = process.env.PORT || config.port || 4477;
+
 if (config.serve) {
   http.createServer(light.router({
     publicDir: config.publicDir || '.',
     minify: true,
     cache: true,
     routes: config.routes
-  })).listen(4477, () => {
-    console.log('Listening on port 4477');
+  })).listen(PORT, () => {
+    console.log(`Listening on port ${PORT}`);
   });
 } else if (config.dev) {
   http.createServer(light.router({
     publicDir: config.publicDir || '.',
     routes: config.routes
-  })).listen(4477, () => {
-    console.log('Listening on port 4477');
+  })).listen(PORT, () => {
+    console.log(`Listening on port ${PORT}`);
   });
 } else if (config.create) {
   const p = path.resolve(dir, config.create);

package/core.js

@@ -439,7 +439,12 @@ module.exports = (config, fs, path) => {
       let in_expr = false;
       let pos = cursor;
       while (i < max) {
-        if (text[i] === "{" && text[i+1] === "{" && in_expr === false && text[i-1] !== '\\') {
+        if (text[i] === "{" && text[i+1] === "{" && in_expr === false) {
+          if (text[i-1] === '\\') {
+            chunk = chunk.slice(0, -1);
+            chunk += text[i++];
+            continue;
+          }
           in_expr = true;
           chunks.push({ type: "chunk", data: chunk, pos: pos, file: file });
           chunk = "{{";
@@ -635,13 +640,9 @@ module.exports = (config, fs, path) => {
          * bad (incorrect token position) due to newline magic above */
         tokens.push({ type: 'string', pos: offs + cursor, file: file });
         let chunks = break_into_chunks(text, cursor);
-        if (chunks.length > 1) {
-          chunks.forEach(function(c) {
-            tokens.push(c);
-          });
-        } else {
-          tokens.push({ type: 'chunk', data: text, pos: offs + cursor, file: file })
-        }
+        chunks.forEach(function(c) {
+          tokens.push(c);
+        });
         /*
         tokens.push({ type: 'string', pos: offs + cursor, file: file });
         tokens.push({ type: 'chunk', data: text, pos: offs + cursor, file: file })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cilix/lightjs",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "A new kind of JavaScript framework",
   "main": "index.js",
   "scripts": {