Merge pull request #657 from DanielXMoore/🐈.json

🐈🐈🐈

Author: STRd6

build/build.sh

@@ -2,20 +2,14 @@
 set -euo pipefail
 
 # normal files
-coffee build/esbuild.coffee
+civet --no-config build/esbuild.civet
 
 # cli
 BIN="dist/civet"
 echo "#!/usr/bin/env node" | cat - dist/cli.js > "$BIN"
 chmod +x "$BIN"
 rm dist/cli.js
 
-# esbuild-plugin
-./dist/civet --no-config --js -c source/esbuild-plugin.civet -o dist/esbuild-plugin.js
-
-# esm loader
-./dist/civet --no-config --js -c source/esm.civet -o dist/esm.mjs
-
 # babel plugin
 cp source/babel-plugin.mjs dist/babel-plugin.mjs
 

build/coffee-esm.mjs

@@ -0,0 +1,123 @@
+"civet coffeeCompat"
+
+esbuild = require "esbuild"
+heraPlugin = require "@danielx/hera/esbuild-plugin"
+# Need to use the packaged version because we may not have built our own yet
+civetPlugin = require "../node_modules/@danielx/civet/dist/esbuild-plugin.js"
+
+watch = process.argv.includes '--watch'
+minify = false
+sourcemap = false
+
+path = require "path"
+{access} = require "fs/promises"
+exists = (p) ->
+  access(p)
+  .then ->
+    true
+  .catch ->
+    false
+extensionResolverPlugin = (extensions) ->
+  name: "extension-resolve"
+  setup: (build) ->
+    # For relative requires that don't contain a '.'
+    build.onResolve { filter: /\/[^.]*$/ }, (r) ->
+      for extension in extensions
+        {path: resolvePath, resolveDir} = r
+        p = path.join(resolveDir, resolvePath + ".#{extension}")
+
+        # see if a .coffee file exists
+        found = await exists(p)
+        if found
+          return path: p
+
+      return undefined
+
+resolveExtensions = extensionResolverPlugin(["civet", "hera"])
+
+# To get proper extension resolution for non-bundled files, we need to use
+# a plugin hack: https://github.com/evanw/esbuild/issues/622#issuecomment-769462611
+# set bundle: true, then rewrite .coffee -> .js and mark as external
+# Also marking everything else as external since we don't want to bundle anything
+rewriteCivetImports = {
+  name: 'rewrite-civet',
+  setup: (build) ->
+    build.onResolve { filter: /.*/ }, (args) ->
+      if (args.importer)
+        path: args.path.replace(/\.civet$/, ".js")
+        external: true
+}
+
+# Files that need civet imports re-written
+# since they aren't actually bundled
+["cli", "config", "esbuild-plugin"].forEach (name) ->
+  esbuild.build({
+    entryPoints: ["source/#{name}.civet"]
+    bundle: true
+    platform: 'node'
+    format: 'cjs'
+    outfile: "dist/#{name}.js"
+    plugins: [
+      rewriteCivetImports
+      civetPlugin()
+    ]
+  }).catch -> process.exit 1
+
+# esm needs to be a module for import.meta
+["esm"].forEach (name) ->
+  esbuild.build({
+    entryPoints: ["source/#{name}.civet"]
+    bundle: true
+    platform: 'node'
+    format: 'esm'
+    outfile: "dist/#{name}.mjs"
+    plugins: [
+      rewriteCivetImports
+      civetPlugin()
+    ]
+  }).catch -> process.exit 1
+
+for esm in [false, true]
+  esbuild.build({
+    entryPoints: ['source/main.civet']
+    bundle: true
+    watch
+    platform: 'node'
+    format: if esm then 'esm' else 'cjs'
+    outfile: "dist/main.#{if esm then 'mjs' else 'js'}"
+    plugins: [
+      resolveExtensions
+      civetPlugin()
+      heraPlugin
+    ]
+  }).catch -> process.exit 1
+
+esbuild.build({
+  entryPoints: ['source/main.civet']
+  globalName: "Civet"
+  bundle: true
+  sourcemap
+  watch
+  platform: 'browser'
+  outfile: 'dist/browser.js'
+  plugins: [
+    resolveExtensions
+    civetPlugin()
+    heraPlugin
+  ]
+}).catch -> process.exit 1
+
+esbuild.build({
+  entryPoints: ['source/bun-civet.civet']
+  bundle: false
+  sourcemap
+  minify
+  watch
+  platform: 'node'
+  format: 'esm'
+  target: "esNext"
+  outfile: 'dist/bun-civet.mjs'
+  plugins: [
+    civetPlugin()
+  ]
+}).catch -> process.exit 1

build/esbuild.civet

@@ -20,7 +20,7 @@ export async function resolve(specifier, context, defaultResolve) {
 
 export async function load(url, context, next) {
   if (extensionsRegex.test(url)) {
-    return next(url.replace(extensionsRegex, ".cjs"), {
+    return next(url, {
       format: "commonjs"
     });
   }

build/esbuild.coffee

@@ -14,7 +14,6 @@
     "./esm": "./dist/esm.mjs",
     "./esbuild-plugin": "./dist/esbuild-plugin.js",
     "./register": "./register.js",
-    "./config": "./dist/config.js",
     "./*": "./*",
     "./dist/*": "./dist/*"
   },
@@ -43,15 +42,14 @@
     "@cspotcode/source-map-support": "^0.8.1"
   },
   "devDependencies": {
+    "@danielx/civet": "^0.6.26",
     "@danielx/hera": "^0.8.10",
     "@types/assert": "^1.5.6",
-    "@types/coffeescript": "^2.5.2",
     "@types/mocha": "^9.1.1",
     "@types/node": "^18.7.8",
     "axios": "^1.2.2",
     "c8": "^7.12.0",
     "esbuild": "^0.14.49",
-    "esbuild-coffeescript": "^2.1.0",
     "marked": "^4.2.4",
     "mocha": "^10.0.0",
     "prettier": "^2.8.1",
@@ -71,7 +69,10 @@
     "extension": [
       ".civet",
       ".coffee",
+      ".hera",
       ".js",
+      ".mjs",
+      ".mts",
       ".ts"
     ],
     "include": [
@@ -85,9 +86,8 @@
     ],
     "loader": [
       "ts-node/esm",
-      "./build/coffee-esm.mjs",
       "./build/hera-esm.mjs",
-      "./dist/esm.mjs"
+      "./node_modules/@danielx/civet/dist/esm.mjs"
     ],
     "reporter": "dot",
     "recursive": true,

build/hera-esm.mjs

@@ -1,5 +1,7 @@
-import {parse, compile, generate} from "./main"
-import {findConfig, loadConfig} from "./config"
+"civet coffeeCompat"
+
+import {parse, compile, generate} from "./main.civet"
+import {findConfig, loadConfig} from "./config.civet"
 {prune} = generate
 
 version = -> require("../package.json").version
@@ -196,7 +198,7 @@ cli = ->
 
   if options.config isnt false # --no-config
     options.config ?= await findConfig(process.cwd())
-  
+
   if options.config
     options = {
       ...(await loadConfig options.config),