1.3.14 release

ractivejs · Dec 12, 2020 · b2579d6 · b2579d6
1 parent ca82cb1
commit b2579d6
Show file tree

Hide file tree

Showing 17 changed files with 8,796 additions and 8,764 deletions.
diff --git a/bin/ractive.js b/bin/ractive.js
@@ -20,8 +20,15 @@ const opts = {
   base: process.cwd()
 };
 
-function readFile(name) {
-  return Promise.resolve(fs.readFileSync(path.resolve(opts.base, name), { encoding: 'utf8' }));
+function mkReadFile(file) {
+  const base = path.isAbsolute(file)
+    ? path.dirname(file)
+    : path.join(opts.base, path.dirname(file));
+  return function readFile(name) {
+    return Promise.resolve(
+      fs.readFileSync(path.isAbsolute(name) ? name : path.join(base, name), { encoding: 'utf8' })
+    );
+  };
 }
 
 function dirIndexOrFile(name) {
@@ -76,14 +83,16 @@ const commands = {
             util
               .readToString(fs.createReadStream(path.join(opts.directory, f)))
               .then(string => {
-                return component.build(string, opts, readFile).then(string => {
-                  const file = path.join(
-                    opts.output,
-                    f.replace(ext, opts.outputExtension || '.js')
-                  );
-                  util.mkdirp(path.dirname(file));
-                  util.writeToStream(fs.createWriteStream(file), string);
-                });
+                return component
+                  .build(string, opts, mkReadFile(path.join(opts.directory, f)))
+                  .then(string => {
+                    const file = path.join(
+                      opts.output,
+                      f.replace(ext, opts.outputExtension || '.js')
+                    );
+                    util.mkdirp(path.dirname(file));
+                    util.writeToStream(fs.createWriteStream(file), string);
+                  });
               })
               .then(step, err => {
                 console.error(err && typeof err === 'object' ? err.stack : err);
@@ -98,7 +107,7 @@ const commands = {
           .readToString(opts.input)
           .then(string => {
             return component
-              .build(string, opts, readFile)
+              .build(string, opts, mkReadFile(''))
               .then(string => util.writeToStream(opts.output, string));
           })
           .then(null, err => {

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "ractive",
   "description": "Next-generation DOM manipulation",
-  "version": "1.2.10",
+  "version": "1.3.14",
   "homepage": "https://ractive.js.org",
   "license": "MIT",
   "main": "ractive.js",

diff --git a/lib/component.js b/lib/component.js
@@ -63,7 +63,7 @@ function build(string, opts, readFile) {
 
   const promises = [];
 
-  // walk the template finding any script, style, or link tags to process them as appropriate
+  // walk the template finding any script, style, template, or link tags to process them as appropriate
   let i = tpl.t.length;
   while (i--) {
     const item = tpl.t[i];
@@ -112,7 +112,12 @@ function build(string, opts, readFile) {
       } else if (item.e === 'template') {
         const id = getAttr('id', item) || getAttr('name', item);
         if (id) {
-          partials[id] = item.f ? item.f[0] : '';
+          const src = getAttr('src', item);
+          if (src) {
+            promises.push(readFile(src).then(str => !partials[id] && (partials[id] = str)));
+          } else {
+            partials[id] = item.f ? item.f[0] : '';
+          }
         }
 
         i = drop(i, tpl.t);
@@ -163,6 +168,23 @@ function build(string, opts, readFile) {
 
       const t = Ractive.parse(partials[k], opts);
 
+      // extract any styles
+      i = t.t.length;
+      while (i--) {
+        if (t.e === 'style') {
+          const item = t.e[i];
+          const rel = getAttr('rel', item);
+
+          if (rel === 'ractive') {
+            style.unshift({ type: 'tpl', body: item.f[0] });
+          } else {
+            style.unshift({ type: 'css', body: item.f[0] || '' });
+          }
+
+          i = drop(i, tpl.t);
+        }
+      }
+
       // copy any expressions
       if (t.e) {
         if (!tpl.e) tpl.e = {};

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ractive",
   "description": "Next-generation DOM manipulation",
-  "version": "1.2.10",
+  "version": "1.3.14",
   "homepage": "https://ractive.js.org",
   "license": "MIT",
   "main": "ractive.js",