Merge branch 'release/1.0.9'

Author: khalwat

.github/workflows/node.js.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        node-version: [12.x, 14.x, 15.x]
+        node-version: [12.x, 14.x, 15.x, 16.x]
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}

.gitignore

@@ -3,7 +3,7 @@ node_modules/
 yarn-error.log
 npm-debug.log
 coverage/
-src/__tests__/test_critical.min.css
+src/__tests__/**/test_*
 
 # MISC FILES
 .cache

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.0.9 - 2022.09.13
+### Added
+* Added support for `inline: true` via ([#5](https://github.com/nystudio107/rollup-plugin-critical/pull/5))
+
 ## 1.0.8 - 2021.10.15
 ### Changed
 * Switched to `critical` `^4.0.0` ([#2](https://github.com/nystudio107/rollup-plugin-critical/issues/2))

Dockerfile

@@ -1,4 +1,4 @@
-ARG TAG=14-alpine
+ARG TAG=16-alpine
 FROM nystudio107/node-dev-base:$TAG
 
 WORKDIR /app/

Makefile

@@ -1,4 +1,4 @@
-TAG?=14-alpine
+TAG?=16-alpine
 CONTAINER?=$(shell basename $(CURDIR))
 DOCKERRUN=docker container run \
 	--name ${CONTAINER} \
@@ -7,23 +7,36 @@ DOCKERRUN=docker container run \
 	-v `pwd`:/app \
 	${CONTAINER}:${TAG}
 
-.PHONY: docker build install test update npm
+.PHONY: docker build clean install test update npm
 
+# Build the Docker container
 docker:
 	docker build \
 		. \
 		-t ${CONTAINER}:${TAG} \
 		--build-arg TAG=${TAG} \
 		--no-cache
+# Perform a dist build
 build: docker install update
 	${DOCKERRUN} \
 		run build
+# Remove node_modules/ & package-lock.json
+clean:
+	rm -rf node_modules/
+	rm -f package-lock.json
+# Run npm install
 install: docker
 	${DOCKERRUN} \
 		install
+# Perform a dist build, then run npm publish
+publish: docker build
+	${DOCKERRUN} \
+		publish
+# Run tests via npm run test
 test: docker install
 	${DOCKERRUN} \
 		run test
+# Run npm update
 update: docker
 	${DOCKERRUN} \
 		update

dist/index.js

@@ -36,13 +36,13 @@ function PluginCritical(pluginConfig, callback) {
       for (const page of pluginConfig.criticalPages) {
         const criticalBase = pluginConfig.criticalBase;
         const criticalSrc = pluginConfig.criticalUrl + page.uri;
-        const criticalDest = page.template + criticalSuffix;
+        const criticalTarget = pluginConfig.criticalConfig && pluginConfig.criticalConfig.inline == true ? page.template + ".html" : page.template + criticalSuffix;
         const options = Object.assign({ css }, defaultCriticalConfig, {
           base: criticalBase,
           src: criticalSrc,
-          target: criticalDest
+          target: criticalTarget
         }, pluginConfig.criticalConfig);
-        console.log(`Generating critical CSS from ${criticalSrc} to ${criticalDest}`);
+        console.log(`Generating critical CSS from ${criticalSrc} to ${criticalTarget}`);
         await critical.generate(options, (err) => {
           if (err) {
             console.error(err);

dist/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/index.ts"],
-  "sourcesContent": ["import {Plugin} from 'rollup';\nimport path from 'path';\nimport { CriticalConfig } from './@types/critical';\nimport { CriticalPluginConfig } from './@types/rollup-plugin-critical';\nconst critical = require('critical');\n\nconst criticalSuffix = '_critical.min.css';\n\n/**\n * Default `criticalConfig` passed in to `critical`\n */\nconst defaultCriticalConfig: Partial<CriticalConfig> = {\n  inline: false,\n  extract: false,\n  width: 1200,\n  height: 1200,\n  penthouse: {\n    blockJSRequests: false\n  }\n};\n\n/**\n * [Vite.js](https://vitejs.dev/) & [Rollup](https://rollupjs.org/) plugin for generating critical CSS\n * that uses the [critical](https://github.com/addyosmani/critical) generator under the hood.\n *\n * @param {CriticalPluginConfig} pluginConfig - the plugin configuration object\n * @param {Function} callback - callback upon completion of the critical CSS generation\n * @constructor\n */\nfunction PluginCritical(pluginConfig: CriticalPluginConfig, callback?: Function): Plugin {\n  return {\n    name: 'critical',\n    async writeBundle(outputOptions, bundle) {\n      const css: Array<string> = [];\n      // Find all of the generated CSS assets\n      for (const chunk of Object.values(bundle)) {\n        if (chunk.type === 'asset' && chunk.fileName.endsWith('.css')) {\n          const cssFile = path.join(outputOptions.dir || '', chunk.fileName);\n          css.push(cssFile);\n        }\n      }\n      // If we have no CSS, skip bundle\n      if (!css.length) {\n        return;\n      }\n      // Iterate through the pages\n      for (const page of pluginConfig.criticalPages) {\n        const criticalBase = pluginConfig.criticalBase;\n        const criticalSrc = pluginConfig.criticalUrl + page.uri;\n        const criticalDest = page.template + criticalSuffix;\n        // Merge in our options\n        const options = Object.assign(\n            { css },\n            defaultCriticalConfig,\n            {\n              base: criticalBase,\n              src: criticalSrc,\n              target: criticalDest,\n            },\n            pluginConfig.criticalConfig\n        );\n        // Generate the Critical CSS\n        console.log(`Generating critical CSS from ${criticalSrc} to ${criticalDest}`);\n        await critical.generate(options, (err: string) => {\n          if (err) {\n            console.error(err);\n          }\n          if (callback) {\n            callback(err);\n          }\n        });\n      }\n    }\n  }\n}\n\nexport default PluginCritical;\n"],
-  "mappings": ";;;;;;;;;AACA;AAGA,IAAM,WAAW,UAAQ;AAEzB,IAAM,iBAAiB;AAKvB,IAAM,wBAAiD;AAAA,EACrD,QAAQ;AAAA,EACR,SAAS;AAAA,EACT,OAAO;AAAA,EACP,QAAQ;AAAA,EACR,WAAW;AAAA,IACT,iBAAiB;AAAA;AAAA;AAYrB,wBAAwB,cAAoC,UAA6B;AACvF,SAAO;AAAA,IACL,MAAM;AAAA,UACA,YAAY,eAAe,QAAQ;AACvC,YAAM,MAAqB;AAE3B,iBAAW,SAAS,OAAO,OAAO,SAAS;AACzC,YAAI,MAAM,SAAS,WAAW,MAAM,SAAS,SAAS,SAAS;AAC7D,gBAAM,UAAU,KAAK,KAAK,cAAc,OAAO,IAAI,MAAM;AACzD,cAAI,KAAK;AAAA;AAAA;AAIb,UAAI,CAAC,IAAI,QAAQ;AACf;AAAA;AAGF,iBAAW,QAAQ,aAAa,eAAe;AAC7C,cAAM,eAAe,aAAa;AAClC,cAAM,cAAc,aAAa,cAAc,KAAK;AACpD,cAAM,eAAe,KAAK,WAAW;AAErC,cAAM,UAAU,OAAO,OACnB,EAAE,OACF,uBACA;AAAA,UACE,MAAM;AAAA,UACN,KAAK;AAAA,UACL,QAAQ;AAAA,WAEV,aAAa;AAGjB,gBAAQ,IAAI,gCAAgC,kBAAkB;AAC9D,cAAM,SAAS,SAAS,SAAS,CAAC,QAAgB;AAChD,cAAI,KAAK;AACP,oBAAQ,MAAM;AAAA;AAEhB,cAAI,UAAU;AACZ,qBAAS;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAQrB,IAAO,cAAQ;",
+  "sourcesContent": ["import {Plugin} from 'rollup';\nimport path from 'path';\nimport { CriticalConfig } from './@types/critical';\nimport { CriticalPluginConfig } from './@types/rollup-plugin-critical';\nconst critical = require('critical');\n\nconst criticalSuffix = '_critical.min.css';\n\n/**\n * Default `criticalConfig` passed in to `critical`\n */\nconst defaultCriticalConfig: Partial<CriticalConfig> = {\n  inline: false,\n  extract: false,\n  width: 1200,\n  height: 1200,\n  penthouse: {\n    blockJSRequests: false\n  }\n};\n\n/**\n * [Vite.js](https://vitejs.dev/) & [Rollup](https://rollupjs.org/) plugin for generating critical CSS\n * that uses the [critical](https://github.com/addyosmani/critical) generator under the hood.\n *\n * @param {CriticalPluginConfig} pluginConfig - the plugin configuration object\n * @param {Function} callback - callback upon completion of the critical CSS generation\n * @constructor\n */\nfunction PluginCritical(pluginConfig: CriticalPluginConfig, callback?: Function): Plugin {\n  return {\n    name: 'critical',\n    async writeBundle(outputOptions, bundle) {\n      const css: Array<string> = [];\n      // Find all of the generated CSS assets\n      for (const chunk of Object.values(bundle)) {\n        if (chunk.type === 'asset' && chunk.fileName.endsWith('.css')) {\n          const cssFile = path.join(outputOptions.dir || '', chunk.fileName);\n          css.push(cssFile);\n        }\n      }\n      // If we have no CSS, skip bundle\n      if (!css.length) {\n        return;\n      }\n      // Iterate through the pages\n      for (const page of pluginConfig.criticalPages) {\n        const criticalBase = pluginConfig.criticalBase;\n        const criticalSrc = pluginConfig.criticalUrl + page.uri;\n        // If inline is set to true, use HTML as target, otherwise CSS with suffix\n        const criticalTarget = (pluginConfig.criticalConfig && pluginConfig.criticalConfig.inline == true) ? page.template + \".html\" : page.template + criticalSuffix;\n        // Merge in our options\n        const options = Object.assign(\n            { css },\n            defaultCriticalConfig,\n            {\n              base: criticalBase,\n              src: criticalSrc,\n              target: criticalTarget,\n            },\n            pluginConfig.criticalConfig\n        );\n        // Generate the Critical CSS\n        console.log(`Generating critical CSS from ${criticalSrc} to ${criticalTarget}`);\n        await critical.generate(options, (err: string) => {\n          if (err) {\n            console.error(err);\n          }\n          if (callback) {\n            callback(err);\n          }\n        });\n      }\n    }\n  }\n}\n\nexport default PluginCritical;\n"],
+  "mappings": ";;;;;;;;;AACA;AAGA,IAAM,WAAW,UAAQ;AAEzB,IAAM,iBAAiB;AAKvB,IAAM,wBAAiD;AAAA,EACrD,QAAQ;AAAA,EACR,SAAS;AAAA,EACT,OAAO;AAAA,EACP,QAAQ;AAAA,EACR,WAAW;AAAA,IACT,iBAAiB;AAAA;AAAA;AAYrB,wBAAwB,cAAoC,UAA6B;AACvF,SAAO;AAAA,IACL,MAAM;AAAA,UACA,YAAY,eAAe,QAAQ;AACvC,YAAM,MAAqB;AAE3B,iBAAW,SAAS,OAAO,OAAO,SAAS;AACzC,YAAI,MAAM,SAAS,WAAW,MAAM,SAAS,SAAS,SAAS;AAC7D,gBAAM,UAAU,KAAK,KAAK,cAAc,OAAO,IAAI,MAAM;AACzD,cAAI,KAAK;AAAA;AAAA;AAIb,UAAI,CAAC,IAAI,QAAQ;AACf;AAAA;AAGF,iBAAW,QAAQ,aAAa,eAAe;AAC7C,cAAM,eAAe,aAAa;AAClC,cAAM,cAAc,aAAa,cAAc,KAAK;AAEpD,cAAM,iBAAkB,aAAa,kBAAkB,aAAa,eAAe,UAAU,OAAQ,KAAK,WAAW,UAAU,KAAK,WAAW;AAE/I,cAAM,UAAU,OAAO,OACnB,EAAE,OACF,uBACA;AAAA,UACE,MAAM;AAAA,UACN,KAAK;AAAA,UACL,QAAQ;AAAA,WAEV,aAAa;AAGjB,gBAAQ,IAAI,gCAAgC,kBAAkB;AAC9D,cAAM,SAAS,SAAS,SAAS,CAAC,QAAgB;AAChD,cAAI,KAAK;AACP,oBAAQ,MAAM;AAAA;AAEhB,cAAI,UAAU;AACZ,qBAAS;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAQrB,IAAO,cAAQ;",
   "names": []
 }