Merge pull request #671 from kethinov/0.6.7

0.6.7

CHANGELOG.md

@@ -4,6 +4,11 @@
 
 - Put your changes here...
 
+## 0.6.7
+
+- Fixed issue causing server-side comments to not be stripped from templates parsed as strings instead of as files.
+- Updated various dependencies.
+
 ## 0.6.6
 
 - Fixed issue causing the template caching feature to not work properly in Express apps.

package.json

@@ -8,7 +8,7 @@
       "url": "https://github.com/rooseveltframework/teddy/graphs/contributors"
     }
   ],
-  "version": "0.6.6",
+  "version": "0.6.7",
   "files": [
     "dist"
   ],
@@ -31,11 +31,11 @@
     "xregexp": "5.1.1"
   },
   "devDependencies": {
-    "@playwright/test": "1.44.0",
+    "@playwright/test": "1.44.1",
     "c8": "9.1.0",
     "codecov": "3.8.3",
     "cross-env": "7.0.3",
-    "eslint": "9.2.0",
+    "eslint": "9.3.0",
     "eslint-plugin-html": "8.1.1",
     "eslint-plugin-mocha": "10.4.3",
     "mocha": "10.4.0",
@@ -62,15 +62,15 @@
   },
   "scripts": {
     "build": "webpack",
-    "coverage": "npm run coverage:server && npm run coverage:client",
-    "coverage:server": "npm run build && cross-env NODE_ENV=cover c8 mocha --timeout 60000 test/loaders/mocha.js",
-    "coverage:client": "npm run build && cross-env NODE_ENV=cover c8 playwright test",
+    "coverage": "npm run coverage-server && npm run coverage-client",
+    "coverage-server": "npm run build && cross-env NODE_ENV=cover c8 mocha --timeout 60000 test/loaders/mocha.js",
+    "coverage-client": "npm run build && cross-env NODE_ENV=cover c8 playwright test",
     "lint": "standard && eslint ./test && standard --plugin html *.html",
     "lint-fix": "standard --fix && eslint ./test && standard --plugin html *.html --fix",
-    "test": "npm run test:server && npm run test:client",
-    "t": "npm run test:server && npm run test:client",
-    "test:client": "npm run build && playwright test",
-    "test:server": "npm run build && cross-env NODE_ENV=test mocha --timeout 60000 test/loaders/mocha.js",
+    "test": "npm run test-server && npm run test-client",
+    "t": "npm run test-server && npm run test-client",
+    "test-client": "npm run build && playwright test",
+    "test-server": "npm run build && cross-env NODE_ENV=test mocha --timeout 60000 test/loaders/mocha.js",
     "prepack": "npm run build"
   },
   "repository": {

teddy.js

@@ -105,6 +105,7 @@ function loadTemplate (template) {
         template = templates[template]
         register = true
       }
+      template = removeTeddyComments(template)
     }
   }
   if (register) {

test/tests.js

@@ -942,6 +942,12 @@ export default [
         test: (teddy, template, model) => teddy.render(template, model),
         expected: '<p>test test</p>'
       },
+      {
+        message: 'should remove {! server side comments !} in an inline template',
+        template: 'misc/serverSideComments',
+        test: (teddy, template, model) => teddy.render('{! comments !}<p>Should remove {! the !} comments.</p>', model),
+        expected: '<p>Should remove comments.</p>'
+      },
       {
         message: 'should remove {! {! nested !} server side comments !} (misc/serverSideCommentsNested.html)',
         template: 'misc/serverSideCommentsNested',