From 2a7d454da14b1f8b98f6d91e205a348c523c8f36 Mon Sep 17 00:00:00 2001 From: Jared White Date: Thu, 23 Jan 2025 17:42:52 -0800 Subject: [PATCH] Update Lit configuration files to use ESM syntax --- .../lib/bridgetown-core/configurations/lit.rb | 8 ++--- .../configurations/lit/esbuild-plugins.js | 32 +++++++++---------- .../configurations/lit/lit-ssr.config.js | 4 +-- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/bridgetown-core/lib/bridgetown-core/configurations/lit.rb b/bridgetown-core/lib/bridgetown-core/configurations/lit.rb index 37bca7642..db4bb2e90 100644 --- a/bridgetown-core/lib/bridgetown-core/configurations/lit.rb +++ b/bridgetown-core/lib/bridgetown-core/configurations/lit.rb @@ -11,19 +11,19 @@ say_status :lit, "Installing Lit + SSR Plugin..." -add_gem "bridgetown-lit-renderer", version: "2.1.0.beta2" +add_gem "bridgetown-lit-renderer", version: "3.0.0" -add_npm_package "lit esbuild-plugin-lit-css bridgetown-lit-renderer@2.1.0-beta2" +add_npm_package "lit esbuild-plugin-lit-css bridgetown-lit-renderer@3.0.0" copy_file in_templates_dir("lit-ssr.config.js"), "config/lit-ssr.config.js" copy_file in_templates_dir("lit-components-entry.js"), "config/lit-components-entry.js" copy_file in_templates_dir("esbuild-plugins.js"), "config/esbuild-plugins.js" insert_into_file "esbuild.config.js", - after: 'const build = require("./config/esbuild.defaults.js")' do + after: 'import build from "./config/esbuild.defaults.js"' do <<~JS - const { plugins } = require("./config/esbuild-plugins.js") + import { plugins } from "./config/esbuild-plugins.js" JS end diff --git a/bridgetown-core/lib/bridgetown-core/configurations/lit/esbuild-plugins.js b/bridgetown-core/lib/bridgetown-core/configurations/lit/esbuild-plugins.js index c3548f2b3..78cb48673 100644 --- a/bridgetown-core/lib/bridgetown-core/configurations/lit/esbuild-plugins.js +++ b/bridgetown-core/lib/bridgetown-core/configurations/lit/esbuild-plugins.js @@ -4,21 +4,21 @@ // This plugin will let you import `.lit.css` files as sidecar stylesheets. // Read https://www.bridgetownrb.com/docs/components/lit#sidecar-css-files for documentation. -const { litCssPlugin } = require("esbuild-plugin-lit-css") -const postcssrc = require("postcss-load-config") -const postcss = require("postcss") +import { litCssPlugin } from "esbuild-plugin-lit-css" -module.exports = { - plugins: [ - litCssPlugin({ - filter: /\.lit\.css$/, - transform: async (css, { filePath }) => { - const postCssConfig = await postcssrc() - const postCssProcessor = postcss([...postCssConfig.plugins]) +import postcss from "postcss" - const results = await postCssProcessor.process(css, { ...postCssConfig.options, from: filePath }) - return results.css - } - }), - ] -} +const postcssrc = (await import("postcss-load-config")).default + +export const plugins = [ + litCssPlugin({ + filter: /\.lit\.css$/, + transform: async (css, { filePath }) => { + const postCssConfig = await postcssrc() + const postCssProcessor = postcss([...postCssConfig.plugins]) + + const results = await postCssProcessor.process(css, { ...postCssConfig.options, from: filePath }) + return results.css + } + }), +] diff --git a/bridgetown-core/lib/bridgetown-core/configurations/lit/lit-ssr.config.js b/bridgetown-core/lib/bridgetown-core/configurations/lit/lit-ssr.config.js index e572bd903..007486832 100644 --- a/bridgetown-core/lib/bridgetown-core/configurations/lit/lit-ssr.config.js +++ b/bridgetown-core/lib/bridgetown-core/configurations/lit/lit-ssr.config.js @@ -1,5 +1,5 @@ -const build = require("bridgetown-lit-renderer/build") -const { plugins } = require("./esbuild-plugins.js") +import build from "bridgetown-lit-renderer/build" +import { plugins } from "./esbuild-plugins.js" const esbuildOptions = { plugins }