Skip to content

Commit 344340c

Browse files
vladitasevvladitasev
authored
chore: flatten test directory structure (#869)
1 parent 66691bd commit 344340c

File tree

151 files changed

+245
-261
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+245
-261
lines changed

‎docs/PublicModuleImports.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ plugins.push(url({
197197
],
198198
emitFiles: true,
199199
fileName: "[name].[hash][extname]",
200-
publicPath: DEPLOY_PUBLIC_PATH + "/resources/sap/ui/webcomponents/main/",
200+
publicPath: DEPLOY_PUBLIC_PATH + "/resources/",
201201
}));
202202
```
203203

‎lib/documentation/index.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const sinceMarker = "<!--since_tag_marker-->";
2020
const getComponentByName = name => {
2121
return entries.find(element => {
2222
return element.basename === name;
23-
})
23+
})
2424
};
2525

2626
const getCSSVarsByName = name => {
@@ -50,7 +50,7 @@ Handlebars.registerPartial('events', eventsTemplate);
5050
Handlebars.registerPartial('methods', methodsTemplate);
5151
Handlebars.registerPartial('cssVariables', cssVariablesTemplate);
5252

53-
mkdirp(`dist/test-resources/sap/ui/webcomponents/main/api`);
53+
mkdirp(`dist/test-resources/api`);
5454

5555
let entriesAPI = [];
5656

@@ -101,7 +101,7 @@ const generateSamplePage = entry => {
101101
let content = "";
102102

103103
try {
104-
content = fs.readFileSync(`dist/test-resources/sap/ui/webcomponents/main/samples/${capitalize(entry.basename)}.sample.html`, 'utf8');
104+
content = fs.readFileSync(`dist/test-resources/samples/${capitalize(entry.basename)}.sample.html`, 'utf8');
105105
} catch (err) { }
106106

107107
if (content) {
@@ -130,7 +130,7 @@ const generateSamplePage = entry => {
130130
return `<a href="#" onclick="redirect(event, '${component}')">${component}</a>`;
131131
});
132132

133-
fs.writeFile(`dist/test-resources/sap/ui/webcomponents/main/api/${entry.basename}.sample.html`, content, (err) => {
133+
fs.writeFile(`dist/test-resources/api/${entry.basename}.sample.html`, content, (err) => {
134134
// console.log(err);
135135
});
136136
}

‎packages/base/test/sap/ui/webcomponents/base/index.html

-16
This file was deleted.

‎packages/main/lib/playground/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ const glob = require("glob");
44
const mkdirp = require("mkdirp");
55

66
glob("dist/test-resources/**/api/*.sample.html", {}, function (er, files) {
7-
let output = "dist/resources/sap/ui/webcomponents/main/playground.json";
7+
let output = "dist/resources/playground.json";
88
mkdirp.sync(path.dirname(output));
99
fs.writeFileSync(output, JSON.stringify(files.map(function(file) {
1010
return path.basename(file);
1111
})));
12-
});
12+
});

‎packages/main/rollup.config.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import filesize from 'rollup-plugin-filesize';
1010
import commonjs from 'rollup-plugin-commonjs';
1111

1212
const DIST = path.normalize("dist");
13-
const DIST_PLAYGROUND = path.normalize("dist/resources/sap/ui/webcomponents/main");
13+
const DIST_PLAYGROUND = path.normalize("dist/resources");
1414

1515

1616
const DEPLOY_PUBLIC_PATH = process.env.DEPLOY_PUBLIC_PATH || "";
@@ -52,7 +52,7 @@ const getPlugins = ({ transpile }) => {
5252
],
5353
emitFiles: true,
5454
fileName: "[name].[hash][extname]",
55-
publicPath: DEPLOY_PUBLIC_PATH + "/resources/sap/ui/webcomponents/main/",
55+
publicPath: DEPLOY_PUBLIC_PATH + "/resources/",
5656
}));
5757

5858

@@ -83,7 +83,7 @@ const getES6Config = () => {
8383
return [{
8484
input: "bundle.esm.js",
8585
output: {
86-
dir: "dist/resources/sap/ui/webcomponents/main",
86+
dir: "dist/resources",
8787
format: "esm",
8888
sourcemap: true
8989
},
@@ -104,7 +104,7 @@ const getES5Config = () => {
104104
return [ {
105105
input: "bundle.es5.js",
106106
output: {
107-
dir: "dist/resources/sap/ui/webcomponents/main",
107+
dir: "dist/resources",
108108
format: "iife",
109109
name: "sap-ui-webcomponents-main-bundle",
110110
extend: "true", // Whether or not to extend the global variable defined by the name option in umd or iife formats.

‎packages/main/test/sap/ui/webcomponents/main/.eslintrc renamed to ‎packages/main/test/.eslintrc

File renamed without changes.

‎packages/main/test/pageobjects/DatePickerFGPage.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class DatePickerFGPage {
66
get dpEnd() { return $('#ui5-datepicker--endDate'); }
77

88
open() {
9-
browser.url('http://localhost:8080/test-resources/sap/ui/webcomponents/main/pages/DatePicker_fg.html');
9+
browser.url('http://localhost:8080/test-resources/pages/DatePicker_fg.html');
1010
}
1111

1212
}

‎packages/main/test/pageobjects/DatePickerTestPage.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class DatePickerTestPage {
22
constructor() {
3-
this.page = 'http://localhost:8080/test-resources/sap/ui/webcomponents/main/pages/DatePicker_test_page.html';
3+
this.page = 'http://localhost:8080/test-resources/pages/DatePicker_test_page.html';
44
}
55

66
set id(id) {

‎packages/main/test/sap/ui/webcomponents/main/pages/Badge.html renamed to ‎packages/main/test/pages/Badge.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
</script>
1818

1919
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
20-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module"></script>
21-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js"></script>
20+
<script src="../../../../../../resources/bundle.esm.js" type="module"></script>
21+
<script nomodule src="../../../../../../resources/bundle.es5.js"></script>
2222

2323
<style>
2424
html,

‎packages/main/test/sap/ui/webcomponents/main/pages/BusyIndicator.html renamed to ‎packages/main/test/pages/BusyIndicator.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@
1818
</script>
1919

2020
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
21-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module"></script>
22-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js">
21+
<script src="../../../../../../resources/bundle.esm.js" type="module"></script>
22+
<script nomodule src="../../../../../../resources/bundle.es5.js">
2323
</script>
2424
</head>
2525

2626
<body>
2727
<ui5-busyindicator size="Medium" active id="indicator1"></ui5-busyindicator>
28-
28+
2929
<br/>
3030
<br/>
3131
<ui5-busyindicator size="Medium" active id="indicator2"></ui5-busyindicator>
32-
32+
3333
<br/>
3434
<br/>
3535

‎packages/main/test/sap/ui/webcomponents/main/pages/Button.html renamed to ‎packages/main/test/pages/Button.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
</script>
1818

1919
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
20-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module"></script>
21-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js">
20+
<script src="../../../../../../resources/bundle.esm.js" type="module"></script>
21+
<script nomodule src="../../../../../../resources/bundle.es5.js">
2222
</script>
2323
</head>
2424

‎packages/main/test/sap/ui/webcomponents/main/pages/Calendar.html renamed to ‎packages/main/test/pages/Calendar.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</script>
1919

2020
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
21-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module"></script>
22-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js">
21+
<script src="../../../../../../resources/bundle.esm.js" type="module"></script>
22+
<script nomodule src="../../../../../../resources/bundle.es5.js">
2323
</script>
2424
</head>
2525
<body>

‎packages/main/test/sap/ui/webcomponents/main/pages/Card.html renamed to ‎packages/main/test/pages/Card.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
</script>
1515

1616
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
17-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module"></script>
18-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js">
17+
<script src="../../../../../../resources/bundle.esm.js" type="module"></script>
18+
<script nomodule src="../../../../../../resources/bundle.es5.js">
1919
</script>
2020
<style>
2121
.myCard {

‎packages/main/test/sap/ui/webcomponents/main/pages/CheckBox.html renamed to ‎packages/main/test/pages/CheckBox.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<title>ui5-checkbox</title>
88

99
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
10-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module"></script>
11-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js"></script>
10+
<script src="../../../../../../resources/bundle.esm.js" type="module"></script>
11+
<script nomodule src="../../../../../../resources/bundle.es5.js"></script>
1212

1313
<script>delete Document.prototype.adoptedStyleSheets;</script>
1414

‎packages/main/test/sap/ui/webcomponents/main/pages/Components.html renamed to ‎packages/main/test/pages/Components.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
</script>
1616

1717
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
18-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module"></script>
19-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js">
18+
<script src="../../../../../../resources/bundle.esm.js" type="module"></script>
19+
<script nomodule src="../../../../../../resources/bundle.es5.js">
2020
</script>
2121
</head>
2222

‎packages/main/test/sap/ui/webcomponents/main/pages/DatePicker.html renamed to ‎packages/main/test/pages/DatePicker.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
delete Document.prototype.adoptedStyleSheets;
1010
</script>
1111
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
12-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module"></script>
13-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js">
12+
<script src="../../../../../../resources/bundle.esm.js" type="module"></script>
13+
<script nomodule src="../../../../../../resources/bundle.es5.js">
1414
</script>
1515

1616
<script

‎packages/main/test/sap/ui/webcomponents/main/pages/DatePicker_fg.html renamed to ‎packages/main/test/pages/DatePicker_fg.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
</script>
1515

1616
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
17-
<script type="module" src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js"></script>
18-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js">
17+
<script type="module" src="../../../../../../resources/bundle.esm.js"></script>
18+
<script nomodule src="../../../../../../resources/bundle.es5.js">
1919
</script>
2020

2121
<script>

‎packages/main/test/sap/ui/webcomponents/main/pages/DatePicker_test_page.html renamed to ‎packages/main/test/pages/DatePicker_test_page.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</script>
1313

1414
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
15-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module"></script>
15+
<script src="../../../../../../resources/bundle.esm.js" type="module"></script>
1616
</head>
1717
<body>
1818
<ui5-datepicker id="dp"></ui5-datepicker>

‎packages/main/test/sap/ui/webcomponents/main/pages/Dialog.html renamed to ‎packages/main/test/pages/Dialog.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
</script>
1616

1717
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
18-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module"></script>
19-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js">
18+
<script src="../../../../../../resources/bundle.esm.js" type="module"></script>
19+
<script nomodule src="../../../../../../resources/bundle.es5.js">
2020
</script>
2121
</head>
2222

‎packages/main/test/sap/ui/webcomponents/main/pages/Eventing.html renamed to ‎packages/main/test/pages/Eventing.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<title>Eventing</title>
88

99
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
10-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module" ></script>
11-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js">
10+
<script src="../../../../../../resources/bundle.esm.js" type="module" ></script>
11+
<script nomodule src="../../../../../../resources/bundle.es5.js">
1212
</script>
1313
</head>
1414

‎packages/main/test/sap/ui/webcomponents/main/pages/FormSupport.html renamed to ‎packages/main/test/pages/FormSupport.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<meta charset="utf-8">
66
<title>Form support</title>
77
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
8-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module"></script>
9-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js"></script>
8+
<script src="../../../../../../resources/bundle.esm.js" type="module"></script>
9+
<script nomodule src="../../../../../../resources/bundle.es5.js"></script>
1010
</head>
1111

1212
<body>
@@ -37,4 +37,4 @@
3737

3838

3939
</body>
40-
</html>
40+
</html>

‎packages/main/test/sap/ui/webcomponents/main/pages/HCB.html renamed to ‎packages/main/test/pages/HCB.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
</script>
1515

1616
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
17-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module"></script>
18-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js">
17+
<script src="../../../../../../resources/bundle.esm.js" type="module"></script>
18+
<script nomodule src="../../../../../../resources/bundle.es5.js">
1919
</script>
2020

2121
<script

‎packages/main/test/sap/ui/webcomponents/main/pages/Icon.html renamed to ‎packages/main/test/pages/Icon.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
</script>
1717

1818
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
19-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module"></script>
20-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js">
19+
<script src="../../../../../../resources/bundle.esm.js" type="module"></script>
20+
<script nomodule src="../../../../../../resources/bundle.es5.js">
2121
</script>
2222
<script src="http://veui5infra.dhcp.wdf.sap.corp:8080/demokit/resources/sap-ui-core.js"></script>
2323
</head>

‎packages/main/test/sap/ui/webcomponents/main/pages/Input.html renamed to ‎packages/main/test/pages/Input.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<meta charset="utf-8">
77
<title>ui5-input</title>
88
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
9-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module"></script>
10-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js"></script>
9+
<script src="../../../../../../resources/bundle.esm.js" type="module"></script>
10+
<script nomodule src="../../../../../../resources/bundle.es5.js"></script>
1111

1212
<script>delete Document.prototype.adoptedStyleSheets;</script>
13-
13+
1414
</head>
1515

1616
<body>

‎packages/main/test/sap/ui/webcomponents/main/pages/InputsAlignment.html renamed to ‎packages/main/test/pages/InputsAlignment.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<meta charset="utf-8">
77
<title>ui5-input</title>
88
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
9-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module"></script>
10-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js"></script>
9+
<script src="../../../../../../resources/bundle.esm.js" type="module"></script>
10+
<script nomodule src="../../../../../../resources/bundle.es5.js"></script>
1111

1212
<script>delete Document.prototype.adoptedStyleSheets;</script>
1313

‎packages/main/test/sap/ui/webcomponents/main/pages/Kitchen.html renamed to ‎packages/main/test/pages/Kitchen.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
</script>
1717

1818
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
19-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module"></script>
20-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js">
19+
<script src="../../../../../../resources/bundle.esm.js" type="module"></script>
20+
<script nomodule src="../../../../../../resources/bundle.es5.js">
2121
</script>
2222
<!--<script>delete Document.prototype.adoptedStyleSheets;</script>-->
2323
</head>

‎packages/main/test/sap/ui/webcomponents/main/pages/Kitchen.openui5.html renamed to ‎packages/main/test/pages/Kitchen.openui5.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
})
2929
</script>
3030
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
31-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module"></script>
32-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js"></script>
31+
<script src="../../../../../../resources/bundle.esm.js" type="module"></script>
32+
<script nomodule src="../../../../../../resources/bundle.es5.js"></script>
3333
</head>
3434

3535
<body>

‎packages/main/test/sap/ui/webcomponents/main/pages/Label.html renamed to ‎packages/main/test/pages/Label.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
</script>
1818

1919
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
20-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module"></script>
21-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js"></script>
20+
<script src="../../../../../../resources/bundle.esm.js" type="module"></script>
21+
<script nomodule src="../../../../../../resources/bundle.es5.js"></script>
2222

2323
<style>
2424
html,

‎packages/main/test/sap/ui/webcomponents/main/pages/Link.html renamed to ‎packages/main/test/pages/Link.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
<meta charset="utf-8">
1212

1313
<script>delete Document.prototype.adoptedStyleSheets;</script>
14-
14+
1515
<script data-ui5-config type="application/json">
1616
{
1717
"language": "EN"
1818
}
1919
</script>
2020

2121
<script src="../../../../../../webcomponentsjs/webcomponents-loader.js"></script>
22-
<script src="../../../../../../resources/sap/ui/webcomponents/main/bundle.esm.js" type="module"></script>
23-
<script nomodule src="../../../../../../resources/sap/ui/webcomponents/main/bundle.es5.js"></script>
22+
<script src="../../../../../../resources/bundle.esm.js" type="module"></script>
23+
<script nomodule src="../../../../../../resources/bundle.es5.js"></script>
2424

2525
<style>
2626
html,

0 commit comments

Comments
 (0)