@rspack/core 0.7.5-canary-9ec73cf-20240620092522 → 0.7.5-canary-129960e-20240620181737

package/dist/config/adapter.js

@@ -85,21 +85,24 @@ function getRawResolveByDependency(byDependency) {
         return byDependency;
     return Object.fromEntries(Object.entries(byDependency).map(([k, v]) => [k, getRawResolve(v)]));
 }
+function getRawTsConfig(tsConfig) {
+    (0, assert_1.default)(typeof tsConfig !== "string", "should resolve string tsConfig in normalization");
+    if (tsConfig === undefined)
+        return tsConfig;
+    const { configFile, references } = tsConfig;
+    return {
+        configFile,
+        referencesType: references == "auto" ? "auto" : references ? "manual" : "disabled",
+        references: references == "auto" ? undefined : references
+    };
+}
 function getRawResolve(resolve) {
-    let references = resolve.tsConfig?.references;
-    let tsconfigConfigFile = resolve.tsConfigPath ?? resolve.tsConfig?.configFile;
     return {
         ...resolve,
         alias: getRawAlias(resolve.alias),
         fallback: getRawAlias(resolve.fallback),
         extensionAlias: getRawExtensionAlias(resolve.extensionAlias),
-        tsconfig: tsconfigConfigFile
-            ? {
-                configFile: tsconfigConfigFile,
-                referencesType: references == "auto" ? "auto" : references ? "manual" : "disabled",
-                references: references == "auto" ? undefined : references
-            }
-            : undefined,
+        tsconfig: getRawTsConfig(resolve.tsConfig),
         byDependency: getRawResolveByDependency(resolve.byDependency)
     };
 }

package/dist/config/adapterRuleUse.js

@@ -16,20 +16,9 @@ exports.createRawModuleRuleUses = createRawModuleRuleUses;
 const getSwcLoaderOptions = (o, options) => {
     if (o && typeof o === "object" && o.rspackExperiments) {
         let expr = o.rspackExperiments;
-        const contextPath = options.context;
-        const production = options.mode === "production" || !options.mode;
-        if (expr.emotion) {
-            expr.emotion = (0, builtin_loader_1.resolveEmotion)(expr.emotion, production);
-        }
-        if (expr.relay) {
-            expr.relay = (0, builtin_loader_1.resolveRelay)(expr.relay, contextPath);
-        }
         if (expr.import || expr.pluginImport) {
             expr.import = (0, builtin_loader_1.resolvePluginImport)(expr.import || expr.pluginImport);
         }
-        if (expr.react) {
-            expr.react = (0, builtin_loader_1.resolveReact)(expr.react);
-        }
         if (expr.preact) {
             expr.preact = (0, builtin_loader_1.resolvePreact)(expr.preact);
         }

package/dist/config/normalization.js

@@ -123,10 +123,20 @@ const getNormalizedRspackOptions = (config) => {
             };
         }),
         resolve: nestedConfig(config.resolve, resolve => ({
-            ...resolve
+            ...resolve,
+            tsConfig: optionalNestedConfig(resolve.tsConfig, tsConfig => {
+                return typeof tsConfig === "string"
+                    ? { configFile: tsConfig }
+                    : tsConfig;
+            })
         })),
         resolveLoader: nestedConfig(config.resolveLoader, resolve => ({
-            ...resolve
+            ...resolve,
+            tsConfig: optionalNestedConfig(resolve.tsConfig, tsConfig => {
+                return typeof tsConfig === "string"
+                    ? { configFile: tsConfig }
+                    : tsConfig;
+            })
         })),
         module: nestedConfig(config.module, module => ({
             noParse: module.noParse,

package/dist/config/zod.d.ts

@@ -1431,7 +1431,7 @@ declare const output: z.ZodObject<{
 export type Output = z.infer<typeof output>;
 declare const resolveAlias: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodUnion<[z.ZodLiteral<false>, z.ZodString]>, z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodLiteral<false>]>, "many">]>>;
 export type ResolveAlias = z.infer<typeof resolveAlias>;
-declare const resolveTsconfig: z.ZodObject<{
+declare const resolveTsConfig: z.ZodUnion<[z.ZodString, z.ZodObject<{
     configFile: z.ZodString;
     references: z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodLiteral<"auto">]>>;
 }, "strict", z.ZodTypeAny, {
@@ -1440,8 +1440,8 @@ declare const resolveTsconfig: z.ZodObject<{
 }, {
     configFile: string;
     references?: string[] | "auto" | undefined;
-}>;
-export type ResolveTsconfig = z.infer<typeof resolveTsconfig>;
+}>]>;
+export type ResolveTsConfig = z.infer<typeof resolveTsConfig>;
 declare const baseResolveOptions: z.ZodObject<{
     alias: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodUnion<[z.ZodLiteral<false>, z.ZodString]>, z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodLiteral<false>]>, "many">]>>>;
     conditionNames: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
@@ -1456,8 +1456,7 @@ declare const baseResolveOptions: z.ZodObject<{
     enforceExtension: z.ZodOptional<z.ZodBoolean>;
     importsFields: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     descriptionFiles: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-    tsConfigPath: z.ZodOptional<z.ZodString>;
-    tsConfig: z.ZodOptional<z.ZodObject<{
+    tsConfig: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodObject<{
         configFile: z.ZodString;
         references: z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodLiteral<"auto">]>>;
     }, "strict", z.ZodTypeAny, {
@@ -1466,7 +1465,7 @@ declare const baseResolveOptions: z.ZodObject<{
     }, {
         configFile: string;
         references?: string[] | "auto" | undefined;
-    }>>;
+    }>]>>;
     fullySpecified: z.ZodOptional<z.ZodBoolean>;
     exportsFields: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     extensionAlias: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>>;
@@ -1487,8 +1486,7 @@ declare const baseResolveOptions: z.ZodObject<{
     enforceExtension?: boolean | undefined;
     importsFields?: string[] | undefined;
     descriptionFiles?: string[] | undefined;
-    tsConfigPath?: string | undefined;
-    tsConfig?: {
+    tsConfig?: string | {
         configFile: string;
         references?: string[] | "auto" | undefined;
     } | undefined;
@@ -1512,8 +1510,7 @@ declare const baseResolveOptions: z.ZodObject<{
     enforceExtension?: boolean | undefined;
     importsFields?: string[] | undefined;
     descriptionFiles?: string[] | undefined;
-    tsConfigPath?: string | undefined;
-    tsConfig?: {
+    tsConfig?: string | {
         configFile: string;
         references?: string[] | "auto" | undefined;
     } | undefined;

package/dist/config/zod.js

@@ -230,10 +230,11 @@ const resolveAlias = zod_1.z.record(zod_1.z
     .literal(false)
     .or(zod_1.z.string())
     .or(zod_1.z.array(zod_1.z.string().or(zod_1.z.literal(false)))));
-const resolveTsconfig = zod_1.z.strictObject({
-    configFile: zod_1.z.string(),
+const resolveTsConfigFile = zod_1.z.string();
+const resolveTsConfig = resolveTsConfigFile.or(zod_1.z.strictObject({
+    configFile: resolveTsConfigFile,
     references: zod_1.z.array(zod_1.z.string()).or(zod_1.z.literal("auto")).optional()
-});
+}));
 const baseResolveOptions = zod_1.z.strictObject({
     alias: resolveAlias.optional(),
     conditionNames: zod_1.z.array(zod_1.z.string()).optional(),
@@ -248,8 +249,7 @@ const baseResolveOptions = zod_1.z.strictObject({
     enforceExtension: zod_1.z.boolean().optional(),
     importsFields: zod_1.z.array(zod_1.z.string()).optional(),
     descriptionFiles: zod_1.z.array(zod_1.z.string()).optional(),
-    tsConfigPath: zod_1.z.string().optional(),
-    tsConfig: resolveTsconfig.optional(),
+    tsConfig: resolveTsConfig.optional(),
     fullySpecified: zod_1.z.boolean().optional(),
     exportsFields: zod_1.z.array(zod_1.z.string()).optional(),
     extensionAlias: zod_1.z.record(zod_1.z.string().or(zod_1.z.array(zod_1.z.string()))).optional(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/core",
-  "version": "0.7.5-canary-9ec73cf-20240620092522",
+  "version": "0.7.5-canary-129960e-20240620181737",
   "webpackVersion": "5.75.0",
   "license": "MIT",
   "description": "The fast Rust-based web bundler with webpack-compatible API",
@@ -74,15 +74,15 @@
     "watchpack": "^2.4.0",
     "zod": "^3.21.4",
     "zod-validation-error": "1.3.1",
-    "@rspack/core": "0.7.5-canary-9ec73cf-20240620092522",
-    "@rspack/plugin-minify": "^0.7.5-canary-9ec73cf-20240620092522"
+    "@rspack/core": "0.7.5-canary-129960e-20240620181737",
+    "@rspack/plugin-minify": "^0.7.5-canary-129960e-20240620181737"
   },
   "dependencies": {
     "@module-federation/runtime-tools": "0.1.6",
     "caniuse-lite": "^1.0.30001616",
     "tapable": "2.2.1",
     "webpack-sources": "3.2.3",
-    "@rspack/binding": "0.7.5-canary-9ec73cf-20240620092522"
+    "@rspack/binding": "0.7.5-canary-129960e-20240620181737"
   },
   "peerDependencies": {
     "@swc/helpers": ">=0.5.1"