tc39 · codehag · Oct 15, 2020 · Sep 3, 2020 · Sep 3, 2020 · Sep 3, 2020
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+14
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,26 @@
-language: node_js
-node_js:
-  - "8"
+language: ruby
+
+sudo: required
+
+addons:
+  apt:
+    packages:
+      - wget
+
+jdk:
+  - openjdk14
+
+before_install:
+  - wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
+  - source ~/.bashrc
+  - nvm install
+  - node --version
 
 install:
+  - bundle install
+  - gem install jekyll
   - travis_retry npm install
 
 script:
   - npm run lint
+  - npm run check:html
diff --git a/Dockerfile b/Dockerfile
@@ -2,6 +2,9 @@ FROM ruby:2.5-alpine
 
 RUN apk add --update alpine-sdk
 
+# Install runtime dependencies in the container.
+RUN apk add --update --virtual nodejs openjdk14
+
 WORKDIR /tc39-website
 EXPOSE 8000
 

diff --git a/_data/stage3.yml b/_data/stage3.yml
@@ -204,7 +204,7 @@
   champions:
     - Ron Buckton
   example: >
-    const re1 = /a+(?<Z>z)?/;
+    const re1 = /a+(?&lt;Z&gt;z)?/;
 
     // indices are relative to start of the input string:
 

diff --git a/_includes/intro.html b/_includes/intro.html
@@ -7,7 +7,7 @@ <h2 class="section-headline">TC39</h2>
         and evolve the definition of JavaScript.
       </p><p>
         We are part of
-        </br>
+        <br/>
         <a class="ecma-logo-box" href="https://www.ecma-international.org/">
           <img src="assets/img/ecma-logo.svg" alt="Ecma International" />
         </a>

diff --git a/_includes/proposals.html b/_includes/proposals.html
@@ -32,99 +32,92 @@ <h3>Current Candidates for the Specification</h3>
           </li>
       </ul>
     </details>
+  </div>
 </article>
 
-    {% for proposal in site.data.stage3 %}
-      <article class="featurelist__item">
-        <div class="featurelist__item__intro">
-          <header class="g-row">
-            <h4 class="featurelist__item__title flex-grow">
-              <a href="https://github.com/tc39/{{ proposal.id }}">{{ proposal.title }}</a>
-            </h4>
-            <div class="featurelist__item__tags">
-              <ul class="featurelist__item__status featurelist__item__tags">
-                {% if proposal.presented | size %}
-                {% for presentation in proposal.presented %}
-                  <li class="featurelist__item__presented featurelist__item__tag">
-                    <a href="{{ presentation.url }}" title="Notes from most recent presentation">{{ presentation.date }}</a>
-                  </li>
-                {% endfor %}
-                {% endif %}
-                {% if proposal.tests | size %}
-                {% for url in proposal.tests %}
-                  <li class="featurelist__item__tests featurelist__item__tag">
-                    <a href="{{ url }}" title="Patch introducing tests in test262 repository">Test</a>
-                  </li>
-                {% endfor %}
-                {% endif %}
-                {% if proposal.has_specification %}
-                  <li class="featurelist__item__spec featurelist__item__tag">
-                    <a href="https://tc39.es/{{ proposal.id }}" title="Read the specification text">Specification</a>
-                  </li>
-                {% endif %}
-              </ul>
-            </div>
-          </header>
-          <div class="featurelist__item__author">
-            {% if proposal.authors == proposal.champions %}
-              Author and Champion:
-              {{ proposal.authors | join: ", " }}
-            {% else %}
-              {% if proposal.authors | size %}
-              {% if proposal.authors.size > 1 %}
-              Authors:
-              {% else %}
-              Author:
-              {% endif %}
-              {{ proposal.authors | join: ", " }}
-              {% endif %}
-              {% if proposal.champions | size %}
-              |
-              {% if proposal.champions.size > 1 %}
-              Champions:
-              {% else %}
-              Champion:
-              {% endif %}
-              {{ proposal.champions | join: ", " }}
-              {% endif %}
-            {% endif %}
-          </div>
-          {% if proposal.description %}
-          <div class="featurelist__item__desc">{{ proposal.description }}</div>
+{% for proposal in site.data.stage3 %}
+<article class="featurelist__item">
+  <div class="featurelist__item__intro">
+    <header class="g-row">
+      <h4 class="featurelist__item__title flex-grow">
+        <a href="https://github.com/tc39/{{ proposal.id }}">{{ proposal.title }}</a>
+      </h4>
+      <div class="featurelist__item__tags">
+        <ul class="featurelist__item__status featurelist__item__tags">
+          {% if proposal.presented | size %}
+          {% for presentation in proposal.presented %}
+            <li class="featurelist__item__presented featurelist__item__tag">
+              <a href="{{ presentation.url }}" title="Notes from most recent presentation">{{ presentation.date }}</a>
+            </li>
+          {% endfor %}
           {% endif %}
-          {% if proposal.example %}
-          <div
-            class="featurelist__item__example"
-            aria-controls="example-{{ proposal.id }}"
-            aria-expanded="false"
-            tabindex="0"
-            id="example-toggle-{{ proposal.id }}"
-            aria-selected="false"
-          >
-            Show Example
-          </div>
+          {% if proposal.tests | size %}
+          {% for url in proposal.tests %}
+            <li class="featurelist__item__tests featurelist__item__tag">
+              <a href="{{ url }}" title="Patch introducing tests in test262 repository">Test</a>
+            </li>
+          {% endfor %}
           {% endif %}
-          <section
-            class="featurelist__item__info"
-            id="example-{{ proposal.id }}"
-            role="region"
-            aria-hidden="true"
-            aria-labelledby="example-toggle-{{ proposal.id }}"
-          >
-            {% if proposal.example %}
-              <div>
-                <div>
-                  <pre><code class="js" tabindex="-1">{{ proposal.example }}</code></pre>
-                </div>
-              </div>
-            {% endif %}
-          </div>
-      </article>
-    {% endfor %}
+          {% if proposal.has_specification %}
+            <li class="featurelist__item__spec featurelist__item__tag">
+              <a href="https://tc39.es/{{ proposal.id }}" title="Read the specification text">Specification</a>
+            </li>
+          {% endif %}
+        </ul>
+      </div>
+    </header>
+    <div class="featurelist__item__author">
+      {% if proposal.authors == proposal.champions %}
+        Author and Champion:
+        {{ proposal.authors | join: ", " }}
+      {% else %}
+        {% if proposal.authors | size %}
+        {% if proposal.authors.size > 1 %}
+        Authors:
+        {% else %}
+        Author:
+        {% endif %}
+        {{ proposal.authors | join: ", " }}
+        {% endif %}
+        {% if proposal.champions | size %}
+        |
+        {% if proposal.champions.size > 1 %}
+        Champions:
+        {% else %}
+        Champion:
+        {% endif %}
+        {{ proposal.champions | join: ", " }}
+        {% endif %}
+      {% endif %}
+    </div>
+    {% if proposal.description %}
+    <div class="featurelist__item__desc">{{ proposal.description }}</div>
+    {% endif %}
+    {% if proposal.example %}
+    <div
+      class="featurelist__item__example"
+      aria-controls="example-{{ proposal.id }}"
+      aria-expanded="false"
+      role="button"
+      tabindex="0"
+      id="example-toggle-{{ proposal.id }}"
+    >
+      Show Example
+    </div>
+    <section
+      class="featurelist__item__info"
+      id="example-{{ proposal.id }}"
+      aria-hidden="true"
+      aria-labelledby="example-toggle-{{ proposal.id }}"
+    >
+      <pre><code class="js" tabindex="-1">{{ proposal.example }}</code></pre>
+    </section>
+    {% endif %}
   </div>
-  <section class="featurelist__more">
-    <a href="https://github.com/tc39/proposals">
-      See proposals in all stages
-    </a>
-  </section>
+</article>
+{% endfor %}
+<section class="featurelist__more">
+  <a href="https://github.com/tc39/proposals">
+    See proposals in all stages
+  </a>
 </section>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -7,12 +7,12 @@
     <title>TC39 – Specifying JavaScript.</title>
     <link rel="icon" type="image/png" href="favicon-32x32.png" sizes="32x32" />
     <link rel="icon" type="image/png" href="favicon-16x16.png" sizes="16x16" />
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600|Source+Sans+Pro:300,400,600" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;400;600&family=Source+Sans+Pro:wght@300;400;600&display=swap" rel="stylesheet">
     <link rel="stylesheet" href="{{ '/assets/css/normalize.css' | relative_url }}">
     <link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
-    <script defer src="{{ '/assets/js/main.js?v=' | append: site.github.build_revision | relative_url }}" type="text/javascript"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script>
+    <script defer src="{{ '/assets/js/main.js?v=' | append: site.github.build_revision | relative_url }}"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
   </head>
   <body class="no-js">

diff --git a/_layouts/page_footer.html b/_layouts/page_footer.html
@@ -58,6 +58,6 @@ <h3 id="contribute-label">Contribute</h3>
         <li><a href="https://tc39.es/code-of-conduct">Code of Conduct</a></li>
       </ul>
       <span>&copy; Ecma International</span>
-    </div>
+    </nav>
   </div>
 </footer>
diff --git a/_tasks/check-html.mjs b/_tasks/check-html.mjs
@@ -0,0 +1,4 @@
+import { execSync } from 'child_process';
+import vnu from 'vnu-jar';
+
+process.exitCode = await execSync(`java -jar ${vnu} _site/index.html`);
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,6 +8,7 @@
     "lint": "npm run lint:js && npm run lint:scss",
     "lint:js": "prettier -c --loglevel warn **/*.js",
     "lint:scss": "stylelint _sass",
+    "check:html": "bundle exec jekyll build && node _tasks/check-html.mjs",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
@@ -20,11 +21,15 @@
     "url": "https://github.com/tc39/tc39.github.io/issues"
   },
   "homepage": "https://tc39.es/",
+  "engines": {
+    "node": ">=14.8"
+  },
   "devDependencies": {
     "prettier": "^1.17.1",
     "stylelint": "^10.0.1",
     "stylelint-config-prettier": "^5.2.0",
     "stylelint-config-standard": "^18.3.0",
-    "stylelint-order": "^3.0.0"
+    "stylelint-order": "^3.0.0",
+    "vnu-jar": "20.6.30"
   }
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		14
DerekNonGeneric marked this conversation as resolved. Show resolved Hide resolved