fix: another attempt to fix the ESM issue.

googlemaps · Sep 19, 2024 · d3090ec · d3090ec
1 parent 2e77715
commit d3090ec
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 22 deletions.
diff --git a/.eleventy.js → .eleventy.cjs b/.eleventy.js → .eleventy.cjs
@@ -1,21 +1,36 @@
 require("dotenv").config();
 
-const typescript = require("./src/engines/typescript/sample");
-const typescriptJSX = require("./src/engines/typescript/sample-jsx");
-const sass = require("./src/engines/sass");
-const stripRegionTags = require("./src/transforms/strip-region-tags");
-const stripLicenseHeaders = require("./src/transforms/strip-license-headers");
-const yourAPIKey = require("./src/transforms/your-api-key");
-const format = require("./src/transforms/format");
-const minify = require("./src/transforms/minify");
-const skypack = require("./src/transforms/skypack");
-const fs = require("fs");
-const path = require("path");
-const vite = require("vite");
-const chalk = require("chalk");
-const prettier = require("prettier");
-
-module.exports = function (eleventyConfig) {
+// const typescript = require("./src/engines/typescript/sample");
+// const typescriptJSX = require("./src/engines/typescript/sample-jsx");
+// const sass = require("./src/engines/sass");
+// const stripRegionTags = require("./src/transforms/strip-region-tags");
+// const stripLicenseHeaders = require("./src/transforms/strip-license-headers");
+// const yourAPIKey = require("./src/transforms/your-api-key");
+// const format = require("./src/transforms/format");
+// const minify = require("./src/transforms/minify");
+// const skypack = require("./src/transforms/skypack");
+// const fs = require("fs");
+// const path = require("path");
+// const vite = require("vite");
+// const chalk = require("chalk");
+// const prettier = require("prettier");
+
+const { typescript } = await ".src/engines/typescript/sample";
+const { typescriptJSX } = await "./src/engines/typescript/sample-jsx";
+const { sass } = await "./src/engines/sass";
+const { stripRegionTags } = await "./src/transforms/strip-region-tags";
+const { stripLicenseHeaders } = await "./src/transforms/strip-license-headers";
+const { yourAPIKey } = await "./src/transforms/your-api-key";
+const { format } = await "./src/transforms/format";
+const { minify } = await "./src/transforms/minify";
+const { skypack } = await "./src/transforms/skypack";
+const { fs } = await "fs";
+const { path } = await "path";
+const { vite } = await "vite";
+const { chalk } = await "chalk";
+const { prettier } = await "prettier";
+
+export default function (eleventyConfig) {
   eleventyConfig.addWatchTarget("./shared/**/*");
   eleventyConfig.addWatchTarget(".env*");
 

diff --git a/package.json b/package.json
@@ -2,6 +2,7 @@
   "name": "@googlemaps/js-samples",
   "description": "Samples for Google Maps JavaScript",
   "version": "2.1.4",
+  "type": "module",
   "keywords": [
     "google",
     "javascript",

diff --git a/playwright.config.ts b/playwright.config.ts
@@ -1,4 +1,4 @@
-import { PlaywrightTestConfig, devices } from "@playwright/test";
+import type { PlaywrightTestConfig, /* devices */ } from "@playwright/test";
 import { test, expect, Expect } from "@playwright/test";
 import fs from "fs";
 import path from "path";
@@ -26,12 +26,12 @@ const config: PlaywrightTestConfig = {
     port: 8080,
   },
   updateSnapshots: "none",
-  projects: [
+  /* projects: [
     {
       name: "chromium",
       use: { ...devices["Desktop Chrome"] },
     },
-  ],
+  ], */
   reporter: process.env.CI ? "github" : "list",
 };
 

diff --git a/samples/.gitignore.11ty.js → samples/.gitignore.11ty.cjs b/samples/.gitignore.11ty.js → samples/.gitignore.11ty.cjs
diff --git a/samples/env.11ty.js → samples/env.11ty.cjs b/samples/env.11ty.js → samples/env.11ty.cjs
diff --git a/samples/env.d.ts.11ty.js → samples/env.d.ts.11ty.cjs b/samples/env.d.ts.11ty.js → samples/env.d.ts.11ty.cjs
diff --git a/samples/eslintrc.11ty.js → samples/eslintrc.11ty.cjs b/samples/eslintrc.11ty.js → samples/eslintrc.11ty.cjs
diff --git a/samples/jsfiddle.details.yaml.11ty.js → samples/jsfiddle.details.yaml.11ty.cjs b/samples/jsfiddle.details.yaml.11ty.js → samples/jsfiddle.details.yaml.11ty.cjs
diff --git a/samples/package.11ty.js → samples/package.11ty.cjs b/samples/package.11ty.js → samples/package.11ty.cjs
diff --git a/samples/playground-package.11ty.js → samples/playground-package.11ty.cjs b/samples/playground-package.11ty.js → samples/playground-package.11ty.cjs
diff --git a/samples/playground.ts.json.11ty.js → samples/playground.ts.json.11ty.cjs b/samples/playground.ts.json.11ty.js → samples/playground.ts.json.11ty.cjs
diff --git a/samples/samples.11tydata.js → samples/samples.11tydata.cjs b/samples/samples.11tydata.js → samples/samples.11tydata.cjs
diff --git a/samples/tsconfig.11ty.js → samples/tsconfig.11ty.cjs b/samples/tsconfig.11ty.js → samples/tsconfig.11ty.cjs
diff --git a/samples/types.d.ts.11ty.js → samples/types.d.ts.11ty.cjs b/samples/types.d.ts.11ty.js → samples/types.d.ts.11ty.cjs
diff --git a/samples/vite.config.11ty.js → samples/vite.config.11ty.cjs b/samples/vite.config.11ty.js → samples/vite.config.11ty.cjs
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,10 +1,10 @@
 {
   "compilerOptions": {
-    "module": "esnext",
-    "target": "esnext",
+    "module": "ES2022",
+    "target": "ES2022",
     "strict": true,
     "noImplicitAny": false,
-    "lib": ["esnext", "es6", "dom", "dom.iterable"],
+    "lib": ["ES2022", "es6", "dom", "dom.iterable"],
     "moduleResolution": "Bundler",
     "jsx": "preserve",
     "esModuleInterop": true,