create-rsbuild 1.6.6 → 1.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/index.js +59 -2
- package/package.json +7 -7
- package/template-lit-js/package.json +2 -2
- package/template-lit-js/src/index.html +7 -5
- package/template-lit-ts/package.json +2 -2
- package/template-lit-ts/src/index.html +7 -5
- package/template-preact-js/package.json +3 -3
- package/template-preact-ts/package.json +3 -3
- package/template-react-js/package.json +3 -3
- package/template-react-ts/package.json +3 -3
- package/template-react18-js/package.json +1 -1
- package/template-react18-ts/package.json +1 -1
- package/template-rstest/AGENTS.md +10 -0
- package/template-rstest/react-js/package.json +13 -0
- package/template-rstest/react-js/rstest.config.js +9 -0
- package/template-rstest/react-js/tests/index.test.jsx +9 -0
- package/template-rstest/react-js/tests/rstest.setup.js +4 -0
- package/template-rstest/react-ts/package.json +13 -0
- package/template-rstest/react-ts/rstest.config.ts +9 -0
- package/template-rstest/react-ts/tests/index.test.tsx +9 -0
- package/template-rstest/react-ts/tests/rstest.setup.ts +4 -0
- package/template-rstest/react-ts/tests/tsconfig.json +7 -0
- package/template-rstest/vanilla-js/package.json +12 -0
- package/template-rstest/vanilla-js/rstest.config.js +7 -0
- package/template-rstest/vanilla-js/tests/dom.test.js +12 -0
- package/template-rstest/vanilla-js/tests/rstest.setup.js +4 -0
- package/template-rstest/vanilla-ts/package.json +12 -0
- package/template-rstest/vanilla-ts/rstest.config.ts +7 -0
- package/template-rstest/vanilla-ts/tests/dom.test.ts +12 -0
- package/template-rstest/vanilla-ts/tests/rstest.setup.ts +4 -0
- package/template-rstest/vanilla-ts/tests/tsconfig.json +7 -0
- package/template-rstest/vue-js/package.json +13 -0
- package/template-rstest/vue-js/rstest.config.js +9 -0
- package/template-rstest/vue-js/tests/index.test.js +9 -0
- package/template-rstest/vue-js/tests/rstest.setup.js +4 -0
- package/template-rstest/vue-ts/package.json +13 -0
- package/template-rstest/vue-ts/rstest.config.ts +9 -0
- package/template-rstest/vue-ts/tests/index.test.ts +9 -0
- package/template-rstest/vue-ts/tests/rstest.setup.ts +4 -0
- package/template-rstest/vue-ts/tests/tsconfig.json +7 -0
- package/template-solid-js/package.json +1 -1
- package/template-solid-ts/package.json +1 -1
- package/template-svelte-js/package.json +2 -2
- package/template-svelte-ts/package.json +3 -3
- package/template-tailwindcss/package.json +6 -0
- package/template-tailwindcss/postcss.config.mjs +5 -0
- package/template-vanilla-js/package.json +1 -1
- package/template-vanilla-ts/package.json +1 -1
- package/template-vue2-js/package.json +2 -2
- package/template-vue2-ts/package.json +2 -2
- package/template-vue3-js/package.json +3 -3
- package/template-vue3-ts/package.json +3 -3
package/README.md
CHANGED
|
@@ -11,7 +11,7 @@ Create a new Rsbuild project.
|
|
|
11
11
|
<img src="https://img.shields.io/npm/v/create-rsbuild?style=flat-square&colorA=564341&colorB=EDED91" alt="npm version" />
|
|
12
12
|
</a>
|
|
13
13
|
<img src="https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square&colorA=564341&colorB=EDED91" alt="license" />
|
|
14
|
-
<a href="https://npmcharts.com/compare/create-rsbuild
|
|
14
|
+
<a href="https://npmcharts.com/compare/create-rsbuild"><img src="https://img.shields.io/npm/dm/create-rsbuild.svg?style=flat-square&colorA=564341&colorB=EDED91" alt="downloads" /></a>
|
|
15
15
|
</p>
|
|
16
16
|
|
|
17
17
|
## Usage
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import node_fs from "node:fs";
|
|
1
2
|
import node_path from "node:path";
|
|
2
3
|
import { fileURLToPath } from "node:url";
|
|
3
|
-
import { checkCancel, create, select as external_create_rstack_select } from "create-rstack";
|
|
4
|
+
import { checkCancel, copyFolder, create, select as external_create_rstack_select } from "create-rstack";
|
|
4
5
|
const src_dirname = node_path.dirname(fileURLToPath(import.meta.url));
|
|
5
6
|
const frameworkAlias = {
|
|
6
7
|
vue: 'vue3',
|
|
@@ -90,6 +91,22 @@ function mapESLintTemplate(templateName) {
|
|
|
90
91
|
const language = templateName.split('-')[1];
|
|
91
92
|
return `vanilla-${language}`;
|
|
92
93
|
}
|
|
94
|
+
function mapRstestTemplate(templateName) {
|
|
95
|
+
switch(templateName){
|
|
96
|
+
case 'react-js':
|
|
97
|
+
case 'react18-js':
|
|
98
|
+
return 'react-js';
|
|
99
|
+
case 'react-ts':
|
|
100
|
+
case 'react18-ts':
|
|
101
|
+
return 'react-ts';
|
|
102
|
+
case 'vue3-js':
|
|
103
|
+
return 'vue-js';
|
|
104
|
+
case 'vue3-ts':
|
|
105
|
+
return 'vue-ts';
|
|
106
|
+
}
|
|
107
|
+
const language = templateName.split('-')[1];
|
|
108
|
+
return `vanilla-${language}`;
|
|
109
|
+
}
|
|
93
110
|
create({
|
|
94
111
|
root: node_path.resolve(src_dirname, '..'),
|
|
95
112
|
name: 'rsbuild',
|
|
@@ -112,9 +129,49 @@ create({
|
|
|
112
129
|
getTemplateName: getTemplateName,
|
|
113
130
|
mapESLintTemplate: mapESLintTemplate,
|
|
114
131
|
extraTools: [
|
|
132
|
+
{
|
|
133
|
+
value: 'rstest',
|
|
134
|
+
label: 'Rstest - testing',
|
|
135
|
+
order: 'pre',
|
|
136
|
+
action: ({ templateName, distFolder, addAgentsMdSearchDirs })=>{
|
|
137
|
+
const rstestTemplate = mapRstestTemplate(templateName);
|
|
138
|
+
const toolFolder = node_path.join(src_dirname, '..', 'template-rstest');
|
|
139
|
+
const subFolder = node_path.join(toolFolder, rstestTemplate);
|
|
140
|
+
copyFolder({
|
|
141
|
+
from: subFolder,
|
|
142
|
+
to: distFolder,
|
|
143
|
+
isMergePackageJson: true
|
|
144
|
+
});
|
|
145
|
+
addAgentsMdSearchDirs(toolFolder);
|
|
146
|
+
}
|
|
147
|
+
},
|
|
148
|
+
{
|
|
149
|
+
value: 'tailwindcss',
|
|
150
|
+
label: 'Tailwind CSS - styling',
|
|
151
|
+
action: async ({ distFolder })=>{
|
|
152
|
+
const from = node_path.join(src_dirname, '..', 'template-tailwindcss');
|
|
153
|
+
copyFolder({
|
|
154
|
+
from: from,
|
|
155
|
+
to: distFolder,
|
|
156
|
+
isMergePackageJson: true
|
|
157
|
+
});
|
|
158
|
+
const mainCssFile = [
|
|
159
|
+
'index.css',
|
|
160
|
+
'App.css'
|
|
161
|
+
];
|
|
162
|
+
for (const cssFile of mainCssFile){
|
|
163
|
+
const filePath = node_path.join(distFolder, 'src', cssFile);
|
|
164
|
+
if (node_fs.existsSync(filePath)) {
|
|
165
|
+
const content = await node_fs.promises.readFile(filePath, 'utf-8');
|
|
166
|
+
await node_fs.promises.writeFile(filePath, `@import 'tailwindcss';\n\n${content}`);
|
|
167
|
+
break;
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
},
|
|
115
172
|
{
|
|
116
173
|
value: 'storybook',
|
|
117
|
-
label: '
|
|
174
|
+
label: 'Storybook - component development',
|
|
118
175
|
command: 'npm create storybook@latest -- --skip-install --features docs'
|
|
119
176
|
}
|
|
120
177
|
]
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "create-rsbuild",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.7.0",
|
|
4
4
|
"description": "Create a new Rsbuild project",
|
|
5
5
|
"homepage": "https://rsbuild.rs",
|
|
6
6
|
"repository": {
|
|
@@ -23,19 +23,19 @@
|
|
|
23
23
|
"bin.js"
|
|
24
24
|
],
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"create-rstack": "1.7.
|
|
26
|
+
"create-rstack": "1.7.20"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@rsbuild/plugin-react": "^1.1.0",
|
|
30
|
-
"@rslib/core": "0.
|
|
31
|
-
"@types/node": "^24.10.
|
|
30
|
+
"@rslib/core": "0.19.1",
|
|
31
|
+
"@types/node": "^24.10.4",
|
|
32
32
|
"typescript": "^5.9.3",
|
|
33
|
-
"@rsbuild/core": "1.
|
|
34
|
-
"@rsbuild/plugin-preact": "1.6.0",
|
|
33
|
+
"@rsbuild/core": "1.7.2",
|
|
35
34
|
"@rsbuild/plugin-babel": "1.0.6",
|
|
35
|
+
"@rsbuild/plugin-preact": "1.7.0",
|
|
36
36
|
"@rsbuild/plugin-solid": "1.0.6",
|
|
37
37
|
"@rsbuild/plugin-svelte": "1.0.11",
|
|
38
|
-
"@rsbuild/plugin-vue": "1.2.
|
|
38
|
+
"@rsbuild/plugin-vue": "1.2.2"
|
|
39
39
|
},
|
|
40
40
|
"engines": {
|
|
41
41
|
"node": ">=18.12.0"
|
|
@@ -9,10 +9,10 @@
|
|
|
9
9
|
"preview": "rsbuild preview"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"preact": "^10.28.
|
|
12
|
+
"preact": "^10.28.1"
|
|
13
13
|
},
|
|
14
14
|
"devDependencies": {
|
|
15
|
-
"@rsbuild/core": "^1.
|
|
16
|
-
"@rsbuild/plugin-preact": "^1.
|
|
15
|
+
"@rsbuild/core": "^1.7.1",
|
|
16
|
+
"@rsbuild/plugin-preact": "^1.7.0"
|
|
17
17
|
}
|
|
18
18
|
}
|
|
@@ -9,11 +9,11 @@
|
|
|
9
9
|
"preview": "rsbuild preview"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"preact": "^10.28.
|
|
12
|
+
"preact": "^10.28.1"
|
|
13
13
|
},
|
|
14
14
|
"devDependencies": {
|
|
15
|
-
"@rsbuild/core": "^1.
|
|
16
|
-
"@rsbuild/plugin-preact": "^1.
|
|
15
|
+
"@rsbuild/core": "^1.7.1",
|
|
16
|
+
"@rsbuild/plugin-preact": "^1.7.0",
|
|
17
17
|
"typescript": "^5.9.3"
|
|
18
18
|
}
|
|
19
19
|
}
|
|
@@ -9,11 +9,11 @@
|
|
|
9
9
|
"preview": "rsbuild preview"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"react": "^19.2.
|
|
13
|
-
"react-dom": "^19.2.
|
|
12
|
+
"react": "^19.2.3",
|
|
13
|
+
"react-dom": "^19.2.3"
|
|
14
14
|
},
|
|
15
15
|
"devDependencies": {
|
|
16
|
-
"@rsbuild/core": "^1.
|
|
16
|
+
"@rsbuild/core": "^1.7.1",
|
|
17
17
|
"@rsbuild/plugin-react": "^1.4.2"
|
|
18
18
|
}
|
|
19
19
|
}
|
|
@@ -9,11 +9,11 @@
|
|
|
9
9
|
"preview": "rsbuild preview"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"react": "^19.2.
|
|
13
|
-
"react-dom": "^19.2.
|
|
12
|
+
"react": "^19.2.3",
|
|
13
|
+
"react-dom": "^19.2.3"
|
|
14
14
|
},
|
|
15
15
|
"devDependencies": {
|
|
16
|
-
"@rsbuild/core": "^1.
|
|
16
|
+
"@rsbuild/core": "^1.7.1",
|
|
17
17
|
"@rsbuild/plugin-react": "^1.4.2",
|
|
18
18
|
"@types/react": "^19.2.7",
|
|
19
19
|
"@types/react-dom": "^19.2.3",
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
{
|
|
2
|
+
"scripts": {
|
|
3
|
+
"test": "rstest",
|
|
4
|
+
"test:watch": "rstest --watch"
|
|
5
|
+
},
|
|
6
|
+
"devDependencies": {
|
|
7
|
+
"@testing-library/dom": "^10.4.1",
|
|
8
|
+
"@testing-library/jest-dom": "^6.9.1",
|
|
9
|
+
"@testing-library/react": "^16.3.1",
|
|
10
|
+
"@rstest/core": "^0.7.8",
|
|
11
|
+
"happy-dom": "^20.0.11"
|
|
12
|
+
}
|
|
13
|
+
}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { pluginReact } from '@rsbuild/plugin-react';
|
|
2
|
+
import { defineConfig } from '@rstest/core';
|
|
3
|
+
|
|
4
|
+
// Docs: https://rstest.rs/config/
|
|
5
|
+
export default defineConfig({
|
|
6
|
+
plugins: [pluginReact()],
|
|
7
|
+
testEnvironment: 'happy-dom',
|
|
8
|
+
setupFiles: ['./tests/rstest.setup.js'],
|
|
9
|
+
});
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { expect, test } from '@rstest/core';
|
|
2
|
+
import { render, screen } from '@testing-library/react';
|
|
3
|
+
import App from '../src/App';
|
|
4
|
+
|
|
5
|
+
test('renders the main page', () => {
|
|
6
|
+
const testMessage = 'Rsbuild with React';
|
|
7
|
+
render(<App />);
|
|
8
|
+
expect(screen.getByText(testMessage)).toBeInTheDocument();
|
|
9
|
+
});
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
{
|
|
2
|
+
"scripts": {
|
|
3
|
+
"test": "rstest",
|
|
4
|
+
"test:watch": "rstest --watch"
|
|
5
|
+
},
|
|
6
|
+
"devDependencies": {
|
|
7
|
+
"@testing-library/dom": "^10.4.1",
|
|
8
|
+
"@testing-library/jest-dom": "^6.9.1",
|
|
9
|
+
"@testing-library/react": "^16.3.1",
|
|
10
|
+
"@rstest/core": "^0.7.8",
|
|
11
|
+
"happy-dom": "^20.0.11"
|
|
12
|
+
}
|
|
13
|
+
}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { pluginReact } from '@rsbuild/plugin-react';
|
|
2
|
+
import { defineConfig } from '@rstest/core';
|
|
3
|
+
|
|
4
|
+
// Docs: https://rstest.rs/config/
|
|
5
|
+
export default defineConfig({
|
|
6
|
+
plugins: [pluginReact()],
|
|
7
|
+
testEnvironment: 'happy-dom',
|
|
8
|
+
setupFiles: ['./tests/rstest.setup.ts'],
|
|
9
|
+
});
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { expect, test } from '@rstest/core';
|
|
2
|
+
import { render, screen } from '@testing-library/react';
|
|
3
|
+
import App from '../src/App';
|
|
4
|
+
|
|
5
|
+
test('renders the main page', () => {
|
|
6
|
+
const testMessage = 'Rsbuild with React';
|
|
7
|
+
render(<App />);
|
|
8
|
+
expect(screen.getByText(testMessage)).toBeInTheDocument();
|
|
9
|
+
});
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { expect, test } from '@rstest/core';
|
|
2
|
+
import { screen } from '@testing-library/dom';
|
|
3
|
+
|
|
4
|
+
test('test dom', () => {
|
|
5
|
+
document.body.innerHTML = `
|
|
6
|
+
<span data-testid="not-empty"><span data-testid="empty"></span></span>
|
|
7
|
+
<div data-testid="visible">Visible Example</div>
|
|
8
|
+
`;
|
|
9
|
+
|
|
10
|
+
expect(screen.queryByTestId('not-empty')).toBeInTheDocument();
|
|
11
|
+
expect(screen.getByText('Visible Example')).toBeVisible();
|
|
12
|
+
});
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { expect, test } from '@rstest/core';
|
|
2
|
+
import { screen } from '@testing-library/dom';
|
|
3
|
+
|
|
4
|
+
test('test dom', () => {
|
|
5
|
+
document.body.innerHTML = `
|
|
6
|
+
<span data-testid="not-empty"><span data-testid="empty"></span></span>
|
|
7
|
+
<div data-testid="visible">Visible Example</div>
|
|
8
|
+
`;
|
|
9
|
+
|
|
10
|
+
expect(screen.queryByTestId('not-empty')).toBeInTheDocument();
|
|
11
|
+
expect(screen.getByText('Visible Example')).toBeVisible();
|
|
12
|
+
});
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
{
|
|
2
|
+
"scripts": {
|
|
3
|
+
"test": "rstest",
|
|
4
|
+
"test:watch": "rstest --watch"
|
|
5
|
+
},
|
|
6
|
+
"devDependencies": {
|
|
7
|
+
"@testing-library/dom": "^10.4.1",
|
|
8
|
+
"@testing-library/jest-dom": "^6.9.1",
|
|
9
|
+
"@testing-library/vue": "^8.1.0",
|
|
10
|
+
"@rstest/core": "^0.7.8",
|
|
11
|
+
"happy-dom": "^20.0.11"
|
|
12
|
+
}
|
|
13
|
+
}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { pluginVue } from '@rsbuild/plugin-vue';
|
|
2
|
+
import { defineConfig } from '@rstest/core';
|
|
3
|
+
|
|
4
|
+
// Docs: https://rstest.rs/config/
|
|
5
|
+
export default defineConfig({
|
|
6
|
+
plugins: [pluginVue()],
|
|
7
|
+
testEnvironment: 'happy-dom',
|
|
8
|
+
setupFiles: ['./tests/rstest.setup.js'],
|
|
9
|
+
});
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { expect, test } from '@rstest/core';
|
|
2
|
+
import { render, screen } from '@testing-library/vue';
|
|
3
|
+
import App from '../src/App.vue';
|
|
4
|
+
|
|
5
|
+
test('renders the main page', () => {
|
|
6
|
+
const testMessage = 'Rsbuild with Vue';
|
|
7
|
+
render(App);
|
|
8
|
+
expect(screen.getByText(testMessage)).toBeInTheDocument();
|
|
9
|
+
});
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
{
|
|
2
|
+
"scripts": {
|
|
3
|
+
"test": "rstest",
|
|
4
|
+
"test:watch": "rstest --watch"
|
|
5
|
+
},
|
|
6
|
+
"devDependencies": {
|
|
7
|
+
"@testing-library/dom": "^10.4.1",
|
|
8
|
+
"@testing-library/jest-dom": "^6.9.1",
|
|
9
|
+
"@testing-library/vue": "^8.1.0",
|
|
10
|
+
"@rstest/core": "^0.7.8",
|
|
11
|
+
"happy-dom": "^20.0.11"
|
|
12
|
+
}
|
|
13
|
+
}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { pluginVue } from '@rsbuild/plugin-vue';
|
|
2
|
+
import { defineConfig } from '@rstest/core';
|
|
3
|
+
|
|
4
|
+
// Docs: https://rstest.rs/config/
|
|
5
|
+
export default defineConfig({
|
|
6
|
+
plugins: [pluginVue()],
|
|
7
|
+
testEnvironment: 'happy-dom',
|
|
8
|
+
setupFiles: ['./tests/rstest.setup.ts'],
|
|
9
|
+
});
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { expect, test } from '@rstest/core';
|
|
2
|
+
import { render, screen } from '@testing-library/vue';
|
|
3
|
+
import App from '../src/App.vue';
|
|
4
|
+
|
|
5
|
+
test('renders the main page', () => {
|
|
6
|
+
const testMessage = 'Rsbuild with Vue';
|
|
7
|
+
render(App);
|
|
8
|
+
expect(screen.getByText(testMessage)).toBeInTheDocument();
|
|
9
|
+
});
|
|
@@ -10,12 +10,12 @@
|
|
|
10
10
|
"svelte-check": "svelte-check --tsconfig ./tsconfig.json"
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"svelte": "^5.
|
|
13
|
+
"svelte": "^5.46.1"
|
|
14
14
|
},
|
|
15
15
|
"devDependencies": {
|
|
16
|
-
"@rsbuild/core": "^1.
|
|
16
|
+
"@rsbuild/core": "^1.7.1",
|
|
17
17
|
"@rsbuild/plugin-svelte": "^1.0.11",
|
|
18
|
-
"svelte-check": "^4.3.
|
|
18
|
+
"svelte-check": "^4.3.5",
|
|
19
19
|
"typescript": "^5.9.3"
|
|
20
20
|
}
|
|
21
21
|
}
|
|
@@ -9,10 +9,10 @@
|
|
|
9
9
|
"preview": "rsbuild preview"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"vue": "^3.5.
|
|
12
|
+
"vue": "^3.5.26"
|
|
13
13
|
},
|
|
14
14
|
"devDependencies": {
|
|
15
|
-
"@rsbuild/core": "^1.
|
|
16
|
-
"@rsbuild/plugin-vue": "^1.2.
|
|
15
|
+
"@rsbuild/core": "^1.7.1",
|
|
16
|
+
"@rsbuild/plugin-vue": "^1.2.2"
|
|
17
17
|
}
|
|
18
18
|
}
|
|
@@ -9,11 +9,11 @@
|
|
|
9
9
|
"preview": "rsbuild preview"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"vue": "^3.5.
|
|
12
|
+
"vue": "^3.5.26"
|
|
13
13
|
},
|
|
14
14
|
"devDependencies": {
|
|
15
|
-
"@rsbuild/core": "^1.
|
|
16
|
-
"@rsbuild/plugin-vue": "^1.2.
|
|
15
|
+
"@rsbuild/core": "^1.7.1",
|
|
16
|
+
"@rsbuild/plugin-vue": "^1.2.2",
|
|
17
17
|
"typescript": "^5.9.3"
|
|
18
18
|
}
|
|
19
19
|
}
|