2.6.0-beta.7 - block comments.

houd1ni · Apr 27, 2019 · 83bfa78 · 83bfa78
1 parent d8a3028
commit 83bfa78
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/dist/bundle.esm.js b/dist/bundle.esm.js
diff --git a/dist/bundle.js b/dist/bundle.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
  "prod:es": "cross-env NODE_ENV=production BUILD=es rollup -c",
  "prod": "npm run gentypes && npm run prod:es && npm run prod:cjs"
  },
- "version": "2.6.0beta.6",
+ "version": "2.6.0beta.7",
  "ava": {
  "files": [
  "./test/specs/*.ts"

diff --git a/src/css-lit.ts b/src/css-lit.ts
@@ -82,11 +82,12 @@ export const css = (() => {
  const delimiters = ['\n', '\r', ';']
  const isDelimiter = (s: string) => delimiters.includes(s)
  const delimRE = new RegExp(`[${delimiters.join('')}]`, 'g')
- const commentRE = /^\/\/.*$/
+ const commentRE = /((^\s*?\/\/.*$)|\/\*(.|[\n\r])*?\*\/)/gm
  return (strings: string[], ...values: any[]) => {
  const names: string[] = [] // selector names, class names.
  const levels = new Levels()
  join(strings, values)
+ .replace(commentRE, '')
  .replace(/(\{|\})/g, (_, brace, offset, full) => {
  if(!isDelimiter(full[offset-1])) {
  brace = ';' + brace
@@ -98,7 +99,7 @@ export const css = (() => {
  })
  .split(delimRE)
  .forEach((line) => {
- line = line.trim().replace(commentRE, '')
+ line = line.trim()
  if(line) {
  analyseLine(levels, line, names)
  }

diff --git a/test/specs/lit.ts b/test/specs/lit.ts
@@ -45,7 +45,9 @@ test('lit-css', (t) => {
  margin: some-shit;
  padding some-shit; those: shiii
  margin-left: ${value}
- margin-right: 10px
+ margin-right: 10px /*
+ some block comment
+ */
  >*:first-of-type {
  shit 66
  .inner {