public vars is now a TS file

Author: e111077

Dockerfile

@@ -23,7 +23,7 @@ WORKDIR /usr/src/app
 # to execute the final Eleventy build step.
 
 # External dependencies
-COPY public-vars.json package*.json tsconfig.base.json ./
+COPY package*.json tsconfig.base.json ./
 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/

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

@@ -451,10 +451,9 @@ ${content}
     return `<script type="module">${script}</script>`;
   });
 
-  eleventyConfig.addShortcode('algoliaid', () => {
-    const varsRaw = fsSync.readFileSync('../../public-vars.json', 'utf8');
-    const vars = JSON.parse(varsRaw);
-    return vars.algolia.appId;
+  eleventyConfig.addNunjucksAsyncShortcode('algoliaid', async () => {
+    const {publicVars} = await import('lit-dev-tools-esm/lib/configs.js');
+    return publicVars.algolia.appId;
   });
 
   // Source: https://github.com/11ty/eleventy-base-blog/blob/master/.eleventy.js

packages/lit-dev-content/package.json

@@ -22,7 +22,6 @@
     "dev:build:eleventy": "wireit",
     "dev:build:eleventy:watch": "wireit",
     "dev:serve": "wireit",
-    "copy-keys": "wireit",
     "prod:build": "wireit",
     "prod:build:assets": "wireit"
   },
@@ -137,7 +136,7 @@
         "lib"
       ],
       "dependencies": [
-        "copy-keys"
+        "../lit-dev-tools-esm:build:ts"
       ],
       "command": "../../node_modules/.bin/tsc --build --pretty",
       "clean": "if-file-deleted"
@@ -166,15 +165,6 @@
         "samples/js/**"
       ],
       "command": "node ../lit-dev-tools-esm/lib/generate-js-samples.js"
-    },
-    "copy-keys": {
-      "files": [
-        "../../public-vars.json"
-      ],
-      "output": [
-        "src/public-vars.ts"
-      ],
-      "command": "cp ../../public-vars.json public-vars.tsorig && echo 'export default ' > public-vars.tstemp && cat public-vars.tsorig >> public-vars.tstemp && cp public-vars.tstemp src/public-vars.ts && rm public-vars.tstemp && rm public-vars.tsorig"
     }
   },
   "devDependencies": {

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

@@ -29,7 +29,7 @@ import algoliasearch, {
   SearchIndex,
 } from 'algoliasearch/dist/algoliasearch-lite.esm.browser.js';
 import {Task, TaskStatus} from '@lit-labs/task';
-import vars from '../public-vars.js';
+import {publicVars} from 'lit-dev-tools-esm/lib/configs.js';
 
 /**
  * Representation of each document indexed by Minisearch.
@@ -192,12 +192,12 @@ export class LitDevSearch extends LitElement {
   private _searchText: string = '';
 
   private static _algoliaClient: SearchClient = algoliasearch(
-    vars.algolia.appId,
-    vars.algolia.searchOnlyKey
+    publicVars.algolia.appId,
+    publicVars.algolia.searchOnlyKey
   );
 
   private static _algoliaIndex: SearchIndex =
-    LitDevSearch._algoliaClient.initIndex(vars.algolia.index);
+    LitDevSearch._algoliaClient.initIndex(publicVars.algolia.index);
 
   private _searchTask: Task<string[], Suggestion[]> | null = null;
 

packages/lit-dev-tools-esm/src/configs.ts

@@ -0,0 +1,7 @@
+export const publicVars = {
+  algolia: {
+    appId: 'OC866NN61X',
+    searchOnlyKey: '33401c252374747a39ef3b42c9f701ac',
+    index: 'lit.dev',
+  },
+};

packages/lit-dev-tools-esm/src/upload-algolia-index.ts

@@ -6,9 +6,8 @@
 
 import algolia from 'algoliasearch';
 import fs from 'fs';
+import {publicVars} from './configs.js';
 
-const varsRaw = fs.readFileSync('../../public-vars.json', 'utf8');
-const vars = JSON.parse(varsRaw);
 const searchIndexRaw = fs.readFileSync(
   '../lit-dev-content/_site/searchIndex.json',
   'utf8'
@@ -20,6 +19,6 @@ if (!ALGOLIA_WRITE_KEY) {
   throw new Error('ALGOLIA_WRITE_KEY environment variable is not set');
 }
 
-const client = algolia(vars.algolia.appId, ALGOLIA_WRITE_KEY);
-const index = client.initIndex(vars.algolia.indexName);
+const client = algolia(publicVars.algolia.appId, ALGOLIA_WRITE_KEY);
+const index = client.initIndex(publicVars.algolia.index);
 await index.replaceAllObjects(searchIndex);