@ui5/webcomponents-tools 0.0.0-9c26e8e4f → 0.0.0-9ed6f23c6

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.
Files changed (34) hide show
  1. package/CHANGELOG.md +348 -0
  2. package/components-package/eslint.js +34 -0
  3. package/components-package/nps.js +54 -23
  4. package/components-package/postcss.components.js +13 -13
  5. package/components-package/postcss.themes.js +39 -15
  6. package/components-package/vite.config.js +6 -5
  7. package/components-package/wdio.js +400 -386
  8. package/components-package/wdio.sync.js +9 -1
  9. package/icons-collection/nps.js +8 -5
  10. package/lib/copy-list/index.js +2 -2
  11. package/lib/create-icons/index.js +52 -10
  12. package/lib/create-new-component/index.js +71 -104
  13. package/lib/create-new-component/jsFileContentTemplate.js +73 -0
  14. package/lib/create-new-component/tsFileContentTemplate.js +80 -0
  15. package/lib/dev-server/virtual-index-html-plugin.js +2 -2
  16. package/lib/esm-abs-to-rel/index.js +1 -1
  17. package/lib/generate-custom-elements-manifest/index.js +327 -0
  18. package/lib/generate-js-imports/illustrations.js +72 -0
  19. package/lib/hbs2lit/src/compiler.js +16 -5
  20. package/lib/hbs2lit/src/litVisitor2.js +85 -22
  21. package/lib/hbs2lit/src/svgProcessor.js +12 -5
  22. package/lib/hbs2ui5/RenderTemplates/LitRenderer.js +32 -4
  23. package/lib/hbs2ui5/index.js +21 -4
  24. package/lib/i18n/defaults.js +18 -2
  25. package/lib/i18n/toJSON.js +1 -1
  26. package/lib/jsdoc/configTypescript.json +29 -0
  27. package/lib/jsdoc/plugin.js +32 -0
  28. package/lib/jsdoc/preprocess.js +146 -0
  29. package/lib/jsdoc/template/publish.js +9 -1
  30. package/lib/postcss-css-to-esm/index.js +40 -7
  31. package/lib/replace-global-core/index.js +1 -1
  32. package/lib/scoping/get-all-tags.js +1 -8
  33. package/lib/test-runner/test-runner.js +10 -2
  34. package/package.json +14 -5
@@ -1,7 +1,35 @@
1
- const buildRenderer = (controlName, litTemplate) => {
2
- return `/* eslint no-unused-vars: 0 */
3
- import { html, svg, repeat, classMap, styleMap, ifDefined, unsafeHTML, scopeTag } from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
1
+ const tsImports = (controlName, hasTypes) => {
2
+ if (!process.env.UI5_TS) {
3
+ return "";
4
+ }
5
+
6
+ const importPrefix = process.env.UI5_BASE ? "../../../" : "@ui5/webcomponents-base/dist/"
7
+
8
+ return `import type UI5Element from "${importPrefix}UI5Element.js";
9
+ ${importForControl(controlName, hasTypes)}
10
+ import type { ClassMapValue } from "${importPrefix}types.js";
11
+ `;
12
+ }
13
+ const importForControl = (controlName, hasTypes) => {
14
+
15
+ if (!hasTypes) {
16
+ return `type ${controlName} = any;`;
17
+ }
4
18
 
19
+ if (process.env.UI5_BASE) {
20
+ // base package has a component in `test/elements` instead of `src`
21
+ return `import type ${controlName} from "../../../../test/elements/${controlName}.js";`
22
+ }
23
+ return `import type ${controlName} from "../../${controlName}.js";`
24
+ }
25
+
26
+ const buildRenderer = (controlName, litTemplate, hasTypes) => {
27
+ const importPrefix = process.env.UI5_BASE ? "../../../" : "@ui5/webcomponents-base/dist/"
28
+
29
+ // typescript cannot process package imports for the same package and the paths are changed to relative for base package templates
30
+ return `/* eslint no-unused-vars: 0 */
31
+ import { html, svg, repeat, classMap, styleMap, ifDefined, unsafeHTML, scopeTag } from "${importPrefix}renderer/LitRenderer.js";
32
+ ${tsImports(controlName, hasTypes)}
5
33
  ${litTemplate}
6
34
 
7
35
  export default block0;`;
@@ -9,4 +37,4 @@ export default block0;`;
9
37
 
10
38
  module.exports = {
11
39
  generateTemplate: buildRenderer
12
- };
40
+ };
@@ -1,10 +1,13 @@
1
1
  const fs = require('fs').promises;
2
+ const existsSync = require('fs').existsSync;
2
3
  const getopts = require('getopts');
3
4
  const hbs2lit = require('../hbs2lit');
4
5
  const path = require('path');
5
6
  const litRenderer = require('./RenderTemplates/LitRenderer');
6
7
  const recursiveReadDir = require("recursive-readdir");
7
8
 
9
+ let missingTypesReported = false;
10
+
8
11
  const args = getopts(process.argv.slice(2), {
9
12
  alias: {
10
13
  o: 'output',
@@ -23,13 +26,27 @@ const onError = (place) => {
23
26
 
24
27
  const isHandlebars = (fileName) => fileName.indexOf('.hbs') !== -1;
25
28
 
29
+ const hasTypes = (file, componentName) => {
30
+ const tsFile = path.join(path.dirname(file), componentName + ".ts")
31
+ const dtsFile = path.join(path.dirname(file), componentName + ".d.ts")
32
+ return existsSync(tsFile) || existsSync(dtsFile);
33
+ }
34
+
26
35
  const processFile = async (file, outputDir) => {
27
- const litCode = await hbs2lit(file);
28
- const absoluteOutputDir = composeAbsoluteOutputDir(file, outputDir);
29
36
  const componentNameMatcher = /(\w+)(\.hbs)/gim;
30
37
  const componentName = componentNameMatcher.exec(file)[1];
38
+ const componentHasTypes = hasTypes(file, componentName);
39
+ if (!componentHasTypes) {
40
+ if (!missingTypesReported) {
41
+ console.warn("[Warn] The following templates do not have a corresponging .ts or .d.ts file and won't be type checked:")
42
+ missingTypesReported = true;
43
+ }
44
+ console.log(" -> " + componentName + ".hbs");
45
+ }
46
+ const litCode = await hbs2lit(file, componentName);
47
+ const absoluteOutputDir = composeAbsoluteOutputDir(file, outputDir);
31
48
 
32
- return writeRenderers(absoluteOutputDir, componentName, litRenderer.generateTemplate(componentName, litCode));
49
+ return writeRenderers(absoluteOutputDir, componentName, litRenderer.generateTemplate(componentName, litCode, componentHasTypes));
33
50
  };
34
51
 
35
52
  const composeAbsoluteOutputDir = (file, outputDir) => {
@@ -70,7 +87,7 @@ const writeRenderers = async (outputDir, controlName, fileContent) => {
70
87
 
71
88
  await fs.mkdir(outputDir, { recursive: true });
72
89
 
73
- const compiledFilePath = `${outputDir}${path.sep}${controlName}Template.lit.js`;
90
+ const compiledFilePath = `${outputDir}${path.sep}${controlName}Template.lit.${process.env.UI5_TS ? "ts" : "js"}`;
74
91
 
75
92
  // strip DOS line endings because the break the source maps
76
93
  let fileContentUnix = fileContent.replace(/\r\n/g, "\n");
@@ -8,7 +8,9 @@ const generate = async () => {
8
8
 
9
9
  const messageBundle = path.normalize(`${process.argv[2]}/messagebundle.properties`);
10
10
  const messageBundleDefaultLanguage = path.normalize(`${process.argv[2]}/messagebundle_${defaultLanguage}.properties`);
11
- const outputFile = path.normalize(`${process.argv[3]}/i18n-defaults.js`);
11
+ const tsMode = process.env.UI5_TS === "true"; // In Typescript mode, we output .ts files and set the required types, otherwise - output pure .js files
12
+
13
+ const outputFile = path.normalize(`${process.argv[3]}/i18n-defaults.${tsMode ? "ts": "js"}`);
12
14
 
13
15
  if (!messageBundle || !outputFile) {
14
16
  return;
@@ -22,6 +24,15 @@ const generate = async () => {
22
24
  } catch (e) {
23
25
  }
24
26
 
27
+ // Merge messagebundle.properties and messagebundle_en.properties files to generate the default texts.
28
+ // Note:
29
+ // (1) at DEV time, it's intuituve to work with the source bundle file - the messagebundle.properties,
30
+ // and see the changes there take effect.
31
+ // (2) as the messagebundle.properties file is always written in English,
32
+ // it makes sense to consider the messagebundle.properties content only when the default language is "en".
33
+ if (defaultLanguage === "en") {
34
+ defaultLanguageProperties = Object.assign({}, defaultLanguageProperties, properties);
35
+ }
25
36
 
26
37
  /*
27
38
  * Returns the single text object to enable single export.
@@ -36,6 +47,9 @@ const generate = async () => {
36
47
  let effectiveValue = defaultLanguageValue || value;
37
48
  effectiveValue = effectiveValue.replace(/\"/g, "\\\""); // escape double quotes in translations
38
49
 
50
+ if (tsMode) {
51
+ return `const ${key}: I18nText = {key: "${key}", defaultText: "${effectiveValue}"};`;
52
+ }
39
53
  return `const ${key} = {key: "${key}", defaultText: "${effectiveValue}"};`;
40
54
  };
41
55
 
@@ -53,7 +67,9 @@ const generate = async () => {
53
67
  const textKeys = Object.keys(properties);
54
68
  const texts = textKeys.map(prop => getTextInfo(prop, properties[prop], defaultLanguageProperties && defaultLanguageProperties[prop])).join('');
55
69
 
56
- return `${texts}
70
+ // tabs are intentionally mixed to have proper identation in the produced file
71
+ return `${tsMode ? `import { I18nText } from "@ui5/webcomponents-base/dist/i18nBundle.js";` : ""}
72
+ ${texts}
57
73
  export {${textKeys.join()}};`;
58
74
  };
59
75
 
@@ -34,7 +34,7 @@ const convertToJSON = async (file) => {
34
34
  const generate = async () => {
35
35
  const { globby } = await import("globby");
36
36
  await fs.mkdir(messagesJSONDist, { recursive: true });
37
- const files = await globby(messagesBundles);
37
+ const files = await globby(messagesBundles.replace(/\\/g, "/"));
38
38
  return Promise.all(files.map(convertToJSON));
39
39
  };
40
40
 
@@ -0,0 +1,29 @@
1
+ {
2
+ "source": {
3
+ "include": "jsdoc-dist",
4
+ "excludePattern": "(/|\\\\)library-all\\.js|(/|\\\\).*-preload\\.js|^jquery-.*\\.js|^sap-.*\\.js|.+Renderer\\.lit\\.js|.*library\\.js|thirdparty"
5
+ },
6
+ "opts" : {
7
+ "recurse": true,
8
+ "template" : "template",
9
+ "destination": ""
10
+ },
11
+ "plugins": [
12
+ "./plugin.js"
13
+ ],
14
+ "templates" : {
15
+ "ui5" : {
16
+ "variants": [
17
+ "apijson"
18
+ ],
19
+ "version": "1.62",
20
+ "apiJsonFolder": "",
21
+ "apiJsonFile": "dist/api.json",
22
+ "includeSettingsInConstructor": false
23
+ }
24
+ },
25
+ "tags": {
26
+ "allowUnknownTags": true,
27
+ "dictionaries": ["jsdoc"]
28
+ }
29
+ }
@@ -34,6 +34,10 @@
34
34
  * native
35
35
  *
36
36
  * noattribute
37
+ *
38
+ * formEvents
39
+ *
40
+ * formProperty
37
41
  *
38
42
  * allowPreventDefault
39
43
  *
@@ -2108,6 +2112,34 @@ exports.defineTags = function(dictionary) {
2108
2112
  doclet.noattribute = true;
2109
2113
  }
2110
2114
  });
2115
+
2116
+ dictionary.defineTag('formEvents', {
2117
+ mustHaveValue: false,
2118
+ onTagged: function(doclet, tag) {
2119
+ if (tag.value) {
2120
+ doclet.formEvents = doclet.formEvents || [];
2121
+ tag.value.split(" ").forEach(function($) {
2122
+ if ( doclet.formEvents.indexOf($) < 0 ) {
2123
+ doclet.formEvents.push($);
2124
+ }
2125
+ });
2126
+ }
2127
+ }
2128
+ });
2129
+
2130
+ dictionary.defineTag('formProperty', {
2131
+ mustHaveValue: false,
2132
+ onTagged: function(doclet, tag) {
2133
+ doclet.formProperty = true;
2134
+ }
2135
+ });
2136
+
2137
+ dictionary.defineTag('formAssociated', {
2138
+ mustHaveValue: false,
2139
+ onTagged: function(doclet, tag) {
2140
+ doclet.formAssociated = doclet.formAssociated || true;
2141
+ }
2142
+ });
2111
2143
  };
2112
2144
 
2113
2145
  exports.handlers = {
@@ -0,0 +1,146 @@
1
+ const process = require("process");
2
+ const path = require("path");
3
+ const fs = require("fs/promises");
4
+
5
+ const inputDir = process.argv[2];
6
+ const sourceDir = process.argv[3];
7
+
8
+ const preprocessTypes = async () => {
9
+ try {
10
+ const { globby } = await import("globby");
11
+ const fileNames = await globby(inputDir.replace(/\\/g, "/") + "**/types/*.js");
12
+
13
+ return Promise.all(fileNames.map(processTypeFile));
14
+ } catch(e) {
15
+ console.log("JSDoc types preprocess failed: ", e);
16
+ }
17
+ };
18
+
19
+ const processTypeFile = async (fileName) => {
20
+ let fileContent = `${await fs.readFile(fileName)}`;
21
+
22
+ const re = new RegExp(`(\\/\\*\\*\\s*\\n([^\\*]|(\\*(?!\\/)))*\\*\\/)\\s+[\\w\\d]+\\[\\"([\\w\\d]+)\\"\\]\\s*=\\s*\\"([\\w\\d]+)\\";`, "gm")
23
+ let matches = [...fileContent.matchAll(re)];
24
+
25
+ // Get all type values
26
+ const typeData = matches.map(match => {
27
+ return {
28
+ comment: match[1],
29
+ key: match[4],
30
+ value: match[5],
31
+ };
32
+ });
33
+ if (typeData.length === 0) {
34
+ return;
35
+ }
36
+
37
+ const typeName = path.parse(fileName).name;
38
+
39
+ matches = fileContent.match(/\/\*\*\s*\n([^\*]|(\*(?!\/)))*\*\//gm);
40
+ const comment = matches[0];
41
+
42
+ const propsCode = typeData.map(item => {
43
+ return `${item.comment}\n get ${item.key}() { return "${item.value}"; }`;
44
+ }).join("\n");
45
+
46
+ const newClassCode = `
47
+ ${comment}
48
+ class ${typeName} {
49
+ ${propsCode}
50
+ };
51
+
52
+ export default ${typeName};`;
53
+
54
+ fileContent = newClassCode;
55
+
56
+ return fs.writeFile(fileName, fileContent);
57
+ };
58
+
59
+ const preprocessComponents = async () => {
60
+ if (!sourceDir) {
61
+ return; // if the second param was not passed, there are no components
62
+ }
63
+
64
+ try {
65
+ const { globby } = await import("globby");
66
+ const fileNames = await globby(sourceDir.replace(/\\/g, "/") + "/*.ts");
67
+
68
+ return Promise.all(fileNames.map(processComponentFile));
69
+ } catch(e) {
70
+ console.log("JSDoc components preprocess failed: ", e);
71
+ }
72
+ };
73
+
74
+ const isClass = text => {
75
+ return text.includes("@abstract") || text.includes("@class");
76
+ };
77
+
78
+ const isAnnotationComment = (comment) => {
79
+ return comment.includes("@name");
80
+ }
81
+
82
+ const processComponentFile = async (fileName) => {
83
+ // source file (src/*.ts)
84
+ let tsFileContent = `${await fs.readFile(fileName)}`;
85
+
86
+ // Skip all non-component files
87
+ if (!isClass(tsFileContent)) {
88
+ return;
89
+ }
90
+
91
+ // Gather all JSDocs from the original .ts file
92
+ const allJSDocsRegExp = new RegExp(`\\/\\*\\*(.|\\n)+?\\s+\\*\\/`, "gm");
93
+ let allJSDocs = [...tsFileContent.matchAll(allJSDocsRegExp)];
94
+ allJSDocs = allJSDocs.map(match => match[0]); // all /** ..... */ comments
95
+
96
+ // Find where the class is defined in the original file
97
+ const tsClassDefinitionRegExp = new RegExp(`^(abstract\\s)?class [\\w\\d_]+`, "gm");
98
+ let tsClassDefinitionMatch = tsFileContent.match(tsClassDefinitionRegExp);
99
+ if (!tsClassDefinitionMatch) {
100
+ return; // no class defined in this .ts file
101
+ }
102
+ const tsClassDefinition = tsClassDefinitionMatch[0];
103
+ const tsClassDefinitionIndex = tsFileContent.indexOf(tsClassDefinition);
104
+
105
+ // Gather all JSDocs that are before the class definition (except for the @class one)
106
+ const JSDocsToAppend = [];
107
+ allJSDocs.forEach(JSDoc => {
108
+ if (!isClass(JSDoc) && (tsFileContent.indexOf(JSDoc) < tsClassDefinitionIndex || isAnnotationComment(JSDoc, tsFileContent))) {
109
+ JSDocsToAppend.push(JSDoc);
110
+ }
111
+ });
112
+
113
+
114
+
115
+ // destination file (jsdoc-dist/*.js)
116
+ const destFileName = fileName.replace(sourceDir, inputDir).replace(/\.ts$/, ".js");
117
+ let jsFileContent = `${await fs.readFile(destFileName)}`;
118
+
119
+ const classDefinitionRegExp = new RegExp(`let.*? = class`, "gm");
120
+ let classDefinitionMatch = jsFileContent.match(classDefinitionRegExp);
121
+ if (!classDefinitionMatch) {
122
+ return; // not a file, generated by typescript, nothing to do here
123
+ }
124
+
125
+ const classDefinition = classDefinitionMatch[0];
126
+ const classDefinitionIndex = jsFileContent.indexOf(classDefinition); // classDefinitionIndex is the position in the file where the class is defined
127
+
128
+ // All comments before the class definition, except for the @class comment, must be removed
129
+ allJSDocs.forEach(JSDoc => {
130
+ if (!isClass(JSDoc) && jsFileContent.indexOf(JSDoc) < classDefinitionIndex) {
131
+ jsFileContent = jsFileContent.replace(JSDoc, "");
132
+ }
133
+ });
134
+
135
+ // Put all other comments at the end of the file
136
+ jsFileContent = jsFileContent + "\n\n" + JSDocsToAppend.join("\n\n");
137
+ return fs.writeFile(destFileName, jsFileContent);
138
+ };
139
+
140
+ Promise.all([
141
+ preprocessTypes(),
142
+ preprocessComponents(),
143
+ ]).then(() => {
144
+ console.log("JSDoc preprocess ready.");
145
+ });
146
+
@@ -2820,6 +2820,14 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
2820
2820
  attrib("since", extractVersion(member.since));
2821
2821
  }
2822
2822
 
2823
+ if ( member.formEvents ) {
2824
+ attrib("formEvents", member.formEvents);
2825
+ }
2826
+
2827
+ if ( member.formEvents ) {
2828
+ attrib("formProperty", member.formProperty);
2829
+ }
2830
+
2823
2831
  var type = listTypes(member.type);
2824
2832
  attrib("type", type);
2825
2833
 
@@ -3865,7 +3873,7 @@ function createAPIJS(symbols, filename) {
3865
3873
 
3866
3874
  var output = [];
3867
3875
 
3868
- var rkeywords = /^(?:abstract|as|boolean|break|byte|case|catch|char|class|continue|const|debugger|default|delete|do|double|else|enum|export|extends|false|final|finally|float|for|function|goto|if|implements|import|in|instanceof|int|interface|is|long|namespace|native|new|null|noattribute|package|private|protected|public|return|short|static|super|switch|synchronized|this|throw|throws|transient|true|try|typeof|use|var|void|volatile|while|with)$/;
3876
+ var rkeywords = /^(?:abstract|as|boolean|break|byte|case|catch|char|class|continue|const|debugger|default|delete|do|double|else|enum|export|extends|false|final|finally|float|for|function|formEvents|formProperty|goto|if|implements|import|in|instanceof|int|interface|is|long|namespace|native|new|null|noattribute|package|private|protected|public|return|short|static|super|switch|synchronized|this|throw|throws|transient|true|try|typeof|use|var|void|volatile|while|with)$/;
3869
3877
 
3870
3878
  function isNoKeyword($) { return !rkeywords.test($.name); }
3871
3879
 
@@ -11,11 +11,38 @@ const getDefaultThemeCode = packageName => {
11
11
  import defaultThemeBase from "@ui5/webcomponents-theming/dist/generated/themes/${DEFAULT_THEME}/parameters-bundle.css.js";
12
12
  import defaultTheme from "./${DEFAULT_THEME}/parameters-bundle.css.js";
13
13
 
14
- registerThemePropertiesLoader("@ui5/webcomponents-theming", "${DEFAULT_THEME}", () => defaultThemeBase);
15
- registerThemePropertiesLoader("${packageName}", "${DEFAULT_THEME}", () => defaultTheme);
14
+ registerThemePropertiesLoader("@ui5/webcomponents-theming", "${DEFAULT_THEME}", async () => defaultThemeBase);
15
+ registerThemePropertiesLoader("${packageName}", "${DEFAULT_THEME}", async () => defaultTheme);
16
16
  `;
17
17
  };
18
18
 
19
+ const getFileContent = (tsMode, targetFile, packageName, css, includeDefaultTheme) => {
20
+ if (tsMode) {
21
+ return getTSContent(targetFile, packageName, css, includeDefaultTheme);
22
+ }
23
+
24
+ return getJSContent(targetFile, packageName, css, includeDefaultTheme);
25
+ }
26
+
27
+ const getTSContent = (targetFile, packageName, css, includeDefaultTheme) => {
28
+ const typeImport = "import type { StyleData } from \"@ui5/webcomponents-base/dist/types.js\";"
29
+ const defaultTheme = includeDefaultTheme ? getDefaultThemeCode(packageName) : "";
30
+
31
+ // tabs are intentionally mixed to have proper identation in the produced file
32
+ return `${typeImport}
33
+ ${defaultTheme}
34
+ const styleData: StyleData = {packageName:"${packageName}",fileName:"${targetFile.substr(targetFile.lastIndexOf("themes"))}",content:${css}};
35
+ export default styleData;
36
+ `;
37
+ }
38
+
39
+ const getJSContent = (targetFile, packageName, css, includeDefaultTheme) => {
40
+ const defaultTheme = includeDefaultTheme ? getDefaultThemeCode(packageName) : "";
41
+
42
+ return `${defaultTheme}export default {packageName:"${packageName}",fileName:"${targetFile.substr(targetFile.lastIndexOf("themes"))}",content:${css}}`
43
+ }
44
+
45
+
19
46
  const proccessCSS = css => {
20
47
  css = css.replace(/\.sapThemeMeta[\s\S]*?:root/, ":root");
21
48
  css = css.replace(/\.background-image.*{.*}/, "");
@@ -27,18 +54,23 @@ const proccessCSS = css => {
27
54
  module.exports = function (opts) {
28
55
  opts = opts || {};
29
56
 
57
+ const packageName = opts.packageName;
58
+ const includeDefaultTheme = opts.includeDefaultTheme;
59
+ const toReplace = opts.toReplace;
60
+
30
61
  return {
31
62
  postcssPlugin: 'postcss-css-to-esm',
32
63
  Once (root) {
64
+ const tsMode = process.env.UI5_TS === "true";
65
+
33
66
  let css = root.toString();
34
67
  css = proccessCSS(css);
35
68
 
36
- const targetFile = root.source.input.from.replace(`/${opts.toReplace}/`, "/dist/generated/").replace(`\\${opts.toReplace}\\`, "\\dist\\generated\\");
69
+ const targetFile = root.source.input.from.replace(`/${toReplace}/`, "/src/generated/").replace(`\\${toReplace}\\`, "\\src\\generated\\");
37
70
  mkdirp.sync(path.dirname(targetFile));
38
71
 
39
- const filePath = `${targetFile}.js`;
40
- const defaultTheme = opts.includeDefaultTheme ? getDefaultThemeCode(opts.packageName) : ``;
41
-
72
+ const filePath = `${targetFile}.${tsMode ? "ts" : "js"}`;
73
+
42
74
  // it seems slower to read the old content, but writing the same content with no real changes
43
75
  // (as in initial build and then watch mode) will cause an unnecessary dev server refresh
44
76
  let oldContent = "";
@@ -47,7 +79,8 @@ module.exports = function (opts) {
47
79
  } catch (e) {
48
80
  // file not found
49
81
  }
50
- const content = `${defaultTheme}export default {packageName:"${opts.packageName}",fileName:"${targetFile.substr(targetFile.lastIndexOf("themes"))}",content:${css}}`
82
+
83
+ const content = getFileContent(tsMode, targetFile, packageName, css, includeDefaultTheme);
51
84
  if (content !== oldContent) {
52
85
  fs.writeFileSync(filePath, content);
53
86
  }
@@ -16,7 +16,7 @@ const replaceGlobalCoreUsage = async (srcPath) => {
16
16
 
17
17
  const generate = async () => {
18
18
  const { globby } = await import("globby");
19
- const fileNames = await globby(basePath + "**/*.js");
19
+ const fileNames = await globby(basePath.replace(/\\/g, "/") + "**/*.js");
20
20
  return Promise.all(fileNames.map(replaceGlobalCoreUsage).filter(x => !!x));
21
21
  };
22
22
 
@@ -8,18 +8,11 @@ const getTag = file => {
8
8
  return matches ? matches[1] : undefined;
9
9
  };
10
10
 
11
- const getAltTag = file => {
12
- const fileContent = String(fs.readFileSync(file)).replace(/\n/g, "");
13
- const matches = fileContent.match(/\baltTag\b:\s*\"(.*?)\"/);
14
- return matches ? matches[1] : undefined;
15
- };
16
-
17
11
  const getPackageTags = (packageDir) => {
18
12
  const srcDir = path.join(packageDir, "src/");
19
13
  return glob.sync(path.join(srcDir, "/**/*.js")).flatMap(file => {
20
14
  const tag = getTag(file);
21
- const altTag = getAltTag(file);
22
- return [tag, altTag];
15
+ return [tag];
23
16
  }).filter(item => !!item);
24
17
  };
25
18
 
@@ -1,6 +1,7 @@
1
1
  const child_process = require("child_process");
2
2
  const { readFileSync } = require("fs");
3
3
  const path = require("path");
4
+ const fs = require("fs");
4
5
 
5
6
  // search for dev-server port
6
7
  // start in current folder
@@ -23,7 +24,7 @@ while (true) {
23
24
  // check if we are in a monorepo and extract path from package.json
24
25
  let packageRepositoryPath = "";
25
26
  const pkg = require(path.join(process.cwd(), "package.json"));
26
- packageRepositoryPath = pkg.repository.directory;
27
+ packageRepositoryPath = pkg.repository ? pkg.repository.directory : "";
27
28
 
28
29
  // construct base url
29
30
  // use devServerPort if a dev server is running, otherwise let the baseUrl in the wdio config be used
@@ -57,7 +58,14 @@ if (process.argv.length > 3) {
57
58
  restParams = process.argv.slice(2).join(" ");
58
59
  }
59
60
 
61
+ let wdioConfig = "";
62
+ if (fs.existsSync("config/wdio.conf.cjs")) {
63
+ wdioConfig = "config/wdio.conf.cjs";
64
+ } else if (fs.existsSync("config/wdio.conf.js")) {
65
+ wdioConfig = "config/wdio.conf.js";
66
+ }
67
+
60
68
  // run wdio with calculated parameters
61
- const cmd = `yarn cross-env WDIO_LOG_LEVEL=error wdio config/wdio.conf.js ${spec} ${baseUrl} ${restParams}`;
69
+ const cmd = `yarn cross-env WDIO_LOG_LEVEL=error wdio ${wdioConfig} ${spec} ${baseUrl} ${restParams}`;
62
70
  console.log(`executing: ${cmd}`);
63
71
  child_process.execSync(cmd, {stdio: 'inherit'});
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ui5/webcomponents-tools",
3
- "version": "0.0.0-9c26e8e4f",
3
+ "version": "0.0.0-9ed6f23c6",
4
4
  "description": "UI5 Web Components: webcomponents.tools",
5
5
  "author": "SAP SE (https://www.sap.com)",
6
6
  "license": "Apache-2.0",
@@ -21,8 +21,9 @@
21
21
  "directory": "packages/tools"
22
22
  },
23
23
  "dependencies": {
24
+ "@typescript-eslint/eslint-plugin": "^5.42.1",
25
+ "@typescript-eslint/parser": "^5.42.1",
24
26
  "@wdio/cli": "^7.19.7",
25
- "@wdio/devtools-service": "^7.19.7",
26
27
  "@wdio/dot-reporter": "^7.19.7",
27
28
  "@wdio/local-runner": "^7.19.7",
28
29
  "@wdio/mocha-framework": "^7.19.7",
@@ -35,7 +36,7 @@
35
36
  "command-line-args": "^5.1.1",
36
37
  "concurrently": "^6.0.0",
37
38
  "cross-env": "^7.0.3",
38
- "cssnano": "^4.1.11",
39
+ "cssnano": "^6.0.1",
39
40
  "escodegen": "^2.0.0",
40
41
  "eslint": "^7.22.0",
41
42
  "eslint-config-airbnb-base": "^14.2.1",
@@ -50,22 +51,30 @@
50
51
  "jsdoc": "^3.6.6",
51
52
  "json-beautify": "^1.1.1",
52
53
  "mkdirp": "^1.0.4",
54
+ "modify-selectors": "^2.0.0",
53
55
  "nps": "^5.10.0",
54
56
  "postcss": "^8.4.5",
55
57
  "postcss-cli": "^9.1.0",
56
58
  "postcss-import": "^14.0.2",
57
59
  "postcss-selector-parser": "^6.0.10",
60
+ "prompts": "^2.4.2",
58
61
  "properties-reader": "^2.2.0",
59
62
  "recursive-readdir": "^2.2.2",
60
63
  "resolve": "^1.20.0",
61
64
  "rimraf": "^3.0.2",
62
65
  "slash": "3.0.0",
63
- "vite": "^2.9.12",
66
+ "vite": "^3.0.4",
64
67
  "wdio-chromedriver-service": "^7.3.2",
65
68
  "zx": "^4.3.0"
66
69
  },
67
70
  "peerDependencies": {
68
- "chromedriver": "*"
71
+ "chromedriver": "*",
72
+ "typescript": "^4.9.4"
73
+ },
74
+ "peerDependenciesMeta": {
75
+ "typescript": {
76
+ "optional": true
77
+ }
69
78
  },
70
79
  "devDependencies": {
71
80
  "yargs": "^17.5.1"