Fix css testing

Author: ije

bundler/mod.ts

@@ -1,5 +1,3 @@
-// @deno-types="https://deno.land/x/[email protected]/mod.d.ts"
-import { build, stop as stopEsbuild } from 'https://deno.land/x/[email protected]/mod.js'
 import { dim } from 'https://deno.land/[email protected]/fmt/colors.ts'
 import { basename, dirname, join } from 'https://deno.land/[email protected]/path/mod.ts'
 import { ensureDir, } from 'https://deno.land/[email protected]/fs/ensure_dir.ts'
@@ -11,7 +9,7 @@ import util from '../shared/util.ts'
 import { VERSION } from '../version.ts'
 import type { Application, Module } from '../server/app.ts'
 import { cache } from '../server/cache.ts'
-import { computeHash, getAlephPkgUri } from '../server/helper.ts'
+import { computeHash, esbuild, stopEsbuild, getAlephPkgUri } from '../server/helper.ts'
 
 const hashShort = 8
 const reHashJS = new RegExp(`\\.[0-9a-fx]{${hashShort}}\\.js$`, 'i')
@@ -254,7 +252,7 @@ export class Bundler {
     const { buildTarget, browserslist } = this.#app.config
 
     await clearBuildCache(bundleFile)
-    await build({
+    await esbuild({
       entryPoints: [entryFile],
       outfile: bundleFile,
       platform: 'browser',

server/css.ts

@@ -1,7 +1,6 @@
-// @deno-types="https://deno.land/x/[email protected]/mod.d.ts"
-import { build } from 'https://deno.land/x/[email protected]/mod.js'
 import util from '../shared/util.ts'
 import { PostCSSPlugin, CSSOptions } from '../types.ts'
+import { esbuild } from './helper.ts'
 
 const postcssVersion = '8.2.8'
 const productionOnlyPostcssPlugins = ['autoprefixer']
@@ -72,7 +71,7 @@ export class CSSProcessor {
 
     let css = pcss
     if (this.#isProd) {
-      const ret = await build({
+      const ret = await esbuild({
         stdin: {
           loader: 'css',
           sourcefile: url,
@@ -104,11 +103,6 @@ export class CSSProcessor {
   }
 }
 
-async function initCleanCSS() {
-  const { default: CleanCSS } = await import('https://esm.sh/[email protected]?no-check')
-  return new CleanCSS({ compatibility: '*' /* Internet Explorer 10+ */ })
-}
-
 async function initPostCSS(plugins: PostCSSPlugin[]) {
   const { default: PostCSS } = await import(`https://esm.sh/postcss@${postcssVersion}`)
   const isDev = Deno.env.get('ALEPH_BUILD_MODE') === 'development'

server/css_test.ts

@@ -1,5 +1,6 @@
 import { assertEquals } from 'std/testing/asserts.ts'
 import { CSSProcessor } from './css.ts'
+import { stopEsbuild } from './helper.ts'
 
 Deno.test('css processor', async () => {
   const processor = new CSSProcessor()
@@ -15,20 +16,26 @@ Deno.test('css processor', async () => {
   ].join('\n'))
 })
 
-Deno.test('css processor in production mode', async () => {
-  const processor = new CSSProcessor()
-  processor.config(true, { modules: false, postcss: { plugins: [] } })
-  const { code } = await processor.transform(
-    '/test.css',
-    'h1 { font-size: 18px; }'
-  )
+Deno.test({
+  name: 'css processor in production mode',
+  sanitizeResources: false,
+  fn: async () => {
+    const processor = new CSSProcessor()
+    processor.config(true, { modules: false, postcss: { plugins: [] } })
+    const { code } = await processor.transform(
+      '/test.css',
+      'h1 { font-size: 18px; }'
+    )
 
-  assertEquals(code, [
-    'import { applyCSS } from "https://deno.land/x/aleph/framework/core/style.ts"',
-    'const css = "h1{font-size:18px}"',
-    'applyCSS("/test.css", css)',
-    'export default { __url$: "/test.css", __css$: css, }'
-  ].join('\n'))
+    assertEquals(code, [
+      'import { applyCSS } from "https://deno.land/x/aleph/framework/core/style.ts"',
+      'const css = "h1{font-size:18px}\\n"',
+      'applyCSS("/test.css", css)',
+      'export default { __url$: "/test.css", __css$: css, }'
+    ].join('\n'))
+
+    stopEsbuild()
+  }
 })
 
 Deno.test('css processor of remote CSS', async () => {

server/helper.ts

@@ -1,3 +1,5 @@
+// @deno-types="https://deno.land/x/[email protected]/mod.d.ts"
+export { build as esbuild, stop as stopEsbuild } from 'https://deno.land/x/[email protected]/mod.js'
 import { dim, red, yellow } from 'https://deno.land/[email protected]/fmt/colors.ts'
 import { createHash } from 'https://deno.land/[email protected]/hash/mod.ts'
 import { relative } from 'https://deno.land/[email protected]/path/mod.ts'