Rename lit-dev-tools to lit-dev-tools-cjs to distinguish it from -esm

Author: aomarks

Dockerfile

@@ -22,18 +22,18 @@ WORKDIR /usr/src/app
 
 # External dependencies
 COPY package*.json lerna.json ./
-COPY packages/lit-dev-tools/package*.json ./packages/lit-dev-tools/
+COPY packages/lit-dev-tools-cjs/package*.json ./packages/lit-dev-tools-cjs/
 COPY packages/lit-dev-tools-esm/package*.json ./packages/lit-dev-tools-esm/
 COPY packages/lit-dev-server/package*.json ./packages/lit-dev-server/
 COPY packages/lit-dev-api/package*.json ./packages/lit-dev-api/
 COPY packages/lit-dev-content/package*.json ./packages/lit-dev-content/
 RUN npm ci && npm run bootstrap
 
 # Tooling code
-COPY packages/lit-dev-tools/ ./packages/lit-dev-tools/
+COPY packages/lit-dev-tools-cjs/ ./packages/lit-dev-tools-cjs/
 COPY packages/lit-dev-tools-esm/ ./packages/lit-dev-tools-esm/
 COPY packages/lit-dev-server/ ./packages/lit-dev-server/
-RUN npx lerna run build:ts --scope lit-dev-tools --scope lit-dev-tools-esm --scope lit-dev-server --stream
+RUN npx lerna run build:ts --scope lit-dev-tools-cjs --scope lit-dev-tools-esm --scope lit-dev-server --stream
 
 # Generated API docs
 COPY packages/lit-dev-api/ ./packages/lit-dev-api/

lit-dev.code-workspace

@@ -5,8 +5,8 @@
       "path": "packages/lit-dev-content"
     },
     {
-      "name": "lit-dev-tools",
-      "path": "packages/lit-dev-tools"
+      "name": "lit-dev-tools-cjs",
+      "path": "packages/lit-dev-tools-cjs"
     },
     {
       "name": "lit-dev-tools-esm",

packages/lit-dev-api/package.json

@@ -7,8 +7,8 @@
   "license": "BSD-3-Clause",
   "scripts": {
     "build": "(ls lit 2>/dev/null || npm run monorepo:init) && npm run build:generate",
-    "build:generate": "node ../lit-dev-tools/lib/generate-api-docs-data.js",
-    "build:watch": "chokidar 'lit/packages/*/src/**/*.ts' '../lit-dev-tools/lib/generate-api-docs-data.js' -c 'npm run monorepo:build && npm run build:generate' --initial",
+    "build:generate": "node ../lit-dev-tools-cjs/lib/generate-api-docs-data.js",
+    "build:watch": "chokidar 'lit/packages/*/src/**/*.ts' '../lit-dev-tools-cjs/lib/generate-api-docs-data.js' -c 'npm run monorepo:build && npm run build:generate' --initial",
     "monorepo:init": "npm run monorepo:clone && npm run monorepo:install && npm run monorepo:build",
     "monorepo:clone": "git clone https://github.com/lit/lit --branch main lit && cd lit && git checkout $(cat ../lit.sha)",
     "monorepo:update": "cd lit && git checkout main && git pull && git rev-parse HEAD > ../lit.sha && cd .. && npm run monorepo:install && npm run monorepo:build",
@@ -17,6 +17,6 @@
   },
   "dependencies": {
     "chokidar-cli": "^2.1.0",
-    "lit-dev-tools": "^0.0.0"
+    "lit-dev-tools-cjs": "^0.0.0"
   }
 }

packages/lit-dev-content/.eleventy.js

@@ -7,17 +7,19 @@ const path = require('path');
 const eleventyNavigationPlugin = require('@11ty/eleventy-navigation');
 const {
   playgroundPlugin,
-} = require('lit-dev-tools/lib/playground-plugin/plugin.js');
+} = require('lit-dev-tools-cjs/lib/playground-plugin/plugin.js');
 const htmlMinifier = require('html-minifier');
 const CleanCSS = require('clean-css');
 const fs = require('fs/promises');
 const fsSync = require('fs');
 const fastGlob = require('fast-glob');
 const {
   inlinePlaygroundFilesIntoManifests,
-} = require('../lit-dev-tools/lib/playground-inline.js');
-const {createSearchIndex} = require('../lit-dev-tools/lib/search/plugin.js');
-const {preCompress} = require('../lit-dev-tools/lib/pre-compress.js');
+} = require('../lit-dev-tools-cjs/lib/playground-inline.js');
+const {
+  createSearchIndex,
+} = require('../lit-dev-tools-cjs/lib/search/plugin.js');
+const {preCompress} = require('../lit-dev-tools-cjs/lib/pre-compress.js');
 const luxon = require('luxon');
 const crypto = require('crypto');
 

packages/lit-dev-content/package.json

@@ -33,7 +33,7 @@
     "html-minifier": "^4.0.0",
     "lit-dev-api": "^0.0.0",
     "lit-dev-server": "^0.0.0",
-    "lit-dev-tools": "^0.0.0",
+    "lit-dev-tools-cjs": "^0.0.0",
     "lit-dev-tools-esm": "^0.0.0",
     "luxon": "^2.0.2",
     "markdown-it": "^12.0.4",

packages/lit-dev-content/src/components/litdev-search.ts

@@ -22,7 +22,7 @@ import type {Drawer} from '@material/mwc-drawer';
 /**
  * Representation of each document indexed by Minisearch.
  *
- * Duplicated interface that must match `/lit-dev-tools/src/search/plugin.ts`
+ * Duplicated interface that must match `/lit-dev-tools-cjs/src/search/plugin.ts`
  */
 interface UserFacingPageData {
   id: string;
@@ -192,7 +192,7 @@ class LitDevSearch extends LitElement {
     const searchIndexJson = await (await fetch('/searchIndex.json')).text();
 
     // Minisearch intialization config must exactly match
-    // `/lit-dev-tools/src/search/plugin.ts` Minisearch options.
+    // `/lit-dev-tools-cjs/src/search/plugin.ts` Minisearch options.
     LitDevSearch.siteSearchIndex = Minisearch.loadJSON<UserFacingPageData>(
       searchIndexJson,
       {

packages/lit-dev-tools/.vscode/settings.json renamed to packages/lit-dev-tools-cjs/.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-  "name": "lit-dev-tools",
+  "name": "lit-dev-tools-cjs",
   "private": true,
   "version": "0.0.0",
   "description": "Misc tools for lit.dev (CommonJS)",