@angular/ssr 22.0.0-next.7 → 22.0.0-next.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/ssr",
-  "version": "22.0.0-next.7",
+  "version": "22.0.0-next.8",
   "description": "Angular server side rendering utilities",
   "type": "module",
   "license": "MIT",
@@ -29,12 +29,12 @@
   },
   "devDependencies": {
     "@angular-devkit/schematics": "workspace:*",
-    "@angular/common": "22.0.0-next.9",
-    "@angular/compiler": "22.0.0-next.9",
-    "@angular/core": "22.0.0-next.9",
-    "@angular/platform-browser": "22.0.0-next.9",
-    "@angular/platform-server": "22.0.0-next.9",
-    "@angular/router": "22.0.0-next.9",
+    "@angular/common": "22.0.0-next.12",
+    "@angular/compiler": "22.0.0-next.12",
+    "@angular/core": "22.0.0-next.12",
+    "@angular/platform-browser": "22.0.0-next.12",
+    "@angular/platform-server": "22.0.0-next.12",
+    "@angular/router": "22.0.0-next.12",
     "@schematics/angular": "workspace:*",
     "beasties": "0.4.2"
   },

package/third_party/beasties/index.js

@@ -636,11 +636,12 @@ function requireStringifier () {
 	  }
 
 	  atrule(node, semicolon) {
+	    let raws = node.raws;
 	    let name = '@' + node.name;
 	    let params = node.params ? this.rawValue(node, 'params') : '';
 
-	    if (typeof node.raws.afterName !== 'undefined') {
-	      name += node.raws.afterName;
+	    if (typeof raws.afterName !== 'undefined') {
+	      name += raws.afterName;
 	    } else if (params) {
 	      name += ' ';
 	    }
@@ -648,7 +649,7 @@ function requireStringifier () {
 	    if (node.nodes) {
 	      this.block(node, name + params);
 	    } else {
-	      let end = (node.raws.between || '') + (semicolon ? ';' : '');
+	      let end = (raws.between || '') + (semicolon ? ';' : '');
 	      this.builder(escapeHTMLInCSS(name + params + end), node);
 	    }
 	  }
@@ -699,16 +700,17 @@ function requireStringifier () {
 	  }
 
 	  body(node) {
-	    let last = node.nodes.length - 1;
+	    let nodes = node.nodes;
+	    let last = nodes.length - 1;
 	    while (last > 0) {
-	      if (node.nodes[last].type !== 'comment') break
+	      if (nodes[last].type !== 'comment') break
 	      last -= 1;
 	    }
 
 	    let semicolon = this.raw(node, 'semicolon');
 	    let isDocument = node.type === 'document';
-	    for (let i = 0; i < node.nodes.length; i++) {
-	      let child = node.nodes[i];
+	    for (let i = 0; i < nodes.length; i++) {
+	      let child = nodes[i];
 	      let before = this.raw(child, 'before');
 	      if (before) this.builder(isDocument ? before : escapeHTMLInCSS(before));
 	      this.stringify(child, last !== i || semicolon);
@@ -722,11 +724,13 @@ function requireStringifier () {
 	  }
 
 	  decl(node, semicolon) {
+	    let raws = node.raws;
 	    let between = this.raw(node, 'between', 'colon');
+
 	    let string = node.prop + between + this.rawValue(node, 'value');
 
 	    if (node.important) {
-	      string += node.raws.important || ' !important';
+	      string += raws.important || ' !important';
 	    }
 
 	    if (semicolon) string += ';';
@@ -766,9 +770,9 @@ function requireStringifier () {
 
 	    // Detect style by other nodes
 	    let root = node.root();
-	    if (!root.rawCache) root.rawCache = {};
-	    if (typeof root.rawCache[detect] !== 'undefined') {
-	      return root.rawCache[detect]
+	    let cache = root.rawCache || (root.rawCache = {});
+	    if (typeof cache[detect] !== 'undefined') {
+	      return cache[detect]
 	    }
 
 	    if (detect === 'before' || detect === 'after') {
@@ -787,7 +791,7 @@ function requireStringifier () {
 
 	    if (typeof value === 'undefined') value = DEFAULT_RAW[detect];
 
-	    root.rawCache[detect] = value;
+	    cache[detect] = value;
 	    return value
 	  }
 
@@ -2108,6 +2112,7 @@ function requirePreviousMap () {
 	class PreviousMap {
 	  constructor(css, opts) {
 	    if (opts.map === false) return
+	    if (opts.unsafeMap) this.unsafeMap = true;
 	    this.loadAnnotation(css);
 	    this.inline = this.startWith(this.annotation, 'data:');
 
@@ -2122,7 +2127,7 @@ function requirePreviousMap () {
 
 	  consumer() {
 	    if (!this.consumerCache) {
-	      this.consumerCache = new SourceMapConsumer(this.text);
+	      this.consumerCache = new SourceMapConsumer(this.json || this.text);
 	    }
 	    return this.consumerCache
 	  }
@@ -2175,7 +2180,13 @@ function requirePreviousMap () {
 	    }
 	  }
 
-	  loadFile(path) {
+	  loadFile(path, cssFile, trusted) {
+	    /* c8 ignore next 5 */
+	    if (!trusted && !this.unsafeMap) {
+	      if (!/\.map$/i.test(path)) {
+	        return undefined
+	      }
+	    }
 	    this.root = dirname(path);
 	    if (existsSync(path)) {
 	      this.mapFile = path;
@@ -2192,7 +2203,7 @@ function requirePreviousMap () {
 	      } else if (typeof prev === 'function') {
 	        let prevPath = prev(file);
 	        if (prevPath) {
-	          let map = this.loadFile(prevPath);
+	          let map = this.loadFile(prevPath, file, true);
 	          if (!map) {
 	            throw new Error(
 	              'Unable to load previous source map: ' + prevPath.toString()
@@ -2216,7 +2227,16 @@ function requirePreviousMap () {
 	    } else if (this.annotation) {
 	      let map = this.annotation;
 	      if (file) map = join(dirname(file), map);
-	      return this.loadFile(map)
+	      let unknown = this.loadFile(map, file, false);
+	      if (unknown) {
+	        try {
+	          /* c8 ignore next 4 */
+	          this.json = JSON.parse(unknown.replace(/^\)]}'[^\n]*\n/, ''));
+	        } catch {
+	          return undefined
+	        }
+	      }
+	      return unknown
 	    }
 	  }
 
@@ -3178,6 +3198,7 @@ function requireTokenize () {
 	  let pos = 0;
 	  let buffer = [];
 	  let returned = [];
+	  let lastBadParen = -1;
 
 	  function position() {
 	    return pos
@@ -3269,11 +3290,14 @@ function requireTokenize () {
 	          currentToken = ['brackets', css.slice(pos, next + 1), pos, next];
 
 	          pos = next;
+	        } else if (pos <= lastBadParen) {
+	          currentToken = ['(', '(', pos];
 	        } else {
 	          next = css.indexOf(')', pos + 1);
 	          content = css.slice(pos, next + 1);
 
 	          if (next === -1 || RE_BAD_BRACKET.test(content)) {
+	            lastBadParen = next === -1 ? length : next;
 	            currentToken = ['(', '(', pos];
 	          } else {
 	            currentToken = ['brackets', content, pos, next];
@@ -4580,6 +4604,19 @@ function requireLazyResult () {
 	    if (opts.stringifier) str = opts.stringifier;
 	    if (str.stringify) str = str.stringify;
 
+	    let rootSource = this.result.root.source;
+	    if (
+	      opts.map === undefined &&
+	      !(rootSource && rootSource.input && rootSource.input.map)
+	    ) {
+	      let result = '';
+	      str(this.result.root, i => {
+	        result += i;
+	      });
+	      this.result.css = result;
+	      return this.result
+	    }
+
 	    let map = new MapGenerator(str, this.result.root, this.result.opts);
 	    let data = map.generate();
 	    this.result.css = data[0];
@@ -4912,7 +4949,7 @@ function requireProcessor () {
 
 	class Processor {
 	  constructor(plugins = []) {
-	    this.version = '8.5.10';
+	    this.version = '8.5.14';
 	    this.plugins = this.normalize(plugins);
 	  }