vite 2.5.8 → 2.5.9

package/dist/node/cli.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var require$$0$1 = require('events');
-var build = require('./chunks/dep-874085d4.js');
+var build = require('./chunks/dep-05fcddd5.js');
 var path = require('path');
 var require$$0$2 = require('tty');
 var require$$0$3 = require('util');
@@ -14002,7 +14002,7 @@ cli
     .action(async (root, options) => {
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await Promise.resolve().then(function () { return require('./chunks/dep-874085d4.js'); }).then(function (n) { return n.index$1; });
+    const { createServer } = await Promise.resolve().then(function () { return require('./chunks/dep-05fcddd5.js'); }).then(function (n) { return n.index$1; });
     try {
         const server = await createServer({
             root,
@@ -14036,7 +14036,7 @@ cli
     .option('--emptyOutDir', `[boolean] force empty outDir when it's outside of root`)
     .option('-w, --watch', `[boolean] rebuilds when modules have changed on disk`)
     .action(async (root, options) => {
-    const { build: build$1 } = await Promise.resolve().then(function () { return require('./chunks/dep-874085d4.js'); }).then(function (n) { return n.build$1; });
+    const { build: build$1 } = await Promise.resolve().then(function () { return require('./chunks/dep-05fcddd5.js'); }).then(function (n) { return n.build$1; });
     const buildOptions = cleanOptions(options);
     try {
         await build$1({
@@ -14059,7 +14059,7 @@ cli
     .command('optimize [root]')
     .option('--force', `[boolean] force the optimizer to ignore the cache and re-bundle`)
     .action(async (root, options) => {
-    const { optimizeDeps } = await Promise.resolve().then(function () { return require('./chunks/dep-874085d4.js'); }).then(function (n) { return n.index; });
+    const { optimizeDeps } = await Promise.resolve().then(function () { return require('./chunks/dep-05fcddd5.js'); }).then(function (n) { return n.index; });
     try {
         const config = await build.resolveConfig({
             root,

package/dist/node/index.d.ts

@@ -2,6 +2,7 @@
 
 import { BuildOptions as BuildOptions_2 } from 'esbuild';
 import { CustomPluginOptions } from 'rollup';
+import { TransformOptions as EsbuildTransformOptions } from 'esbuild';
 import * as events from 'events';
 import * as fs from 'fs';
 import * as http from 'http';
@@ -28,7 +29,6 @@ import { ServerResponse } from 'http';
 import { SourceDescription } from 'rollup';
 import { SourceMap } from 'rollup';
 import * as stream from 'stream';
-import { TransformOptions as TransformOptions_2 } from 'esbuild';
 import { TransformPluginContext } from 'rollup';
 import { TransformResult as TransformResult_2 } from 'rollup';
 import { TransformResult as TransformResult_3 } from 'esbuild';
@@ -89,7 +89,7 @@ export declare interface BuildOptions {
      * For custom targets, see https://esbuild.github.io/api/#target and
      * https://esbuild.github.io/content-types/#javascript for more details.
      */
-    target?: 'modules' | TransformOptions_2['target'] | false;
+    target?: 'modules' | EsbuildTransformOptions['target'] | false;
     /**
      * whether to inject module preload polyfill.
      * Note: does not apply to library mode.
@@ -471,12 +471,14 @@ export declare interface ErrorPayload {
     }
 }
 
-export declare interface ESBuildOptions extends TransformOptions_2 {
+export declare interface ESBuildOptions extends EsbuildTransformOptions {
     include?: string | RegExp | string[] | RegExp[];
     exclude?: string | RegExp | string[] | RegExp[];
     jsxInject?: string;
 }
 
+export { EsbuildTransformOptions }
+
 export declare type ESBuildTransformResult = Omit<TransformResult_3, 'map'> & {
     map: SourceMap;
 };
@@ -1684,6 +1686,8 @@ export declare interface TransformResult {
     dynamicDeps?: string[];
 }
 
+export declare function transformWithEsbuild(code: string, filename: string, options?: EsbuildTransformOptions, inMap?: object): Promise<ESBuildTransformResult>;
+
 export declare interface Update {
     type: 'js-update' | 'css-update'
     path: string
@@ -1870,8 +1874,10 @@ export declare interface ViteDevServer {
     /**
      * Util for transforming a file with esbuild.
      * Can be useful for certain plugins.
+     *
+     * @deprecated import `transformWithEsbuild` from `vite` instead
      */
-    transformWithEsbuild(code: string, filename: string, options?: TransformOptions_2, inMap?: object): Promise<ESBuildTransformResult>;
+    transformWithEsbuild(code: string, filename: string, options?: EsbuildTransformOptions, inMap?: object): Promise<ESBuildTransformResult>;
     /**
      * Load a given URL as an instantiated module for SSR.
      */

package/dist/node/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var build = require('./chunks/dep-874085d4.js');
+var build = require('./chunks/dep-05fcddd5.js');
 require('fs');
 require('path');
 require('os');
@@ -47,4 +47,5 @@ exports.resolvePackageData = build.resolvePackageData;
 exports.resolvePackageEntry = build.resolvePackageEntry;
 exports.send = build.send;
 exports.sortUserPlugins = build.sortUserPlugins;
+exports.transformWithEsbuild = build.transformWithEsbuild;
 //# sourceMappingURL=index.js.map

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "2.5.8",
+  "version": "2.5.9",
   "license": "MIT",
   "author": "Evan You",
   "description": "Native-ESM powered web dev build tool",

package/src/node/index.ts

@@ -4,6 +4,7 @@ export { build } from './build'
 export { optimizeDeps } from './optimizer'
 export { send } from './server/send'
 export { createLogger } from './logger'
+export { transformWithEsbuild } from './plugins/esbuild'
 export { resolvePackageData, resolvePackageEntry } from './plugins/resolve'
 export { normalizePath } from './utils'
 
@@ -51,6 +52,7 @@ export type {
 } from './plugins/html'
 export type { CSSOptions, CSSModulesOptions } from './plugins/css'
 export type { JsonOptions } from './plugins/json'
+export type { TransformOptions as EsbuildTransformOptions } from 'esbuild'
 export type { ESBuildOptions, ESBuildTransformResult } from './plugins/esbuild'
 export type { Manifest, ManifestChunk } from './plugins/manifest'
 export type {

package/src/node/plugins/esbuild.ts

@@ -50,52 +50,70 @@ export async function transformWithEsbuild(
   options?: TransformOptions,
   inMap?: object
 ): Promise<ESBuildTransformResult> {
-  // if the id ends with a valid ext, use it (e.g. vue blocks)
-  // otherwise, cleanup the query before checking the ext
-  const ext = path.extname(
-    /\.\w+$/.test(filename) ? filename : cleanUrl(filename)
-  )
+  let loader = options?.loader
+
+  if (!loader) {
+    // if the id ends with a valid ext, use it (e.g. vue blocks)
+    // otherwise, cleanup the query before checking the ext
+    const ext = path
+      .extname(/\.\w+$/.test(filename) ? filename : cleanUrl(filename))
+      .slice(1)
 
-  let loader = ext.slice(1)
-  if (loader === 'cjs' || loader === 'mjs') {
-    loader = 'js'
+    if (ext === 'cjs' || ext === 'mjs') {
+      loader = 'js'
+    } else {
+      loader = ext as Loader
+    }
   }
 
-  // these fields would affect the compilation result
-  // https://esbuild.github.io/content-types/#tsconfig-json
-  const meaningfulFields: Array<keyof TSCompilerOptions> = [
-    'jsxFactory',
-    'jsxFragmentFactory',
-    'useDefineForClassFields',
-    'importsNotUsedAsValues'
-  ]
-  const compilerOptionsForFile: TSCompilerOptions = {}
-  if (loader === 'ts' || loader === 'tsx') {
-    const loadedTsconfig = await loadTsconfigJsonForFile(filename)
-    const loadedCompilerOptions = loadedTsconfig.compilerOptions ?? {}
-
-    for (const field of meaningfulFields) {
-      if (field in loadedCompilerOptions) {
-        // @ts-ignore TypeScript can't tell they are of the same type
-        compilerOptionsForFile[field] = loadedCompilerOptions[field]
+  let tsconfigRaw = options?.tsconfigRaw
+
+  // if options provide tsconfigraw in string, it takes highest precedence
+  if (typeof tsconfigRaw !== 'string') {
+    // these fields would affect the compilation result
+    // https://esbuild.github.io/content-types/#tsconfig-json
+    const meaningfulFields: Array<keyof TSCompilerOptions> = [
+      'jsxFactory',
+      'jsxFragmentFactory',
+      'useDefineForClassFields',
+      'importsNotUsedAsValues'
+    ]
+    const compilerOptionsForFile: TSCompilerOptions = {}
+    if (loader === 'ts' || loader === 'tsx') {
+      const loadedTsconfig = await loadTsconfigJsonForFile(filename)
+      const loadedCompilerOptions = loadedTsconfig.compilerOptions ?? {}
+
+      for (const field of meaningfulFields) {
+        if (field in loadedCompilerOptions) {
+          // @ts-ignore TypeScript can't tell they are of the same type
+          compilerOptionsForFile[field] = loadedCompilerOptions[field]
+        }
+      }
+
+      // align with TypeScript 4.3
+      // https://github.com/microsoft/TypeScript/pull/42663
+      if (loadedCompilerOptions.target?.toLowerCase() === 'esnext') {
+        compilerOptionsForFile.useDefineForClassFields =
+          loadedCompilerOptions.useDefineForClassFields ?? true
       }
     }
 
-    // align with TypeScript 4.3
-    // https://github.com/microsoft/TypeScript/pull/42663
-    if (loadedCompilerOptions.target?.toLowerCase() === 'esnext') {
-      compilerOptionsForFile.useDefineForClassFields =
-        loadedCompilerOptions.useDefineForClassFields ?? true
+    tsconfigRaw = {
+      ...tsconfigRaw,
+      compilerOptions: {
+        ...compilerOptionsForFile,
+        ...tsconfigRaw?.compilerOptions
+      }
     }
   }
 
   const resolvedOptions = {
-    loader: loader as Loader,
     sourcemap: true,
     // ensure source file name contains full query
     sourcefile: filename,
-    tsconfigRaw: { compilerOptions: compilerOptionsForFile },
-    ...options
+    ...options,
+    loader,
+    tsconfigRaw
   } as ESBuildOptions
 
   delete resolvedOptions.include

package/src/node/server/index.ts

@@ -237,6 +237,8 @@ export interface ViteDevServer {
   /**
    * Util for transforming a file with esbuild.
    * Can be useful for certain plugins.
+   *
+   * @deprecated import `transformWithEsbuild` from `vite` instead
    */
   transformWithEsbuild(
     code: string,