Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: add e2e case for toml-loader #1115

Merged
merged 2 commits into from
Dec 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/three-zoos-hammer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rsbuild/shared': patch
'@rsbuild/core': patch
---

test: add e2e case for toml-loader
16 changes: 16 additions & 0 deletions e2e/cases/import-toml/index.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { expect } from '@playwright/test';
import { rspackOnlyTest } from '@scripts/helper';
import { build, getHrefByEntryName } from '@scripts/shared';

rspackOnlyTest('should import TOML correctly', async ({ page }) => {
const rsbuild = await build({
cwd: __dirname,
runServer: true,
});

await page.goto(getHrefByEntryName('index', rsbuild.port));
expect(await page.evaluate('window.age')).toBe(1);
expect(await page.evaluate('window.b')).toBe('{"list":[1,2]}');

await rsbuild.close();
});
2 changes: 2 additions & 0 deletions e2e/cases/import-toml/src/a.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
foo = "bar"
age = 1
1 change: 1 addition & 0 deletions e2e/cases/import-toml/src/b.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
list = [1, 2]
5 changes: 5 additions & 0 deletions e2e/cases/import-toml/src/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { age } from './a.toml';
import b from './b.toml';

window.age = age;
window.b = JSON.stringify(b);
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctly 1`] = `
"type": "javascript/auto",
"use": [
{
"loader": "<ROOT>/packages/shared/compiled/toml-loader",
"loader": "<ROOT>/packages/core/compiled/toml-loader",
},
],
},
Expand Down Expand Up @@ -848,7 +848,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when produ
"type": "javascript/auto",
"use": [
{
"loader": "<ROOT>/packages/shared/compiled/toml-loader",
"loader": "<ROOT>/packages/core/compiled/toml-loader",
},
],
},
Expand Down Expand Up @@ -1299,7 +1299,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when targe
"type": "javascript/auto",
"use": [
{
"loader": "<ROOT>/packages/shared/compiled/toml-loader",
"loader": "<ROOT>/packages/core/compiled/toml-loader",
},
],
},
Expand Down Expand Up @@ -1651,7 +1651,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when targe
"type": "javascript/auto",
"use": [
{
"loader": "<ROOT>/packages/shared/compiled/toml-loader",
"loader": "<ROOT>/packages/core/compiled/toml-loader",
},
],
},
Expand Down
1 change: 1 addition & 0 deletions packages/core/compiled/toml-loader/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"name":"toml-loader","author":"Kyle Mathews <mathews.kyle@gmail.com>","version":"1.0.0","license":"MIT","types":"index.d.ts","type":"commonjs"}
4 changes: 2 additions & 2 deletions packages/core/src/plugins/toml.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getSharedPkgCompiledPath } from '@rsbuild/shared';
import { join } from 'path';
import type { RsbuildPlugin } from '../types';

export const pluginToml = (): RsbuildPlugin => ({
Expand All @@ -11,7 +11,7 @@ export const pluginToml = (): RsbuildPlugin => ({
.type('javascript/auto')
.test(/\.toml$/)
.use(CHAIN_ID.USE.TOML)
.loader(getSharedPkgCompiledPath('toml-loader'));
.loader(join(__dirname, '../../compiled', 'toml-loader'));
});
},
});
2 changes: 1 addition & 1 deletion packages/core/tests/__snapshots__/builder.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ exports[`should use rspack as default bundler > apply rspack correctly 1`] = `
"type": "javascript/auto",
"use": [
{
"loader": "<ROOT>/packages/shared/compiled/toml-loader",
"loader": "<ROOT>/packages/core/compiled/toml-loader",
},
],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ exports[`plugin-toml > should add toml rule properly 1`] = `
"type": "javascript/auto",
"use": [
{
"loader": "<ROOT>/packages/shared/compiled/toml-loader",
"loader": "<ROOT>/packages/core/compiled/toml-loader",
},
],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctly 1`] = `
"type": "javascript/auto",
"use": [
{
"loader": "<ROOT>/packages/shared/compiled/toml-loader",
"loader": "<ROOT>/packages/core/compiled/toml-loader",
},
],
},
Expand Down Expand Up @@ -1253,7 +1253,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when prod
"type": "javascript/auto",
"use": [
{
"loader": "<ROOT>/packages/shared/compiled/toml-loader",
"loader": "<ROOT>/packages/core/compiled/toml-loader",
},
],
},
Expand Down Expand Up @@ -1791,7 +1791,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when targe
"type": "javascript/auto",
"use": [
{
"loader": "<ROOT>/packages/shared/compiled/toml-loader",
"loader": "<ROOT>/packages/core/compiled/toml-loader",
},
],
},
Expand Down Expand Up @@ -2428,7 +2428,7 @@ exports[`tools.rspack > should match snapshot 1`] = `
"type": "javascript/auto",
"use": [
{
"loader": "<ROOT>/packages/shared/compiled/toml-loader",
"loader": "<ROOT>/packages/core/compiled/toml-loader",
},
],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ exports[`plugins/react > should work with swc-loader 1`] = `
"type": "javascript/auto",
"use": [
{
"loader": "<ROOT>/packages/shared/compiled/toml-loader",
"loader": "<ROOT>/packages/core/compiled/toml-loader",
},
],
},
Expand Down
1 change: 0 additions & 1 deletion packages/shared/compiled/toml-loader/package.json

This file was deleted.

1 change: 0 additions & 1 deletion packages/shared/src/types/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ export type SharedCompiledPkgNames =
| 'sass-loader'
| 'less-loader'
| 'node-loader'
| 'toml-loader'
| 'yaml-loader'
| 'resolve-url-loader';

Expand Down
14 changes: 14 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions scripts/prebundle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"postcss-modules-extract-imports": "3.0.0",
"sass-loader": "13.3.3",
"semver": "^7.5.4",
"toml-loader": "1.0.0",
"rslog": "^1.1.2",
"sirv": "^2.0.3",
"webpack-bundle-analyzer": "4.9.0",
Expand Down
4 changes: 4 additions & 0 deletions scripts/prebundle/src/constant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ export const TASKS: TaskConfig[] = [
name: 'connect-history-api-fallback',
ignoreDts: true,
},
{
name: 'toml-loader',
ignoreDts: true,
},
],
},
{
Expand Down