chore: update optimizer sourcemaps, getTypeScriptPath()

src/optimizer/esbuild/builder.ts

@@ -6,11 +6,7 @@ import { createTimer } from '../utils';
 /**
  * @alpha
  */
-export function createEsbuilder(opts: {
-  outDir: string;
-  clientOpts?: BuildOptions;
-  serverOpts?: BuildOptions;
-}) {
+export function createEsbuilder(opts: { outDir: string; clientOpts?: any; serverOpts?: any }) {
   const results: EsBuildPluginData = {};
 
   const builder = {

src/optimizer/loader.ts

@@ -1,7 +1,7 @@
 const QWIK_LOADER_DEFAULT_MINIFIED: string = (globalThis as any).QWIK_LOADER_DEFAULT_MINIFIED;
 const QWIK_LOADER_DEFAULT_DEBUG: string = (globalThis as any).QWIK_LOADER_DEFAULT_DEBUG;
-const QWIK_LOADER_EVENTS_MINIFIED: string = (globalThis as any).QWIK_LOADER_EVENTS_MINIFIED;
-const QWIK_LOADER_EVENTS_DEBUG: string = (globalThis as any).QWIK_LOADER_EVENTS_DEBUG;
+const QWIK_LOADER_OPTIMIZE_MINIFIED: string = (globalThis as any).QWIK_LOADER_OPTIMIZE_MINIFIED;
+const QWIK_LOADER_OPTIMIZE_DEBUG: string = (globalThis as any).QWIK_LOADER_OPTIMIZE_DEBUG;
 
 /**
  * Provides the qwikloader.js file as a string. Useful for tooling to inline the qwikloader
@@ -11,7 +11,7 @@ const QWIK_LOADER_EVENTS_DEBUG: string = (globalThis as any).QWIK_LOADER_EVENTS_
 export function getQwikLoaderScript(opts: { events?: string[]; debug?: boolean } = {}) {
   if (Array.isArray(opts.events) && opts.events.length > 0) {
     // inject exact known events used
-    const loader = opts.debug ? QWIK_LOADER_EVENTS_DEBUG : QWIK_LOADER_EVENTS_MINIFIED;
+    const loader = opts.debug ? QWIK_LOADER_OPTIMIZE_DEBUG : QWIK_LOADER_OPTIMIZE_MINIFIED;
     return loader.replace('globalThis.qEvents', JSON.stringify(opts.events));
   }
 

src/optimizer/optimizer.ts

@@ -17,7 +17,7 @@ import {
   getTypeScriptSync,
 } from './typescript-platform';
 import { getEntryPoints, normalizeOptions, normalizeUrl, platform } from './utils';
-import { transformModule } from './transform';
+import { transformModuleSync } from './transform';
 import type TypeScript from 'typescript';
 import { postBuild } from './post-build';
 
@@ -28,7 +28,7 @@ import { postBuild } from './post-build';
 export class Optimizer {
   private baseUrl = normalizeUrl('/');
   private rootDir: string | null = null;
-  private sourceMapOpt: SourceMapOption = true;
+  private sourceMapOpt: SourceMapOption = null;
   private enabledCache = true;
   private internalCache: InternalCache = {
     modules: [],
@@ -37,6 +37,7 @@ export class Optimizer {
   private mode: Mode = 'development';
   private ts: any = null;
   private tsconfig: any = null;
+  private typescriptPath: string | null = null;
   private entryInputs: string[] | null = null;
   private moduleResolveCache: TypeScript.ModuleResolutionCache | null = null;
 
@@ -126,13 +127,13 @@ export class Optimizer {
   async transformModule(opts: TransformModuleOptions): Promise<TransformModuleResult> {
     const ts = await this.getTypeScript();
     const tsconfig: TypeScript.ParsedCommandLine = await this.getTsconfig();
-    return transformModule(this, this.internalCache, opts, ts, tsconfig.options);
+    return transformModuleSync(this, this.internalCache, opts, ts, tsconfig.options);
   }
 
   transformModuleSync(opts: TransformModuleOptions): TransformModuleResult {
     const ts = this.getTypeScriptSync();
     const tsconfig: TypeScript.ParsedCommandLine = this.getTsconfigSync();
-    return transformModule(this, this.internalCache, opts, ts, tsconfig.options);
+    return transformModuleSync(this, this.internalCache, opts, ts, tsconfig.options);
   }
 
   async getTsconfig() {
@@ -155,19 +156,38 @@ export class Optimizer {
 
   async getTypeScript() {
     if (!this.ts) {
-      this.ts = await getTypeScript(this.getRootDir());
+      this.ts = await getTypeScript(this);
     }
     return this.ts;
   }
 
   getTypeScriptSync() {
     if (!this.ts) {
-      this.ts = getTypeScriptSync();
+      this.ts = getTypeScriptSync(this);
     }
     return this.ts;
   }
 
   setTypeScript(ts: any) {
     this.ts = ts;
   }
+
+  getTypeScriptPath() {
+    if (this.typescriptPath) {
+      return this.typescriptPath;
+    }
+    if (platform === 'node') {
+      return `typescript`;
+    }
+    if (platform === 'browser-main' || platform === 'browser-webworker') {
+      throw Error(
+        `TypeScript CDN URL must be set using the "typescriptPath" option, such as: https://cdn.jsdelivr.net/npm/typescript@4.2.0/lib/typescript.js`
+      );
+    }
+    throw Error(`unsupported platform`);
+  }
+
+  setTypeScriptPath(typescriptPath: string) {
+    this.typescriptPath = typescriptPath;
+  }
 }

src/optimizer/transform.ts

@@ -7,7 +7,7 @@ import type {
 import type TypeScript from 'typescript';
 import { isJsxFile, toBase64 } from './utils';
 
-export function transformModule(
+export function transformModuleSync(
   optimizer: Optimizer,
   c: InternalCache,
   opts: TransformModuleOptions,
@@ -106,6 +106,9 @@ function getCompilerOptions(
     allowNonTsExtensions: true,
     noLib: true,
     noResolve: true,
+    sourceMap: false,
+    inlineSourceMap: false,
+    inlineSources: false,
   };
 
   if (typeof compilerOpts.esModuleInterop !== 'boolean') {
@@ -118,11 +121,13 @@ function getCompilerOptions(
     compilerOpts.target = ts.ScriptTarget.ES2017;
   }
 
-  if (opts.sourcemap === true || opts.sourcemap === 'inline') {
+  const sourcemap = opts.sourcemap || optimizer.getSourceMapOption();
+
+  if (sourcemap === 'inline') {
+    compilerOpts.inlineSourceMap = true;
+    compilerOpts.inlineSources = true;
+  } else if (sourcemap === 'external') {
     compilerOpts.sourceMap = true;
-  } else if (compilerOpts.sourceMap !== false) {
-    const sourceMapOpt = optimizer.getSourceMapOption();
-    compilerOpts.sourceMap = sourceMapOpt === true || sourceMapOpt === 'inline';
   }
 
   if (isJsxFile(opts.filePath)) {

src/optimizer/types.ts

@@ -8,6 +8,7 @@ export interface OptimizerOptions {
   sourcemap?: SourceMapOption;
   ts?: any;
   tsconfig?: any;
+  typescriptPath?: string;
 }
 
 export interface TransformModuleOptions {
@@ -31,7 +32,7 @@ export type Mode = 'development' | 'production';
 
 export type OutputPlatform = 'client' | 'server';
 
-export type SourceMapOption = boolean | 'inline';
+export type SourceMapOption = 'external' | 'inline' | null;
 
 export type { Optimizer };
 

src/optimizer/typescript-platform.ts

@@ -1,4 +1,5 @@
 import type TypeScript from 'typescript';
+import type { Optimizer } from './optimizer';
 import type { ResolveModuleOptions, ResolveModuleResult } from './types';
 import { platform } from './utils';
 
@@ -24,27 +25,28 @@ export function getTsconfig(
   return null;
 }
 
-export async function getTypeScript(rootDir: string): Promise<typeof TypeScript | null> {
-  if (platform === 'node' && typeof require !== 'function') {
+export async function getTypeScript(optimizer: Optimizer): Promise<typeof TypeScript | null> {
+  if (platform === 'node') {
+    try {
+      return require(optimizer.getTypeScriptPath());
+    } catch (e) {
+      /**/
+    }
     const module = await import('module');
-    const require = module.Module.createRequire(rootDir);
-    return require(getTypeScriptPath());
+    const moduleRequire = module.Module.createRequire(optimizer.getRootDir());
+    return moduleRequire(optimizer.getTypeScriptPath());
   }
-  return getTypeScriptSync();
+  return getTypeScriptSync(optimizer);
 }
 
-export function getTypeScriptSync(): typeof TypeScript | null {
+export function getTypeScriptSync(optimizer: Optimizer): typeof TypeScript | null {
   if (platform === 'node') {
-    if (typeof require === 'function') {
-      // NodeJs (CJS)
-      return require(getTypeScriptPath());
-    } else {
-      throw new Error('NodeJs require() not available');
-    }
+    // NodeJs (CJS)
+    return require(optimizer.getTypeScriptPath());
   } else if (platform === 'browser-webworker') {
     // Browser (Web Worker)
     if (!self.ts) {
-      (self as any).importScripts(getTypeScriptPath());
+      (self as any).importScripts(optimizer.getTypeScriptPath());
     }
     return self.ts as any;
   } else if (platform === 'browser-main') {
@@ -56,16 +58,6 @@ export function getTypeScriptSync(): typeof TypeScript | null {
   return null;
 }
 
-function getTypeScriptPath() {
-  if (platform === 'node') {
-    return `typescript`;
-  }
-  if (platform === 'browser-main' || platform === 'browser-webworker') {
-    return `https://cdn.jsdelivr.net/npm/typescript@__TYPESCRIPT__/lib/typescript.js`;
-  }
-  throw Error(`unsupported platform`);
-}
-
 export function resolveModuleSync(
   ts: typeof TypeScript,
   compilerOpts: TypeScript.CompilerOptions,

src/optimizer/utils.ts

@@ -3,12 +3,12 @@ import type { Optimizer, OptimizerOptions, EntryPointOptions } from './types';
 export function normalizeOptions(optimizer: Optimizer, opts?: OptimizerOptions) {
   if (opts) {
     if (typeof opts.cache === 'boolean') optimizer.enableCache(opts.cache);
-    if (typeof opts.sourcemap === 'string' || typeof opts.sourcemap === 'boolean')
-      optimizer.setSourceMapOption(opts.sourcemap);
+    if (typeof opts.sourcemap === 'string') optimizer.setSourceMapOption(opts.sourcemap);
     if (typeof opts.mode === 'string') optimizer.setMode(opts.mode);
     if (typeof opts.rootDir === 'string') optimizer.setRootDir(opts.rootDir);
     if (opts.ts) optimizer.setTypeScript(opts.ts);
     if (opts.tsconfig) optimizer.setTsconfig(opts.tsconfig);
+    if (typeof opts.typescriptPath === 'string') optimizer.setTypeScriptPath(opts.typescriptPath);
   }
 }