diff --git a/package.json b/package.json index 28939705..0d08d8e9 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "/lib", "/js", "/css", + "/img", "/fonts", "/boilerplate", "/entities-processed.json" diff --git a/src/Spec.ts b/src/Spec.ts index c54afd19..1d37c032 100644 --- a/src/Spec.ts +++ b/src/Spec.ts @@ -1030,6 +1030,7 @@ ${await utils.readFile(path.join(__dirname, '../js/multipage.js'))} private async buildAssets(jsContents: string, jsSha: string) { if (this.assets.type === 'none') return; + this.log('Building assets...'); // check for very old manual 'ecmarkup.js'/'ecmarkup.css' const oldEles = this.doc.querySelectorAll( diff --git a/src/utils.ts b/src/utils.ts index 53f6dcc9..68e32def 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -75,7 +75,11 @@ export function emdTextNode(spec: Spec, node: Text, namespace: string) { /*@internal*/ export function htmlToDom(html: string) { - return new jsdom.JSDOM(html, { includeNodeLocations: true }); + const virtualConsole = new jsdom.VirtualConsole(); + virtualConsole.on('error', () => { + // Suppress warnings from e.g. CSS features not supported by JSDOM + }); + return new jsdom.JSDOM(html, { includeNodeLocations: true, virtualConsole }); } /*@internal*/ diff --git a/test/baselines/generated-reference/assets-inline.html b/test/baselines/generated-reference/assets-inline.html new file mode 100644 index 00000000..5cee3295 --- /dev/null +++ b/test/baselines/generated-reference/assets-inline.html @@ -0,0 +1,3244 @@ + +
+
+ +

Intro

+

This is a section.

+
+ +

A Copyright & Software License

+ +

Copyright Notice

+

© 1997 Ecma

+ +

Software License

+

All Software contained in this document ("Software") is protected by copyright and is being made available under the "BSD License", included below. This Software may be subject to third party rights (rights from parties other than Ecma International), including patent rights, and no licenses under such third party rights are granted under this license even if the third party concerned is a member of Ecma International. SEE THE ECMA CODE OF CONDUCT IN PATENT MATTERS AVAILABLE AT https://ecma-international.org/memento/codeofconduct.htm FOR INFORMATION REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO IMPLEMENT ECMA INTERNATIONAL STANDARDS.

+ +

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

+ +
    +
  1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
  2. +
  3. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
  4. +
  5. Neither the name of the authors nor Ecma International may be used to endorse or promote products derived from this software without specific prior written permission.
  6. +
+ +

THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ECMA INTERNATIONAL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ +
\ No newline at end of file diff --git a/test/baselines/sources/assets-inline.html b/test/baselines/sources/assets-inline.html new file mode 100644 index 00000000..3516eee4 --- /dev/null +++ b/test/baselines/sources/assets-inline.html @@ -0,0 +1,11 @@ +
+    toc: true
+    date: 1997-06-01
+    copyright: true
+    contributors: Ecma
+    assets: inline
+
+ +

Intro

+

This is a section.

+