test: add assetInclude and update lock

Author: SoonIter

packages/core/src/asset/assetConfig.ts

@@ -36,7 +36,7 @@ const pluginLibAsset = ({ bundle }: { bundle: boolean }): RsbuildPlugin => ({
         ? originalGeneratorOptions
         : {
             ...originalGeneratorOptions,
-            experimentalLibPreserveImport: true,
+            importMode: 'preserve',
           };
 
       const rule = config.module.rule(CHAIN_ID.RULE.SVG);
@@ -57,20 +57,25 @@ const pluginLibAsset = ({ bundle }: { bundle: boolean }): RsbuildPlugin => ({
         CHAIN_ID.RULE.FONT,
         CHAIN_ID.RULE.MEDIA,
         CHAIN_ID.RULE.IMAGE,
+        CHAIN_ID.RULE.ADDITIONAL_ASSETS,
       ];
       for (const ruleId of ruleIds) {
         const oneOfId = `${ruleId}-asset`;
-        const assetRule = config.module.rules.get(ruleId).oneOfs.get(oneOfId);
+        const assetRule = config.module.rules.get(ruleId);
+        if (!assetRule) {
+          continue;
+        }
+        const assetRuleOneOf = assetRule.oneOfs.get(oneOfId);
 
-        const originalTypeOptions = assetRule.get('type');
-        const originalParserOptions = assetRule.get('parser');
-        const originalGeneratorOptions = assetRule.get('generator');
+        const originalTypeOptions = assetRuleOneOf.get('type');
+        const originalParserOptions = assetRuleOneOf.get('parser');
+        const originalGeneratorOptions = assetRuleOneOf.get('generator');
 
         const generatorOptions = isUserSetPublicPath
           ? originalGeneratorOptions
           : {
               ...originalGeneratorOptions,
-              experimentalLibPreserveImport: true,
+              importMode: 'preserve',
             };
 
         const rule = config.module.rule(ruleId);

pnpm-lock.yaml

@@ -25,6 +25,18 @@ export { __webpack_exports__bar as bar, __webpack_exports__foo as foo };
 "
 `;
 
+exports[`use source.assetInclude 1`] = `
+"import draft_namespaceObject from "./static/assets/draft.txt";
+console.log(draft_namespaceObject);
+"
+`;
+
+exports[`use source.assetInclude 2`] = `
+"import draft_rslib_entry_namespaceObject from "../static/assets/draft.txt";
+export { draft_rslib_entry_namespaceObject as default };
+"
+`;
+
 exports[`use svgr 1`] = `
 "import __rslib_svgr_url__0__ from "./static/svg/logo.svg";
 import * as __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__ from "react/jsx-runtime";

tests/integration/asset/__snapshots__/index.test.ts.snap

@@ -0,0 +1,6 @@
+{
+  "name": "assets-include-test",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module"
+}

tests/integration/asset/asset-include/package.json

@@ -0,0 +1,35 @@
+import { defineConfig } from '@rslib/core';
+import { generateBundleEsmConfig } from 'test-helper';
+
+export default defineConfig({
+  lib: [
+    // 0. bundle
+    // esm
+    generateBundleEsmConfig({
+      source: {
+        assetsInclude: /\.txt/,
+      },
+      output: {
+        distPath: {
+          root: './dist/esm/bundle',
+        },
+      },
+    }),
+    // 1. bundleless
+    // esm
+    generateBundleEsmConfig({
+      bundle: false,
+      source: {
+        assetsInclude: /\.txt/,
+      },
+      output: {
+        distPath: {
+          root: './dist/esm/bundleless',
+        },
+      },
+    }),
+  ],
+  output: {
+    target: 'web',
+  },
+});

tests/integration/asset/asset-include/rslib.config.ts

@@ -0,0 +1,2 @@
+this is a txt file
+this is a txt file

tests/integration/asset/asset-include/src/assets/draft.txt

@@ -0,0 +1,3 @@
+import draft from './assets/draft.txt';
+
+console.log(draft);

tests/integration/asset/asset-include/src/index.js

@@ -322,3 +322,17 @@ test('use asset/source', async () => {
   const { content: dataJs } = queryContent(contents.esm1!, /assets\/draft\.js/);
   expect(dataJs).matchSnapshot();
 });
+
+test('use source.assetInclude', async () => {
+  const fixturePath = join(__dirname, 'asset-include');
+  const { contents } = await buildAndGetResults({ fixturePath });
+
+  // 0. bundle
+  // esm
+  const { content: indexJs } = queryContent(contents.esm0!, /index\.js/);
+  expect(indexJs).matchSnapshot();
+  // 1. bundleless
+  // esm
+  const { content: dataJs } = queryContent(contents.esm1!, /assets\/draft\.js/);
+  expect(dataJs).matchSnapshot();
+});

tests/integration/asset/index.test.ts

@@ -1,5 +1,5 @@
 {
-  "name": "assets-include-test",
+  "name": "assets-source-test",
   "version": "1.0.0",
   "private": true,
   "type": "module"