@marko/translator-default 5.20.5 → 5.20.8

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,7 +1,7 @@
1
1
  "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = _default;var _path = _interopRequireDefault(require("path"));
2
2
  var _getComponentFiles = _interopRequireDefault(require("../../util/get-component-files"));
3
3
 
4
- const STYLE_REG = /^style(?:\.([^\s]+))?\s*\{/;
4
+ const STYLE_REG = /^style((?:\.[^\s\\/:*?"<>|({]+)+)?\s*\{/;
5
5
 
6
6
  function _default(tag) {
7
7
  const { hub, node } = tag;
@@ -36,7 +36,7 @@ function _default(tag) {
36
36
 
37
37
  }
38
38
 
39
- const [startContent, type = "css"] = matchedBlock;
39
+ const [startContent, type = ".css"] = matchedBlock;
40
40
  const codeSartOffset = startContent.length;
41
41
  const codeEndOffset = rawValue.lastIndexOf("}");
42
42
  const code = rawValue.slice(codeSartOffset, codeEndOffset);
@@ -44,13 +44,13 @@ function _default(tag) {
44
44
  const start = node.extra && node.extra.nameStart;
45
45
 
46
46
  deps.push({
47
- type,
47
+ type: type.slice(1),
48
48
  code,
49
49
  style: true,
50
50
  startPos: start + codeSartOffset,
51
51
  endPos: start + codeEndOffset,
52
52
  path: `./${base}`,
53
- virtualPath: `./${base}.${type}` });
53
+ virtualPath: `./${base + type}` });
54
54
 
55
55
 
56
56
  tag.remove();
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/taglib/core/transform-style.js"],"names":["STYLE_REG","tag","hub","node","deps","file","metadata","marko","rawValue","matchedBlock","exec","parentPath","isProgram","get","buildCodeFrameError","some","dep","style","styleFile","startContent","type","codeSartOffset","length","codeEndOffset","lastIndexOf","code","slice","base","path","basename","opts","filename","start","extra","nameStart","push","startPos","endPos","virtualPath","remove"],"mappings":"uJAAA;AACA;;AAEA,MAAMA,SAAS,GAAG,4BAAlB;;AAEe,kBAAUC,GAAV,EAAe;AAC5B,QAAM,EAAEC,GAAF,EAAOC,IAAP,KAAgBF,GAAtB;AACA,QAAM,EAAEG,IAAF,KAAWF,GAAG,CAACG,IAAJ,CAASC,QAAT,CAAkBC,KAAnC;AACA,QAAM,EAAEC,QAAF,KAAeL,IAArB;AACA,QAAMM,YAAY,GAAGT,SAAS,CAACU,IAAV,CAAeF,QAAf,CAArB;AACA,MAAI,CAACC,YAAL,EAAmB;AACjB;AACD;;AAED,MAAI,CAACR,GAAG,CAACU,UAAJ,CAAeC,SAAf,EAAL,EAAiC;AAC/B,UAAMX,GAAG;AACNY,IAAAA,GADG,CACC,MADD;AAEHC,IAAAA,mBAFG;AAGF,8DAHE,CAAN;;AAKD;;AAED,MAAIV,IAAI,CAACW,IAAL,CAAU,CAAAC,GAAG,KAAIA,GAAG,CAACC,KAArB,CAAJ,EAAiC;AAC/B,UAAMhB,GAAG;AACNY,IAAAA,GADG,CACC,MADD;AAEHC,IAAAA,mBAFG;AAGF,gEAHE,CAAN;;AAKD;;AAED,MAAI,gCAAkBb,GAAlB,EAAuBiB,SAA3B,EAAsC;AACpC,UAAMjB,GAAG;AACNY,IAAAA,GADG,CACC,MADD;AAEHC,IAAAA,mBAFG;AAGF,wGAHE,CAAN;;AAKD;;AAED,QAAM,CAACK,YAAD,EAAeC,IAAI,GAAG,KAAtB,IAA+BX,YAArC;AACA,QAAMY,cAAc,GAAGF,YAAY,CAACG,MAApC;AACA,QAAMC,aAAa,GAAGf,QAAQ,CAACgB,WAAT,CAAqB,GAArB,CAAtB;AACA,QAAMC,IAAI,GAAGjB,QAAQ,CAACkB,KAAT,CAAeL,cAAf,EAA+BE,aAA/B,CAAb;AACA,QAAMI,IAAI,GAAGC,cAAKC,QAAL,CAAc3B,GAAG,CAACG,IAAJ,CAASyB,IAAT,CAAcC,QAA5B,CAAb;AACA,QAAMC,KAAK,GAAG7B,IAAI,CAAC8B,KAAL,IAAc9B,IAAI,CAAC8B,KAAL,CAAWC,SAAvC;;AAEA9B,EAAAA,IAAI,CAAC+B,IAAL,CAAU;AACRf,IAAAA,IADQ;AAERK,IAAAA,IAFQ;AAGRR,IAAAA,KAAK,EAAE,IAHC;AAIRmB,IAAAA,QAAQ,EAAEJ,KAAK,GAAGX,cAJV;AAKRgB,IAAAA,MAAM,EAAEL,KAAK,GAAGT,aALR;AAMRK,IAAAA,IAAI,EAAG,KAAID,IAAK,EANR;AAORW,IAAAA,WAAW,EAAG,KAAIX,IAAK,IAAGP,IAAK,EAPvB,EAAV;;;AAUAnB,EAAAA,GAAG,CAACsC,MAAJ;AACD","sourcesContent":["import path from \"path\";\nimport getComponentFiles from \"../../util/get-component-files\";\n\nconst STYLE_REG = /^style(?:\\.([^\\s]+))?\\s*\\{/;\n\nexport default function (tag) {\n const { hub, node } = tag;\n const { deps } = hub.file.metadata.marko;\n const { rawValue } = node;\n const matchedBlock = STYLE_REG.exec(rawValue);\n if (!matchedBlock) {\n return;\n }\n\n if (!tag.parentPath.isProgram()) {\n throw tag\n .get(\"name\")\n .buildCodeFrameError(\n \"Style blocks must be at the root of your Marko template.\"\n );\n }\n\n if (deps.some(dep => dep.style)) {\n throw tag\n .get(\"name\")\n .buildCodeFrameError(\n \"A Marko file can only contain a single inline style block.\"\n );\n }\n\n if (getComponentFiles(tag).styleFile) {\n throw tag\n .get(\"name\")\n .buildCodeFrameError(\n 'A Marko file can either have an inline style block, or an external \"style.ext\" file, but not both.'\n );\n }\n\n const [startContent, type = \"css\"] = matchedBlock;\n const codeSartOffset = startContent.length;\n const codeEndOffset = rawValue.lastIndexOf(\"}\");\n const code = rawValue.slice(codeSartOffset, codeEndOffset);\n const base = path.basename(hub.file.opts.filename);\n const start = node.extra && node.extra.nameStart;\n\n deps.push({\n type,\n code,\n style: true,\n startPos: start + codeSartOffset,\n endPos: start + codeEndOffset,\n path: `./${base}`,\n virtualPath: `./${base}.${type}`\n });\n\n tag.remove();\n}\n"],"file":"transform-style.js"}
1
+ {"version":3,"sources":["../../../src/taglib/core/transform-style.js"],"names":["STYLE_REG","tag","hub","node","deps","file","metadata","marko","rawValue","matchedBlock","exec","parentPath","isProgram","get","buildCodeFrameError","some","dep","style","styleFile","startContent","type","codeSartOffset","length","codeEndOffset","lastIndexOf","code","slice","base","path","basename","opts","filename","start","extra","nameStart","push","startPos","endPos","virtualPath","remove"],"mappings":"uJAAA;AACA;;AAEA,MAAMA,SAAS,GAAG,yCAAlB;;AAEe,kBAAUC,GAAV,EAAe;AAC5B,QAAM,EAAEC,GAAF,EAAOC,IAAP,KAAgBF,GAAtB;AACA,QAAM,EAAEG,IAAF,KAAWF,GAAG,CAACG,IAAJ,CAASC,QAAT,CAAkBC,KAAnC;AACA,QAAM,EAAEC,QAAF,KAAeL,IAArB;AACA,QAAMM,YAAY,GAAGT,SAAS,CAACU,IAAV,CAAeF,QAAf,CAArB;AACA,MAAI,CAACC,YAAL,EAAmB;AACjB;AACD;;AAED,MAAI,CAACR,GAAG,CAACU,UAAJ,CAAeC,SAAf,EAAL,EAAiC;AAC/B,UAAMX,GAAG;AACNY,IAAAA,GADG,CACC,MADD;AAEHC,IAAAA,mBAFG;AAGF,8DAHE,CAAN;;AAKD;;AAED,MAAIV,IAAI,CAACW,IAAL,CAAU,CAAAC,GAAG,KAAIA,GAAG,CAACC,KAArB,CAAJ,EAAiC;AAC/B,UAAMhB,GAAG;AACNY,IAAAA,GADG,CACC,MADD;AAEHC,IAAAA,mBAFG;AAGF,gEAHE,CAAN;;AAKD;;AAED,MAAI,gCAAkBb,GAAlB,EAAuBiB,SAA3B,EAAsC;AACpC,UAAMjB,GAAG;AACNY,IAAAA,GADG,CACC,MADD;AAEHC,IAAAA,mBAFG;AAGF,wGAHE,CAAN;;AAKD;;AAED,QAAM,CAACK,YAAD,EAAeC,IAAI,GAAG,MAAtB,IAAgCX,YAAtC;AACA,QAAMY,cAAc,GAAGF,YAAY,CAACG,MAApC;AACA,QAAMC,aAAa,GAAGf,QAAQ,CAACgB,WAAT,CAAqB,GAArB,CAAtB;AACA,QAAMC,IAAI,GAAGjB,QAAQ,CAACkB,KAAT,CAAeL,cAAf,EAA+BE,aAA/B,CAAb;AACA,QAAMI,IAAI,GAAGC,cAAKC,QAAL,CAAc3B,GAAG,CAACG,IAAJ,CAASyB,IAAT,CAAcC,QAA5B,CAAb;AACA,QAAMC,KAAK,GAAG7B,IAAI,CAAC8B,KAAL,IAAc9B,IAAI,CAAC8B,KAAL,CAAWC,SAAvC;;AAEA9B,EAAAA,IAAI,CAAC+B,IAAL,CAAU;AACRf,IAAAA,IAAI,EAAEA,IAAI,CAACM,KAAL,CAAW,CAAX,CADE;AAERD,IAAAA,IAFQ;AAGRR,IAAAA,KAAK,EAAE,IAHC;AAIRmB,IAAAA,QAAQ,EAAEJ,KAAK,GAAGX,cAJV;AAKRgB,IAAAA,MAAM,EAAEL,KAAK,GAAGT,aALR;AAMRK,IAAAA,IAAI,EAAG,KAAID,IAAK,EANR;AAORW,IAAAA,WAAW,EAAG,KAAIX,IAAI,GAAGP,IAAK,EAPtB,EAAV;;;AAUAnB,EAAAA,GAAG,CAACsC,MAAJ;AACD","sourcesContent":["import path from \"path\";\nimport getComponentFiles from \"../../util/get-component-files\";\n\nconst STYLE_REG = /^style((?:\\.[^\\s\\\\/:*?\"<>|({]+)+)?\\s*\\{/;\n\nexport default function (tag) {\n const { hub, node } = tag;\n const { deps } = hub.file.metadata.marko;\n const { rawValue } = node;\n const matchedBlock = STYLE_REG.exec(rawValue);\n if (!matchedBlock) {\n return;\n }\n\n if (!tag.parentPath.isProgram()) {\n throw tag\n .get(\"name\")\n .buildCodeFrameError(\n \"Style blocks must be at the root of your Marko template.\"\n );\n }\n\n if (deps.some(dep => dep.style)) {\n throw tag\n .get(\"name\")\n .buildCodeFrameError(\n \"A Marko file can only contain a single inline style block.\"\n );\n }\n\n if (getComponentFiles(tag).styleFile) {\n throw tag\n .get(\"name\")\n .buildCodeFrameError(\n 'A Marko file can either have an inline style block, or an external \"style.ext\" file, but not both.'\n );\n }\n\n const [startContent, type = \".css\"] = matchedBlock;\n const codeSartOffset = startContent.length;\n const codeEndOffset = rawValue.lastIndexOf(\"}\");\n const code = rawValue.slice(codeSartOffset, codeEndOffset);\n const base = path.basename(hub.file.opts.filename);\n const start = node.extra && node.extra.nameStart;\n\n deps.push({\n type: type.slice(1),\n code,\n style: true,\n startPos: start + codeSartOffset,\n endPos: start + codeEndOffset,\n path: `./${base}`,\n virtualPath: `./${base + type}`\n });\n\n tag.remove();\n}\n"],"file":"transform-style.js"}
package/package.json CHANGED
@@ -1,19 +1,19 @@
1
1
  {
2
2
  "name": "@marko/translator-default",
3
3
  "description": "Translates Marko templates to the default Marko runtime.",
4
- "version": "5.20.5",
4
+ "version": "5.20.8",
5
5
  "author": "Dylan Piercey <dpiercey@ebay.com>",
6
6
  "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md",
7
7
  "dependencies": {
8
8
  "@babel/runtime": "^7.16.0",
9
- "@marko/babel-utils": "^5.20.5",
9
+ "@marko/babel-utils": "^5.20.8",
10
10
  "escape-string-regexp": "^4.0.0",
11
11
  "magic-string": "^0.25.7",
12
12
  "self-closing-tags": "^1.0.1"
13
13
  },
14
14
  "devDependencies": {
15
- "@marko/compiler": "^5.20.5",
16
- "marko": "^5.20.5"
15
+ "@marko/compiler": "^5.20.8",
16
+ "marko": "^5.20.8"
17
17
  },
18
18
  "files": [
19
19
  "dist"
@@ -42,5 +42,5 @@
42
42
  "type": "git",
43
43
  "url": "https://github.com/marko-js/marko/tree/master/packages/translator-default"
44
44
  },
45
- "gitHead": "f7df1bcd4e65aa384733952139280f698ba7a9c9"
45
+ "gitHead": "8d1abfa37468bd28d781c2a26d49a582acba66d2"
46
46
  }