@parcel/transformer-posthtml 2.0.0-beta.3.1 → 2.0.0-nightly.1002

package/lib/PostHTMLTransformer.js

@@ -36,7 +36,7 @@ function _posthtml() {
 }
 
 function _posthtmlParser() {
-  const data = _interopRequireDefault(require("posthtml-parser"));
+  const data = require("posthtml-parser");
 
   _posthtmlParser = function () {
     return data;
@@ -46,7 +46,7 @@ function _posthtmlParser() {
 }
 
 function _posthtmlRender() {
-  const data = _interopRequireDefault(require("posthtml-render"));
+  const data = require("posthtml-render");
 
   _posthtmlRender = function () {
     return data;
@@ -85,15 +85,7 @@ function _utils() {
   return data;
 }
 
-function _loadPlugins() {
-  const data = _interopRequireDefault(require("./loadPlugins"));
-
-  _loadPlugins = function () {
-    return data;
-  };
-
-  return data;
-}
+var _loadPlugins = _interopRequireDefault(require("./loadPlugins"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -103,6 +95,10 @@ var _default = new (_plugin().Transformer)({
     options,
     logger
   }) {
+    if (!config.isSource) {
+      return;
+    }
+
     let configFile = await config.getConfig(['.posthtmlrc', '.posthtmlrc.js', 'posthtml.config.js'], {
       packageKey: 'posthtml'
     });
@@ -116,23 +112,23 @@ var _default = new (_plugin().Transformer)({
         logger.warn({
           message: 'WARNING: Using a JavaScript PostHTML config file means losing out on caching features of Parcel. Use a .posthtmlrc (JSON) file whenever possible.'
         });
-        config.shouldInvalidateOnStartup(); // Also add the config as a dev dependency so we attempt to reload in watch mode.
+        config.invalidateOnStartup(); // Also add the config as a dev dependency so we attempt to reload in watch mode.
 
         config.addDevDependency({
-          moduleSpecifier: (0, _utils().relativePath)(_path().default.dirname(config.searchPath), configFile.filePath),
+          specifier: (0, _utils().relativePath)(_path().default.dirname(config.searchPath), configFile.filePath),
           resolveFrom: config.searchPath
         });
       } // Load plugins. This must be done before adding dev dependencies so we auto install.
 
 
-      let plugins = await (0, _loadPlugins().default)(configFile.contents.plugins, config.searchPath, options); // Now add dev dependencies so we invalidate when they change.
+      let plugins = await (0, _loadPlugins.default)(configFile.contents.plugins, config.searchPath, options); // Now add dev dependencies so we invalidate when they change.
 
       let pluginArray = Array.isArray(configFile.contents.plugins) ? configFile.contents.plugins : Object.keys(configFile.contents.plugins);
 
       for (let p of pluginArray) {
         if (typeof p === 'string') {
           config.addDevDependency({
-            moduleSpecifier: p,
+            specifier: p,
             resolveFrom: configFile.filePath
           });
         }
@@ -142,7 +138,7 @@ var _default = new (_plugin().Transformer)({
 
       configFile.contents.skipParse = true;
       delete configFile.contents.render;
-      config.setResult(configFile.contents);
+      return configFile.contents;
     }
   },
 
@@ -164,8 +160,10 @@ var _default = new (_plugin().Transformer)({
     return {
       type: 'posthtml',
       version: '0.4.1',
-      program: (0, _posthtmlParser().default)(await asset.getCode(), {
-        lowerCaseAttributeNames: true
+      program: (0, _posthtmlParser().parser)(await asset.getCode(), {
+        lowerCaseAttributeNames: true,
+        sourceLocations: true,
+        xmlMode: asset.type === 'xhtml'
       })
     };
   },
@@ -189,7 +187,7 @@ var _default = new (_plugin().Transformer)({
         file: filePath
       }) => {
         if (type === 'dependency') {
-          return asset.addIncludedFile(filePath);
+          return asset.invalidateOnFileChange(filePath);
         }
 
         return Promise.resolve();
@@ -206,10 +204,13 @@ var _default = new (_plugin().Transformer)({
   },
 
   generate({
-    ast
+    ast,
+    asset
   }) {
     return {
-      content: (0, _posthtmlRender().default)(ast.program)
+      content: (0, _posthtmlRender().render)(ast.program, {
+        closingSingleTag: asset.type === 'xhtml' ? 'slash' : undefined
+      })
     };
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/transformer-posthtml",
-  "version": "2.0.0-beta.3.1",
+  "version": "2.0.0-nightly.1002+5530a6ef",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,16 +17,16 @@
   "source": "src/PostHTMLTransformer.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "^2.0.0-beta.1"
+    "parcel": "2.0.0-nightly.1000+5530a6ef"
   },
   "dependencies": {
-    "@parcel/plugin": "2.0.0-beta.3.1",
-    "@parcel/utils": "2.0.0-beta.3.1",
+    "@parcel/plugin": "2.0.0-nightly.1002+5530a6ef",
+    "@parcel/utils": "2.0.0-nightly.1002+5530a6ef",
     "nullthrows": "^1.1.1",
-    "posthtml": "^0.15.1",
-    "posthtml-parser": "^0.6.0",
-    "posthtml-render": "^1.4.0",
-    "semver": "^5.4.1"
+    "posthtml": "^0.16.5",
+    "posthtml-parser": "^0.10.1",
+    "posthtml-render": "^3.0.0",
+    "semver": "^5.7.1"
   },
-  "gitHead": "daece49d003ba804bbdaa3a7ed3d6aaf446f166d"
+  "gitHead": "5530a6eff8b619873353baeb0457ae4ec591e9fa"
 }

package/src/PostHTMLTransformer.js

@@ -4,8 +4,8 @@ import {Transformer} from '@parcel/plugin';
 
 import path from 'path';
 import posthtml from 'posthtml';
-import parse from 'posthtml-parser';
-import render from 'posthtml-render';
+import {parser as parse} from 'posthtml-parser';
+import {render} from 'posthtml-render';
 import nullthrows from 'nullthrows';
 import semver from 'semver';
 import {relativePath} from '@parcel/utils';
@@ -13,6 +13,10 @@ import loadPlugins from './loadPlugins';
 
 export default (new Transformer({
   async loadConfig({config, options, logger}) {
+    if (!config.isSource) {
+      return;
+    }
+
     let configFile = await config.getConfig(
       ['.posthtmlrc', '.posthtmlrc.js', 'posthtml.config.js'],
       {
@@ -30,11 +34,11 @@ export default (new Transformer({
             'WARNING: Using a JavaScript PostHTML config file means losing out on caching features of Parcel. Use a .posthtmlrc (JSON) file whenever possible.',
         });
 
-        config.shouldInvalidateOnStartup();
+        config.invalidateOnStartup();
 
         // Also add the config as a dev dependency so we attempt to reload in watch mode.
         config.addDevDependency({
-          moduleSpecifier: relativePath(
+          specifier: relativePath(
             path.dirname(config.searchPath),
             configFile.filePath,
           ),
@@ -56,7 +60,7 @@ export default (new Transformer({
       for (let p of pluginArray) {
         if (typeof p === 'string') {
           config.addDevDependency({
-            moduleSpecifier: p,
+            specifier: p,
             resolveFrom: configFile.filePath,
           });
         }
@@ -68,7 +72,7 @@ export default (new Transformer({
       configFile.contents.skipParse = true;
       delete configFile.contents.render;
 
-      config.setResult(configFile.contents);
+      return configFile.contents;
     }
   },
 
@@ -87,6 +91,8 @@ export default (new Transformer({
       version: '0.4.1',
       program: parse(await asset.getCode(), {
         lowerCaseAttributeNames: true,
+        sourceLocations: true,
+        xmlMode: asset.type === 'xhtml',
       }),
     };
   },
@@ -106,7 +112,7 @@ export default (new Transformer({
       await Promise.all(
         res.messages.map(({type, file: filePath}) => {
           if (type === 'dependency') {
-            return asset.addIncludedFile(filePath);
+            return asset.invalidateOnFileChange(filePath);
           }
           return Promise.resolve();
         }),
@@ -122,9 +128,11 @@ export default (new Transformer({
     return [asset];
   },
 
-  generate({ast}) {
+  generate({ast, asset}) {
     return {
-      content: render(ast.program),
+      content: render(ast.program, {
+        closingSingleTag: asset.type === 'xhtml' ? 'slash' : undefined,
+      }),
     };
   },
 }): Transformer);