@ui5/webcomponents-tools 1.3.1 → 1.6.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/CHANGELOG.md +30 -0
- package/README.md +5 -6
- package/bin/dev.js +1 -5
- package/components-package/nps.js +51 -38
- package/components-package/vite.config.js +12 -0
- package/components-package/wdio.js +21 -4
- package/components-package/wdio.sync.js +1 -1
- package/icons-collection/nps.js +1 -7
- package/lib/copy-and-watch/index.js +0 -1
- package/lib/copy-list/index.js +16 -16
- package/lib/create-icons/index.js +82 -72
- package/lib/create-illustrations/index.js +101 -90
- package/lib/dev-server/dev-server.js +66 -0
- package/lib/dev-server/virtual-index-html-plugin.js +52 -0
- package/lib/esm-abs-to-rel/index.js +13 -9
- package/lib/generate-json-imports/i18n.js +38 -31
- package/lib/generate-json-imports/themes.js +31 -24
- package/lib/hbs2lit/src/compiler.js +2 -2
- package/lib/hbs2lit/src/includesReplacer.js +5 -5
- package/lib/hbs2ui5/index.js +37 -21
- package/lib/i18n/defaults.js +49 -57
- package/lib/i18n/toJSON.js +12 -11
- package/lib/postcss-css-to-esm/index.js +13 -1
- package/lib/postcss-css-to-json/index.js +12 -1
- package/lib/postcss-p/postcss-p.mjs +3 -0
- package/lib/replace-global-core/index.js +13 -8
- package/lib/scoping/scope-test-pages.js +1 -1
- package/lib/test-runner/test-runner.js +63 -0
- package/package.json +14 -17
- package/components-package/rollup-plugins/empty-module.js +0 -15
- package/components-package/rollup.js +0 -150
- package/lib/documentation/index.js +0 -165
- package/lib/documentation/templates/api-component-since.js +0 -3
- package/lib/documentation/templates/api-css-variables-section.js +0 -24
- package/lib/documentation/templates/api-events-section.js +0 -35
- package/lib/documentation/templates/api-methods-section.js +0 -26
- package/lib/documentation/templates/api-properties-section.js +0 -42
- package/lib/documentation/templates/api-slots-section.js +0 -28
- package/lib/documentation/templates/template.js +0 -39
- package/lib/hash/config.js +0 -10
- package/lib/hash/generate.js +0 -19
- package/lib/hash/upToDate.js +0 -31
- package/lib/serve/index.js +0 -46
- package/lib/serve/serve.json +0 -3
- package/package-lock.json +0 -48
@@ -1,87 +1,90 @@
|
|
1
|
-
const fs = require("fs");
|
1
|
+
const fs = require("fs").promises;
|
2
2
|
const path = require("path");
|
3
|
-
const mkdirp = require("mkdirp");
|
4
3
|
|
5
4
|
if (process.argv.length < 7) {
|
6
|
-
|
5
|
+
throw new Error("Not enough arguments");
|
7
6
|
}
|
8
7
|
|
9
|
-
const
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
const
|
57
|
-
const
|
58
|
-
const
|
59
|
-
const
|
8
|
+
const generate = async () => {
|
9
|
+
|
10
|
+
const ORIGINAL_TEXTS = {
|
11
|
+
UnableToLoad: "UnableToLoad",
|
12
|
+
UnableToUpload: "UnableToUpload",
|
13
|
+
NoActivities: "NoActivities",
|
14
|
+
BeforeSearch: "BeforeSearch",
|
15
|
+
NoSearchResults: "NoSearchResults",
|
16
|
+
NoEntries: "NoEntries",
|
17
|
+
NoData: "NoData",
|
18
|
+
NoNotifications: "NoNotifications",
|
19
|
+
BalloonSky: "BalloonSky",
|
20
|
+
SuccessScreen: "SuccessScreen",
|
21
|
+
NoMail: "NoMail",
|
22
|
+
NoSavedItems: "NoSavedItems",
|
23
|
+
NoTasks: "NoTasks"
|
24
|
+
};
|
25
|
+
|
26
|
+
const FALLBACK_TEXTS = {
|
27
|
+
ReloadScreen: ORIGINAL_TEXTS.UnableToLoad,
|
28
|
+
Connection: ORIGINAL_TEXTS.UnableToLoad,
|
29
|
+
ErrorScreen: ORIGINAL_TEXTS.UnableToUpload,
|
30
|
+
EmptyCalendar: ORIGINAL_TEXTS.NoActivities,
|
31
|
+
SearchEarth: ORIGINAL_TEXTS.BeforeSearch,
|
32
|
+
SearchFolder: ORIGINAL_TEXTS.NoSearchResults,
|
33
|
+
EmptyList: ORIGINAL_TEXTS.NoEntries,
|
34
|
+
Tent: ORIGINAL_TEXTS.NoData,
|
35
|
+
SleepingBell: ORIGINAL_TEXTS.NoNotifications,
|
36
|
+
SimpleBalloon: ORIGINAL_TEXTS.BalloonSky,
|
37
|
+
SimpleBell: ORIGINAL_TEXTS.NoNotifications,
|
38
|
+
SimpleCalendar: ORIGINAL_TEXTS.NoActivities,
|
39
|
+
SimpleCheckMark: ORIGINAL_TEXTS.SuccessScreen,
|
40
|
+
SimpleConnection: ORIGINAL_TEXTS.UnableToLoad,
|
41
|
+
SimpleEmptyDoc: ORIGINAL_TEXTS.NoData,
|
42
|
+
SimpleEmptyList: ORIGINAL_TEXTS.NoEntries,
|
43
|
+
SimpleError: ORIGINAL_TEXTS.UnableToUpload,
|
44
|
+
SimpleMagnifier: ORIGINAL_TEXTS.BeforeSearch,
|
45
|
+
SimpleMail: ORIGINAL_TEXTS.NoMail,
|
46
|
+
SimpleNoSavedItems: ORIGINAL_TEXTS.NoSavedItems,
|
47
|
+
SimpleNotFoundMagnifier: ORIGINAL_TEXTS.NoSearchResults,
|
48
|
+
SimpleReload: ORIGINAL_TEXTS.UnableToLoad,
|
49
|
+
SimpleTask: ORIGINAL_TEXTS.NoTasks,
|
50
|
+
SuccessBalloon: ORIGINAL_TEXTS.BalloonSky,
|
51
|
+
SuccessCheckMark: ORIGINAL_TEXTS.SuccessScreen,
|
52
|
+
SuccessHighFive: ORIGINAL_TEXTS.BalloonSky
|
53
|
+
};
|
54
|
+
|
55
|
+
const srcPath = process.argv[2];
|
56
|
+
const defaultText = process.argv[3] === "true";
|
57
|
+
const illustrationsPrefix = process.argv[4];
|
58
|
+
const illustrationSet = process.argv[5];
|
59
|
+
const destPath = process.argv[6];
|
60
|
+
const fileNamePattern = new RegExp(`${illustrationsPrefix}-.+-(.+).svg`);
|
60
61
|
// collect each illustration name because each one should have Sample.js file
|
61
|
-
const fileNames = new Set();
|
62
|
-
|
63
|
-
const svgImportTemplate = svgContent => {
|
64
|
-
|
65
|
-
|
66
|
-
const
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
62
|
+
const fileNames = new Set();
|
63
|
+
|
64
|
+
const svgImportTemplate = svgContent => {
|
65
|
+
return `export default \`${svgContent}\`;`
|
66
|
+
};
|
67
|
+
const svgToJs = async fileName => {
|
68
|
+
const svg = await fs.readFile(path.join(srcPath, fileName), {encoding: "utf-8"});
|
69
|
+
const fileContent = svgImportTemplate(svg);
|
70
|
+
fileName = fileName.replace(/\.svg$/, ".js");
|
71
|
+
|
72
|
+
return fs.writeFile(path.join(destPath, fileName), fileContent);
|
73
|
+
};
|
74
|
+
const illustrationImportTemplate = illustrationName => {
|
75
|
+
let illustrationNameForTranslation = illustrationName;
|
76
|
+
|
77
|
+
if (defaultText) {
|
78
|
+
if (FALLBACK_TEXTS[illustrationNameForTranslation]) {
|
79
|
+
illustrationNameForTranslation = FALLBACK_TEXTS[illustrationNameForTranslation];
|
80
|
+
} else if (illustrationName.indexOf("_v") !== -1) {
|
81
|
+
illustrationNameForTranslation = illustrationNameForTranslation.substr(0, illustrationNameForTranslation.indexOf('_v'));
|
82
|
+
}
|
79
83
|
}
|
80
|
-
}
|
81
84
|
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
+
const illustrationNameUpperCase = illustrationNameForTranslation.toUpperCase();
|
86
|
+
|
87
|
+
return defaultText ? `import { registerIllustration } from "@ui5/webcomponents-base/dist/asset-registries/Illustrations.js";
|
85
88
|
import dialogSvg from "./${illustrationsPrefix}-Dialog-${illustrationName}.js";
|
86
89
|
import sceneSvg from "./${illustrationsPrefix}-Scene-${illustrationName}.js";
|
87
90
|
import spotSvg from "./${illustrationsPrefix}-Spot-${illustrationName}.js";
|
@@ -109,7 +112,7 @@ export {
|
|
109
112
|
sceneSvg,
|
110
113
|
spotSvg,
|
111
114
|
};` :
|
112
|
-
`import { registerIllustration } from "@ui5/webcomponents-base/dist/asset-registries/Illustrations.js";
|
115
|
+
`import { registerIllustration } from "@ui5/webcomponents-base/dist/asset-registries/Illustrations.js";
|
113
116
|
import dialogSvg from "./${illustrationsPrefix}-Dialog-${illustrationName}.js";
|
114
117
|
import sceneSvg from "./${illustrationsPrefix}-Scene-${illustrationName}.js";
|
115
118
|
import spotSvg from "./${illustrationsPrefix}-Spot-${illustrationName}.js";
|
@@ -129,22 +132,30 @@ export {
|
|
129
132
|
sceneSvg,
|
130
133
|
spotSvg,
|
131
134
|
};`
|
132
|
-
};
|
135
|
+
};
|
136
|
+
|
137
|
+
await fs.mkdir(destPath, { recursive: true });
|
133
138
|
|
134
|
-
|
139
|
+
const illustrationFileNames = await fs.readdir(path.normalize(srcPath));
|
135
140
|
|
136
|
-
|
141
|
+
// convert SVG to JS imports
|
142
|
+
const promises = [];
|
143
|
+
illustrationFileNames.forEach(illustration => {
|
144
|
+
if (fileNamePattern.test(illustration)) {
|
145
|
+
let [fileName, illustrationName] = illustration.match(fileNamePattern);
|
137
146
|
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
147
|
+
promises.push(svgToJs(fileName));
|
148
|
+
fileNames.add(illustrationName);
|
149
|
+
}
|
150
|
+
});
|
142
151
|
|
143
|
-
|
144
|
-
|
152
|
+
for (let illustrationName of fileNames) {
|
153
|
+
promises.push(fs.writeFile(path.join(destPath, `${illustrationName}.js`), illustrationImportTemplate(illustrationName)));
|
145
154
|
}
|
146
|
-
});
|
147
155
|
|
148
|
-
|
149
|
-
|
150
|
-
|
156
|
+
return Promise.all(promises);
|
157
|
+
};
|
158
|
+
|
159
|
+
generate().then(() => {
|
160
|
+
console.log("Illustrations generated.");
|
161
|
+
});
|
@@ -0,0 +1,66 @@
|
|
1
|
+
const fs = require("fs/promises");
|
2
|
+
const { createServer } = require('vite');
|
3
|
+
const yargs = require('yargs/yargs')
|
4
|
+
const { hideBin } = require('yargs/helpers')
|
5
|
+
|
6
|
+
const argv = yargs(hideBin(process.argv))
|
7
|
+
.alias("c", "config")
|
8
|
+
.argv;
|
9
|
+
|
10
|
+
const startVite = async (port) => {
|
11
|
+
const server = await createServer({
|
12
|
+
configFile: argv.config,
|
13
|
+
server: {
|
14
|
+
port: port,
|
15
|
+
strictPort: true,
|
16
|
+
open: true,
|
17
|
+
host: true,
|
18
|
+
},
|
19
|
+
logLevel: 'info',
|
20
|
+
clearScreen: false,
|
21
|
+
})
|
22
|
+
await server.listen()
|
23
|
+
server.printUrls()
|
24
|
+
return server;
|
25
|
+
};
|
26
|
+
|
27
|
+
const rmPortFile = async () => {
|
28
|
+
// exit handler must be sync
|
29
|
+
try {
|
30
|
+
await fs.rm(".dev-server-port");
|
31
|
+
} catch (e) {}
|
32
|
+
process.exit();
|
33
|
+
}
|
34
|
+
|
35
|
+
["exit", "SIGINT", "SIGUSR1", "SIGUSR2", "uncaughtException", "SIGTERM"].forEach((eventType) => {
|
36
|
+
process.on(eventType, rmPortFile);
|
37
|
+
});
|
38
|
+
|
39
|
+
(async () => {
|
40
|
+
let retries = 10;
|
41
|
+
let port = 8080;
|
42
|
+
while (retries--) {
|
43
|
+
console.log(`taking port ${port}`);
|
44
|
+
await fs.writeFile(".dev-server-port", `${port}`);
|
45
|
+
try {
|
46
|
+
// execSync(command, {stdio: 'pipe'});
|
47
|
+
const server = await startVite(port);
|
48
|
+
if (server) {
|
49
|
+
// server started, don't try other ports
|
50
|
+
break;
|
51
|
+
}
|
52
|
+
} catch (e) {
|
53
|
+
// uncomment for debug
|
54
|
+
// console.log(e.toString());
|
55
|
+
if (e.toString().includes("already in use")) {
|
56
|
+
console.log(`Port ${port} already in use`)
|
57
|
+
port++;
|
58
|
+
continue;
|
59
|
+
}
|
60
|
+
// other error or CTRL-C
|
61
|
+
process.exit();
|
62
|
+
}
|
63
|
+
// no error normal exit
|
64
|
+
// process.exit();
|
65
|
+
}
|
66
|
+
})();
|
@@ -0,0 +1,52 @@
|
|
1
|
+
let path = require("path");
|
2
|
+
|
3
|
+
const virtualIndexPlugin = async () => {
|
4
|
+
const { globby } = await import("globby");
|
5
|
+
const files = await globby(["test/pages/**/*.html", "packages/*/test/pages/**/*.html"]);
|
6
|
+
|
7
|
+
const pagesPerFolder = {};
|
8
|
+
files.forEach(file => {
|
9
|
+
let folder = pagesPerFolder[path.dirname(file)] = pagesPerFolder[path.dirname(file)] || [];
|
10
|
+
folder.push(path.basename(file));
|
11
|
+
});
|
12
|
+
|
13
|
+
const rollupInput = {};
|
14
|
+
|
15
|
+
files.forEach(file => {
|
16
|
+
rollupInput[file] = path.resolve(process.cwd(), file);
|
17
|
+
})
|
18
|
+
|
19
|
+
return {
|
20
|
+
name: 'virtual-index-html',
|
21
|
+
config() {
|
22
|
+
return {
|
23
|
+
build: {
|
24
|
+
rollupOptions: {
|
25
|
+
input: rollupInput
|
26
|
+
}
|
27
|
+
}
|
28
|
+
}
|
29
|
+
},
|
30
|
+
configureServer(server) {
|
31
|
+
server.middlewares.use((req, res, next) => {
|
32
|
+
if (req.url === "/") {
|
33
|
+
const folders = Object.keys(pagesPerFolder);
|
34
|
+
|
35
|
+
res.statusCode = 200;
|
36
|
+
res.end(`${folders.map(folder => {
|
37
|
+
const pages = pagesPerFolder[folder];
|
38
|
+
return `<h1>${folder}</h1>
|
39
|
+
${pages.map(page => {
|
40
|
+
return `<li><a href='${folder}/${page}'>${page}</a></li>`
|
41
|
+
}).join("")}
|
42
|
+
`
|
43
|
+
}).join("")}`);
|
44
|
+
} else {
|
45
|
+
next();
|
46
|
+
}
|
47
|
+
})
|
48
|
+
},
|
49
|
+
}
|
50
|
+
};
|
51
|
+
|
52
|
+
module.exports = virtualIndexPlugin;
|
@@ -1,15 +1,14 @@
|
|
1
1
|
const esprima = require("esprima");
|
2
2
|
const escodegen = require("escodegen");
|
3
3
|
|
4
|
-
const fs = require("fs");
|
4
|
+
const fs = require("fs").promises;
|
5
5
|
const path = require("path");
|
6
|
-
const glob = require("glob");
|
7
6
|
const basePath = process.argv[2];
|
8
7
|
|
9
|
-
const convertImports = (srcPath) => {
|
8
|
+
const convertImports = async (srcPath) => {
|
10
9
|
let changed = false;
|
11
10
|
// console.log("scanning imports of", srcPath);
|
12
|
-
let code = fs.
|
11
|
+
let code = (await fs.readFile(srcPath)).toString();
|
13
12
|
const tree = esprima.parseModule(code);
|
14
13
|
const importer = srcPath.replace(basePath, "");
|
15
14
|
const importerDir = path.dirname(importer);
|
@@ -44,11 +43,16 @@ const convertImports = (srcPath) => {
|
|
44
43
|
});
|
45
44
|
|
46
45
|
if (changed) {
|
47
|
-
fs.
|
46
|
+
return fs.writeFile(srcPath, escodegen.generate(tree));
|
48
47
|
}
|
49
48
|
}
|
50
49
|
|
51
|
-
const
|
52
|
-
|
53
|
-
fileNames
|
54
|
-
|
50
|
+
const generate = async () => {
|
51
|
+
const { globby } = await import("globby");
|
52
|
+
const fileNames = await globby(basePath + "**/*.js");
|
53
|
+
return Promise.all(fileNames.map(convertImports).filter(x => !!x));
|
54
|
+
};
|
55
|
+
|
56
|
+
generate().then(() => {
|
57
|
+
console.log("Success: Converted absolute imports to relative for files in:", basePath);
|
58
|
+
});
|
@@ -1,37 +1,38 @@
|
|
1
|
-
const fs = require("fs");
|
1
|
+
const fs = require("fs").promises;
|
2
2
|
const path = require('path');
|
3
|
-
const mkdirp = require("mkdirp");
|
4
3
|
|
5
|
-
const
|
4
|
+
const generate = async () => {
|
6
5
|
|
7
|
-
const
|
8
|
-
|
9
|
-
const
|
6
|
+
const packageName = JSON.parse(await fs.readFile("package.json")).name;
|
7
|
+
|
8
|
+
const inputFolder = path.normalize(process.argv[2]);
|
9
|
+
const outputFile = path.normalize(`${process.argv[3]}/i18n-static.js`);
|
10
|
+
const outputFileDynamic = path.normalize(`${process.argv[3]}/i18n.js`);
|
10
11
|
|
11
12
|
// All languages present in the file system
|
12
|
-
const files = fs.
|
13
|
-
const languages = files.map(file => {
|
14
|
-
|
15
|
-
|
16
|
-
}).filter(key => !!key);
|
13
|
+
const files = await fs.readdir(inputFolder);
|
14
|
+
const languages = files.map(file => {
|
15
|
+
const matches = file.match(/messagebundle_(.+?).json$/);
|
16
|
+
return matches ? matches[1] : undefined;
|
17
|
+
}).filter(key => !!key);
|
17
18
|
|
18
|
-
let contentStatic, contentDynamic;
|
19
|
+
let contentStatic, contentDynamic;
|
19
20
|
|
20
21
|
// No i18n - just import dependencies, if any
|
21
|
-
if (languages.length === 0) {
|
22
|
-
|
23
|
-
|
22
|
+
if (languages.length === 0) {
|
23
|
+
contentStatic = "";
|
24
|
+
contentDynamic = "";
|
24
25
|
// There is i18n - generate the full file
|
25
|
-
} else {
|
26
|
-
|
27
|
-
|
28
|
-
|
26
|
+
} else {
|
27
|
+
// Keys for the array
|
28
|
+
const languagesKeysString = languages.map(key => `"${key}": _${key},`).join("\n\t");
|
29
|
+
const languagesKeysStringArray = languages.map(key => `"${key}",`).join("\n\t");
|
29
30
|
|
30
|
-
|
31
|
-
|
31
|
+
// Actual imports for json assets
|
32
|
+
const assetsImportsString = languages.map(key => `import _${key} from "../assets/i18n/messagebundle_${key}.json";`).join("\n");
|
32
33
|
|
33
|
-
|
34
|
-
|
34
|
+
// static imports
|
35
|
+
contentStatic = `import { registerI18nLoader } from "@ui5/webcomponents-base/dist/asset-registries/i18n.js";
|
35
36
|
|
36
37
|
${assetsImportsString}
|
37
38
|
|
@@ -54,11 +55,11 @@ localeIds.forEach(localeId => {
|
|
54
55
|
});
|
55
56
|
`;
|
56
57
|
|
57
|
-
|
58
|
-
|
58
|
+
// Actual imports for json assets
|
59
|
+
const dynamicImportsString = languages.map(key => ` case "${key}": return (await import("../assets/i18n/messagebundle_${key}.json")).default;`).join("\n");
|
59
60
|
|
60
|
-
|
61
|
-
|
61
|
+
// Resulting file content
|
62
|
+
contentDynamic = `import { registerI18nLoader } from "@ui5/webcomponents-base/dist/asset-registries/i18n.js";
|
62
63
|
|
63
64
|
const importMessageBundle = async (localeId) => {
|
64
65
|
switch (localeId) {
|
@@ -83,9 +84,15 @@ localeIds.forEach(localeId => {
|
|
83
84
|
`;
|
84
85
|
|
85
86
|
|
86
|
-
}
|
87
|
+
}
|
87
88
|
|
89
|
+
await fs.mkdir(path.dirname(outputFile), { recursive: true });
|
90
|
+
return Promise.all([
|
91
|
+
fs.writeFile(outputFile, contentStatic),
|
92
|
+
fs.writeFile(outputFileDynamic, contentDynamic),
|
93
|
+
]);
|
94
|
+
}
|
88
95
|
|
89
|
-
|
90
|
-
|
91
|
-
|
96
|
+
generate().then(() => {
|
97
|
+
console.log("Generated i18n JSON imports.");
|
98
|
+
});
|
@@ -1,32 +1,32 @@
|
|
1
|
-
const fs = require("fs");
|
1
|
+
const fs = require("fs").promises;
|
2
2
|
const path = require('path');
|
3
|
-
const mkdirp = require("mkdirp");
|
4
3
|
const assets = require("../../assets-meta.js");
|
5
4
|
|
6
|
-
const
|
7
|
-
const
|
8
|
-
const
|
5
|
+
const generate = async () => {
|
6
|
+
const inputFolder = path.normalize(process.argv[2]);
|
7
|
+
const outputFile = path.normalize(`${process.argv[3]}/Themes-static.js`);
|
8
|
+
const outputFileDynamic = path.normalize(`${process.argv[3]}/Themes.js`);
|
9
9
|
|
10
10
|
// All supported optional themes
|
11
|
-
const allThemes = assets.themes.all;
|
11
|
+
const allThemes = assets.themes.all;
|
12
12
|
|
13
13
|
// All themes present in the file system
|
14
|
-
const dirs = fs.
|
15
|
-
const themesOnFileSystem = dirs.map(dir => {
|
16
|
-
|
17
|
-
|
18
|
-
}).filter(key => !!key && allThemes.includes(key));
|
14
|
+
const dirs = await fs.readdir(inputFolder);
|
15
|
+
const themesOnFileSystem = dirs.map(dir => {
|
16
|
+
const matches = dir.match(/sap_.*$/);
|
17
|
+
return matches ? dir : undefined;
|
18
|
+
}).filter(key => !!key && allThemes.includes(key));
|
19
19
|
|
20
|
-
const packageName = JSON.parse(fs.
|
20
|
+
const packageName = JSON.parse(await fs.readFile("package.json")).name;
|
21
21
|
|
22
|
-
const importLines = themesOnFileSystem.map(theme => `import ${theme} from "../assets/themes/${theme}/parameters-bundle.css.json";`).join("\n");
|
23
|
-
const themeUrlsByName = "{\n" + themesOnFileSystem.join(",\n") + "\n}";
|
24
|
-
const availableThemesArray = `[${themesOnFileSystem.map(theme => `"${theme}"`).join(", ")}]`;
|
25
|
-
const dynamicImportLines = themesOnFileSystem.map(theme => `\t\tcase "${theme}": return (await import("../assets/themes/${theme}/parameters-bundle.css.json")).default;`).join("\n");
|
22
|
+
const importLines = themesOnFileSystem.map(theme => `import ${theme} from "../assets/themes/${theme}/parameters-bundle.css.json";`).join("\n");
|
23
|
+
const themeUrlsByName = "{\n" + themesOnFileSystem.join(",\n") + "\n}";
|
24
|
+
const availableThemesArray = `[${themesOnFileSystem.map(theme => `"${theme}"`).join(", ")}]`;
|
25
|
+
const dynamicImportLines = themesOnFileSystem.map(theme => `\t\tcase "${theme}": return (await import("../assets/themes/${theme}/parameters-bundle.css.json")).default;`).join("\n");
|
26
26
|
|
27
27
|
|
28
28
|
// static imports file content
|
29
|
-
const contentStatic = `import { registerThemePropertiesLoader } from "@ui5/webcomponents-base/dist/asset-registries/Themes.js";
|
29
|
+
const contentStatic = `import { registerThemePropertiesLoader } from "@ui5/webcomponents-base/dist/asset-registries/Themes.js";
|
30
30
|
|
31
31
|
${importLines}
|
32
32
|
|
@@ -39,7 +39,7 @@ const loadThemeProperties = async (themeName) => {
|
|
39
39
|
throw new Error("[themes] Inlined JSON not supported with static imports of assets. Use dynamic imports of assets or configure JSON imports as URLs");
|
40
40
|
}
|
41
41
|
return (await fetch(themeUrlsByName[themeName])).json();
|
42
|
-
}
|
42
|
+
};
|
43
43
|
|
44
44
|
${availableThemesArray}
|
45
45
|
.forEach(themeName => registerThemePropertiesLoader("${packageName}", themeName, loadThemeProperties));
|
@@ -47,14 +47,14 @@ ${availableThemesArray}
|
|
47
47
|
|
48
48
|
|
49
49
|
// dynamic imports file content
|
50
|
-
const contentDynamic = `import { registerThemePropertiesLoader } from "@ui5/webcomponents-base/dist/asset-registries/Themes.js";
|
50
|
+
const contentDynamic = `import { registerThemePropertiesLoader } from "@ui5/webcomponents-base/dist/asset-registries/Themes.js";
|
51
51
|
|
52
52
|
const loadThemeProperties = async (themeName) => {
|
53
53
|
switch (themeName) {
|
54
54
|
${dynamicImportLines}
|
55
55
|
default: throw "unknown theme"
|
56
56
|
}
|
57
|
-
}
|
57
|
+
};
|
58
58
|
|
59
59
|
const loadAndCheck = async (themeName) => {
|
60
60
|
const data = await loadThemeProperties(themeName);
|
@@ -62,12 +62,19 @@ const loadAndCheck = async (themeName) => {
|
|
62
62
|
throw new Error(\`[themes] Invalid bundling detected - dynamic JSON imports bundled as URLs. Switch to inlining JSON files from the build or use 'import ".../Assets-static.js"'. Check the \"Assets\" documentation for more information.\`);
|
63
63
|
}
|
64
64
|
return data;
|
65
|
-
}
|
65
|
+
};
|
66
66
|
|
67
67
|
${availableThemesArray}
|
68
68
|
.forEach(themeName => registerThemePropertiesLoader("${packageName}", themeName, loadAndCheck));
|
69
69
|
`;
|
70
70
|
|
71
|
-
|
72
|
-
|
73
|
-
fs.
|
71
|
+
await fs.mkdir(path.dirname(outputFile), { recursive: true });
|
72
|
+
return Promise.all([
|
73
|
+
fs.writeFile(outputFile, contentStatic),
|
74
|
+
fs.writeFile(outputFileDynamic, contentDynamic)
|
75
|
+
]);
|
76
|
+
};
|
77
|
+
|
78
|
+
generate().then(() => {
|
79
|
+
console.log("Generated themes JSON imports.");
|
80
|
+
});
|
@@ -12,8 +12,8 @@ const removeWhiteSpaces = (source) => {
|
|
12
12
|
.replace(/}}\s+{{/g, "}}{{"); // Remove whitespace between }} and {{
|
13
13
|
};
|
14
14
|
|
15
|
-
const hbs2lit = (file) => {
|
16
|
-
let sPreprocessed = includesReplacer.replace(file);
|
15
|
+
const hbs2lit = async (file) => {
|
16
|
+
let sPreprocessed = await includesReplacer.replace(file);
|
17
17
|
|
18
18
|
sPreprocessed = removeWhiteSpaces(sPreprocessed);
|
19
19
|
|
@@ -1,9 +1,9 @@
|
|
1
1
|
const path = require("path");
|
2
|
-
const fs = require("fs");
|
2
|
+
const fs = require("fs").promises;
|
3
3
|
|
4
|
-
|
4
|
+
const replaceIncludes = async (file) => {
|
5
5
|
const filePath = path.dirname(file);
|
6
|
-
let fileContent = fs.
|
6
|
+
let fileContent = await fs.readFile(file, "utf-8");
|
7
7
|
|
8
8
|
const inclRegex = /{{>\s*include\s*["'](.+?)["']}}/g;
|
9
9
|
let match;
|
@@ -20,11 +20,11 @@ function replaceIncludes(file) {
|
|
20
20
|
targetFile = require.resolve(targetFile);
|
21
21
|
}
|
22
22
|
|
23
|
-
fileContent = fileContent.replace(match[0], replaceIncludes(targetFile));
|
23
|
+
fileContent = fileContent.replace(match[0], await replaceIncludes(targetFile));
|
24
24
|
}
|
25
25
|
|
26
26
|
return fileContent;
|
27
|
-
}
|
27
|
+
};
|
28
28
|
|
29
29
|
module.exports = {
|
30
30
|
replace: replaceIncludes
|