fix: doctype option was not validated correctly (#3468)

ForbesLindesay · web-flow · commit 94d731f6caa0 · 2026-03-13T15:07:59.000Z
diff --git a/.github/workflows/rollingversions-canary.yml b/.github/workflows/rollingversions-canary.yml
diff --git a/.github/workflows/rollingversions.yml b/.github/workflows/rollingversions.yml
@@ -1,5 +1,8 @@
 name: Release
 on:
+  push:
+    branches:
+      - master
   repository_dispatch:
     types: [rollingversions_publish_approved]
 
@@ -21,18 +24,35 @@ jobs:
       - run: yarn prettier:check
       - run: yarn test
 
+
+  publish-canary:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'push' }}
+    needs: test
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 24.x
+          registry-url: 'https://registry.npmjs.org'
+      - run: yarn install --frozen-lockfile
+      - run: yarn build
+      - run: npx rollingversions publish --canary $GITHUB_RUN_NUMBER
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   publish:
     runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'repository_dispatch' }}
     needs: test
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 24.x
           registry-url: 'https://registry.npmjs.org'
       - run: yarn install --frozen-lockfile
       - run: yarn build
       - run: npx rollingversions publish
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/packages/pug-code-gen/index.js b/packages/pug-code-gen/index.js
@@ -72,8 +72,8 @@ function Compiler(node, options) {
     );
   }
   if (
-    this.doctype &&
-    (this.doctype.includes('<') || this.doctype.includes('>'))
+    this.options.doctype &&
+    (this.options.doctype.includes('<') || this.options.doctype.includes('>'))
   ) {
     throw new Error('Doctype can not contain "<" or ">"');
   }
@@ -209,7 +209,9 @@ Compiler.prototype = {
    */
 
   setDoctype: function(name) {
-    this.doctype = doctypes[name.toLowerCase()] || '<!DOCTYPE ' + name + '>';
+    this.doctype = doctypes.hasOwnProperty(name.toLowerCase())
+      ? doctypes[name.toLowerCase()]
+      : '<!DOCTYPE ' + name + '>';
     this.terse = this.doctype.toLowerCase() == '<!doctype html>';
     this.xml = 0 == this.doctype.indexOf('<?xml');
   },
