@shijiu/jsview-vue 0.9.280 → 0.9.286-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview-vue",
-  "version": "0.9.280",
+  "version": "0.9.286-alpha.0",
   "bin": {
     "jsview-post-build": "./scripts/jsview-post-build.js",
     "jsview-post-install": "./scripts/jsview-post-install.js",

package/patches/node_modules/@vue/compiler-sfc/dist/jsview-css-to-js.js

@@ -16,8 +16,6 @@ var postCssImport = _interopDefaultLegacy(require('postcss-import-sync'));
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e['default'] : e; }
 
-const adaptPath = (path.posix || path);
-
 var nodeModulesDir = path.resolve(process.cwd(), 'node_modules')
 var cachedCssStyles = {}
 
@@ -109,7 +107,7 @@ function compileCssToJs(sfc, options) {
                 checkSelectors(node, styleInfo.styleFilePath, styleInfo.styleSelectors); // 检测selector是否已经处理过
                 let styleJsFilePath = path.relative(nodeModulesDir, styleInfo.styleJsFilePath);
                 styleJsFilePath = styleJsFilePath.replace(/\\/g, '/');
-                styleImportContainer += `\nimport "${path.relative(nodeModulesDir, styleInfo.styleJsFilePath)}";`
+                styleImportContainer += `\nimport "${styleJsFilePath}";`
             } else if(node.name === "keyframes") {
                 const styleFilePath = node.source.input.file;
                 const styleSelectors = new Set([node.params]);
@@ -201,9 +199,9 @@ function compileImportNode(node) {
         throw e;
     }
 
-    const sourceDir = adaptPath.dirname(node.source.input.file);
+    const sourceDir = path.dirname(node.source.input.file);
     let styleFileName = node.params.replace(/^["'](.+(?=["']$))["']$/, '$1')
-    const styleFilePath = adaptPath.resolve(sourceDir, styleFileName);
+    const styleFilePath = path.resolve(sourceDir, styleFileName);
     return compileAndSaveImportedNode(styleFilePath, result.root.nodes);
 }
 
@@ -212,7 +210,9 @@ function compileAndSaveImportedNode(styleFilePath, styleNodes) {
     let styleContent = "";
 
     styleNodes.forEach(node => {
-        if(!!node.selector) {
+        if(node.name === "keyframes") {
+            styleContent += compileKeyframesNode(node);
+        } else if(!!node.selector) {
             styleContent += compileSelectorNode(node);
             styleSelectors.add(node.selector);
         } else {
@@ -225,8 +225,8 @@ function compileAndSaveImportedNode(styleFilePath, styleNodes) {
     if (!fs.existsSync(cacheDir)) {
         fs.mkdirSync(cacheDir);
     }
-    const styleJsFileName = adaptPath.basename(styleFilePath) + `.${hash(styleFilePath)}.js`;
-    const styleJsFilePath = adaptPath.join(cacheDir, styleJsFileName);
+    const styleJsFileName = path.basename(styleFilePath) + `.${hash(styleFilePath)}.js`;
+    const styleJsFilePath = path.join(cacheDir, styleJsFileName);
 
     styleContent = "\nObject.assign(window.JsvCode.Dom.StyleSheets, {" + styleContent;
     styleContent += "});\n";
@@ -239,13 +239,39 @@ function compileAndSaveImportedNode(styleFilePath, styleNodes) {
     };
 }
 
+function getStringOffset(source, line, column) {
+    check(!isNaN(line), source, "JsView Error: Failed to get string offset, line is NaN.");
+    check(!isNaN(column), source, "JsView Error: Failed to get string offset, column is NaN.");
+
+    line -= 1;
+    column -= 1;
+
+    var offset = 0;
+    for (var idx = 0; idx < line; idx++) {
+        offset = source.indexOf('\n', offset + 1);
+        check(offset >= 0, source, "JsView Error: Failed to get string offset, line=" + line + ", column=" + column);
+    }
+    offset += column;
+
+    return offset;
+}
+
 function compileKeyframesNode(node) {
     const name = node.name;
     check(name, node.source.input.css, "JsView Error: name is not found!");
 
     check(name === "keyframes", node.source.input.css, "JsView Error: @keyframes name is not found!");
 
-    const content = node.source.input.css.slice(node.source.start.offset, node.source.end.offset + 1);
+    let startOffset = node.source.start.offset;
+    let endOffset = node.source.end.offset;
+    if (typeof (startOffset) == 'undefined') {
+        startOffset = getStringOffset(node.source.input.css, node.source.start.line, node.source.start.column);
+    }
+    if (typeof (endOffset) == 'undefined') {
+        endOffset = getStringOffset(node.source.input.css, node.source.end.line, node.source.end.column);
+    }
+    const content = node.source.input.css.slice(startOffset, endOffset + 1);
+    // console.log('jsview-css-to-js.compileKeyframesNode() \n', startOffset, endOffset, content);
 
     let styleContent = "'" + node.params + "':'";
     styleContent += content.replace(/\n/g, " ");

package/utils/JsViewVueWidget/JsvVideo.vue

@@ -16,7 +16,6 @@ import { Options, Vue } from "vue-class-component";
   props: {
     onRef: { type: Function, default: () => {} },
     useTexture: { type: Boolean, default: false },
-    autoplay: { type: String, default: undefined },
   },
 })
 class JsvVideo extends Vue {