@parcel/transformer-posthtml 2.0.0-beta.3.1 → 2.0.0-dev.1515

package/lib/PostHTMLTransformer.js

@@ -4,154 +4,105 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _plugin() {
   const data = require("@parcel/plugin");
-
   _plugin = function () {
     return data;
   };
-
   return data;
 }
-
 function _path() {
   const data = _interopRequireDefault(require("path"));
-
   _path = function () {
     return data;
   };
-
   return data;
 }
-
 function _posthtml() {
   const data = _interopRequireDefault(require("posthtml"));
-
   _posthtml = function () {
     return data;
   };
-
   return data;
 }
-
 function _posthtmlParser() {
-  const data = _interopRequireDefault(require("posthtml-parser"));
-
+  const data = require("posthtml-parser");
   _posthtmlParser = function () {
     return data;
   };
-
   return data;
 }
-
 function _posthtmlRender() {
-  const data = _interopRequireDefault(require("posthtml-render"));
-
+  const data = require("posthtml-render");
   _posthtmlRender = function () {
     return data;
   };
-
   return data;
 }
-
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
-
   _nullthrows = function () {
     return data;
   };
-
   return data;
 }
-
 function _semver() {
   const data = _interopRequireDefault(require("semver"));
-
   _semver = function () {
     return data;
   };
-
-  return data;
-}
-
-function _utils() {
-  const data = require("@parcel/utils");
-
-  _utils = function () {
-    return data;
-  };
-
-  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 }; }
-
-var _default = new (_plugin().Transformer)({
+var _default = exports.default = new (_plugin().Transformer)({
   async loadConfig({
     config,
     options,
     logger
   }) {
-    let configFile = await config.getConfig(['.posthtmlrc', '.posthtmlrc.js', 'posthtml.config.js'], {
+    if (!config.isSource) {
+      return;
+    }
+    let configFile = await config.getConfig(['.posthtmlrc', '.posthtmlrc.js', '.posthtmlrc.cjs', '.posthtmlrc.mjs', 'posthtml.config.js', 'posthtml.config.cjs', 'posthtml.config.mjs'], {
       packageKey: 'posthtml'
     });
-
     if (configFile) {
-      let isJavascript = _path().default.extname(configFile.filePath) === '.js';
-
+      let isJavascript = _path().default.extname(configFile.filePath).endsWith('js');
       if (isJavascript) {
         // We have to invalidate on startup in case the config is non-deterministic,
         // e.g. using unknown environment variables, reading from the filesystem, etc.
         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.addDevDependency({
-          moduleSpecifier: (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.
+      // 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 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
           });
         }
       }
+      configFile.contents.plugins = plugins;
 
-      configFile.contents.plugins = plugins; // tells posthtml that we have already called parse
-
+      // tells posthtml that we have already called parse
       configFile.contents.skipParse = true;
       delete configFile.contents.render;
-      config.setResult(configFile.contents);
+      return configFile.contents;
     }
   },
-
   canReuseAST({
     ast
   }) {
     return ast.type === 'posthtml' && _semver().default.satisfies(ast.version, '^0.4.0');
   },
-
   async parse({
     asset,
     config
@@ -160,16 +111,16 @@ var _default = new (_plugin().Transformer)({
     if (!config) {
       return;
     }
-
     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'
       })
     };
   },
-
   async transform({
     asset,
     config
@@ -177,42 +128,37 @@ var _default = new (_plugin().Transformer)({
     if (!config) {
       return [asset];
     }
-
     let ast = (0, _nullthrows().default)(await asset.getAST());
-    let res = await (0, _posthtml().default)(config.plugins).process(ast.program, { ...config,
+    let res = await (0, _posthtml().default)(config.plugins).process(ast.program, {
+      ...config,
       plugins: config.plugins
     });
-
     if (res.messages) {
-      await Promise.all(res.messages.map(({
+      for (let {
         type,
         file: filePath
-      }) => {
+      } of res.messages) {
         if (type === 'dependency') {
-          return asset.addIncludedFile(filePath);
+          asset.invalidateOnFileChange(filePath);
         }
-
-        return Promise.resolve();
-      }));
+      }
     }
-
     asset.setAST({
       type: 'posthtml',
       version: '0.4.1',
       program: JSON.parse(JSON.stringify(res.tree)) // posthtml adds functions to the AST that are not serializable
-
     });
+
     return [asset];
   },
-
   generate({
-    ast
+    ast,
+    asset
   }) {
     return {
-      content: (0, _posthtmlRender().default)(ast.program)
+      content: (0, _posthtmlRender().render)(ast.program, {
+        closingSingleTag: asset.type === 'xhtml' ? 'slash' : undefined
+      })
     };
   }
-
-});
-
-exports.default = _default;
+});

package/lib/loadPlugins.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = loadExternalPlugins;
-
 async function loadExternalPlugins(plugins, relative, options) {
   if (Array.isArray(plugins)) {
     return Promise.all(plugins.map(p => loadPlugin(p, relative, null, options.packageManager, options.shouldAutoInstall)).filter(Boolean));
@@ -15,12 +14,10 @@ async function loadExternalPlugins(plugins, relative, options) {
     return [];
   }
 }
-
 async function loadPlugin(pluginArg, relative, options = {}, packageManager, shouldAutoInstall) {
   if (typeof pluginArg !== 'string') {
     return pluginArg;
   }
-
   let plugin = await packageManager.require(pluginArg, relative, {
     shouldAutoInstall
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/transformer-posthtml",
-  "version": "2.0.0-beta.3.1",
+  "version": "2.0.0-dev.1515+9d5643b9b",
   "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-dev.1513+9d5643b9b"
   },
   "dependencies": {
-    "@parcel/plugin": "2.0.0-beta.3.1",
-    "@parcel/utils": "2.0.0-beta.3.1",
+    "@parcel/plugin": "2.0.0-dev.1515+9d5643b9b",
+    "@parcel/utils": "2.0.0-dev.1515+9d5643b9b",
     "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": "^7.5.2"
   },
-  "gitHead": "daece49d003ba804bbdaa3a7ed3d6aaf446f166d"
+  "gitHead": "9d5643b9b5ba1a6ff638b4ae32024222e46b8133"
 }

package/src/PostHTMLTransformer.js

@@ -4,24 +4,35 @@ 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';
 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'],
+      [
+        '.posthtmlrc',
+        '.posthtmlrc.js',
+        '.posthtmlrc.cjs',
+        '.posthtmlrc.mjs',
+        'posthtml.config.js',
+        'posthtml.config.cjs',
+        'posthtml.config.mjs',
+      ],
       {
         packageKey: 'posthtml',
       },
     );
 
     if (configFile) {
-      let isJavascript = path.extname(configFile.filePath) === '.js';
+      let isJavascript = path.extname(configFile.filePath).endsWith('js');
       if (isJavascript) {
         // We have to invalidate on startup in case the config is non-deterministic,
         // e.g. using unknown environment variables, reading from the filesystem, etc.
@@ -29,17 +40,6 @@ export default (new Transformer({
           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.addDevDependency({
-          moduleSpecifier: relativePath(
-            path.dirname(config.searchPath),
-            configFile.filePath,
-          ),
-          resolveFrom: config.searchPath,
-        });
       }
 
       // Load plugins. This must be done before adding dev dependencies so we auto install.
@@ -56,7 +56,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 +68,7 @@ export default (new Transformer({
       configFile.contents.skipParse = true;
       delete configFile.contents.render;
 
-      config.setResult(configFile.contents);
+      return configFile.contents;
     }
   },
 
@@ -87,6 +87,8 @@ export default (new Transformer({
       version: '0.4.1',
       program: parse(await asset.getCode(), {
         lowerCaseAttributeNames: true,
+        sourceLocations: true,
+        xmlMode: asset.type === 'xhtml',
       }),
     };
   },
@@ -103,14 +105,11 @@ export default (new Transformer({
     });
 
     if (res.messages) {
-      await Promise.all(
-        res.messages.map(({type, file: filePath}) => {
-          if (type === 'dependency') {
-            return asset.addIncludedFile(filePath);
-          }
-          return Promise.resolve();
-        }),
-      );
+      for (let {type, file: filePath} of res.messages) {
+        if (type === 'dependency') {
+          asset.invalidateOnFileChange(filePath);
+        }
+      }
     }
 
     asset.setAST({
@@ -122,9 +121,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);