@ui5/webcomponents-tools 0.0.0-e7dd012d7 → 0.0.0-ec448881d

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 (73) hide show
  1. package/CHANGELOG.md +170 -0
  2. package/README.md +1 -1
  3. package/assets-meta.js +16 -1
  4. package/components-package/nps.js +41 -28
  5. package/components-package/postcss.themes.js +6 -3
  6. package/components-package/rollup-plugins/empty-module.js +15 -0
  7. package/components-package/rollup.js +83 -78
  8. package/components-package/wdio.js +54 -29
  9. package/components-package/wdio.sync.js +360 -0
  10. package/icons-collection/nps.js +46 -8
  11. package/lib/copy-and-watch/index.js +30 -5
  12. package/lib/copy-list/index.js +28 -0
  13. package/lib/create-icons/index.js +82 -52
  14. package/lib/create-illustrations/index.js +161 -0
  15. package/lib/create-new-component/index.js +12 -4
  16. package/lib/documentation/index.js +124 -99
  17. package/lib/documentation/templates/api-properties-section.js +3 -1
  18. package/lib/documentation/templates/template.js +2 -1
  19. package/lib/esm-abs-to-rel/index.js +58 -0
  20. package/lib/generate-json-imports/i18n.js +75 -30
  21. package/lib/generate-json-imports/themes.js +61 -23
  22. package/lib/hbs2lit/src/compiler.js +12 -3
  23. package/lib/hbs2lit/src/includesReplacer.js +5 -5
  24. package/lib/hbs2lit/src/litVisitor2.js +31 -6
  25. package/lib/hbs2lit/src/svgProcessor.js +3 -3
  26. package/lib/hbs2ui5/RenderTemplates/LitRenderer.js +4 -11
  27. package/lib/hbs2ui5/index.js +37 -21
  28. package/lib/i18n/defaults.js +49 -57
  29. package/lib/i18n/toJSON.js +13 -12
  30. package/lib/jsdoc/config.json +1 -1
  31. package/lib/jsdoc/plugin.js +30 -1
  32. package/lib/jsdoc/template/publish.js +22 -2
  33. package/lib/postcss-combine-duplicated-selectors/index.js +178 -0
  34. package/lib/postcss-css-to-esm/index.js +19 -16
  35. package/lib/postcss-css-to-json/index.js +20 -11
  36. package/lib/postcss-new-files/index.js +36 -0
  37. package/lib/postcss-p/postcss-p.mjs +11 -0
  38. package/lib/replace-global-core/index.js +25 -0
  39. package/lib/scoping/lint-src.js +1 -1
  40. package/lib/scoping/missing-dependencies.js +65 -0
  41. package/lib/scoping/report-tags-usage.js +28 -0
  42. package/lib/serve/index.js +46 -0
  43. package/{components-package → lib/serve}/serve.json +0 -0
  44. package/package.json +45 -52
  45. package/bin/init-ui5-package.js +0 -3
  46. package/lib/init-package/index.js +0 -123
  47. package/lib/init-package/resources/.eslintignore +0 -3
  48. package/lib/init-package/resources/bundle.es5.js +0 -25
  49. package/lib/init-package/resources/bundle.esm.js +0 -34
  50. package/lib/init-package/resources/config/.eslintrc.js +0 -1
  51. package/lib/init-package/resources/config/postcss.components/postcss.config.js +0 -1
  52. package/lib/init-package/resources/config/postcss.themes/postcss.config.js +0 -1
  53. package/lib/init-package/resources/config/rollup.config.js +0 -1
  54. package/lib/init-package/resources/config/wdio.conf.js +0 -1
  55. package/lib/init-package/resources/package-scripts.js +0 -11
  56. package/lib/init-package/resources/src/Assets.js +0 -5
  57. package/lib/init-package/resources/src/MyFirstComponent.hbs +0 -1
  58. package/lib/init-package/resources/src/MyFirstComponent.js +0 -56
  59. package/lib/init-package/resources/src/i18n/messagebundle.properties +0 -2
  60. package/lib/init-package/resources/src/i18n/messagebundle_de.properties +0 -1
  61. package/lib/init-package/resources/src/i18n/messagebundle_en.properties +0 -1
  62. package/lib/init-package/resources/src/i18n/messagebundle_es.properties +0 -1
  63. package/lib/init-package/resources/src/i18n/messagebundle_fr.properties +0 -1
  64. package/lib/init-package/resources/src/themes/MyFirstComponent.css +0 -11
  65. package/lib/init-package/resources/src/themes/sap_belize/parameters-bundle.css +0 -3
  66. package/lib/init-package/resources/src/themes/sap_belize_hcb/parameters-bundle.css +0 -3
  67. package/lib/init-package/resources/src/themes/sap_belize_hcw/parameters-bundle.css +0 -3
  68. package/lib/init-package/resources/src/themes/sap_fiori_3/parameters-bundle.css +0 -3
  69. package/lib/init-package/resources/src/themes/sap_fiori_3_dark/parameters-bundle.css +0 -3
  70. package/lib/init-package/resources/src/themes/sap_fiori_3_hcb/parameters-bundle.css +0 -3
  71. package/lib/init-package/resources/src/themes/sap_fiori_3_hcw/parameters-bundle.css +0 -3
  72. package/lib/init-package/resources/test/pages/index.html +0 -56
  73. package/lib/init-package/resources/test/specs/Demo.spec.js +0 -12
@@ -1,74 +1,66 @@
1
- const fs = require('fs');
1
+ const fs = require('fs').promises;
2
2
  const path = require('path');
3
3
  const PropertiesReader = require('properties-reader');
4
- const mkdirp = require("mkdirp");
5
4
  const assets = require('../../assets-meta.js');
6
5
 
7
- const defaultLanguage = assets.languages.default;
6
+ const generate = async () => {
7
+ const defaultLanguage = assets.languages.default;
8
8
 
9
- const messageBundle = path.normalize(`${process.argv[2]}/messagebundle.properties`);
10
- const messageBundleDefaultLanguage = path.normalize(`${process.argv[2]}/messagebundle_${defaultLanguage}.properties`);
11
- const outputFile = path.normalize(`${process.argv[3]}/i18n-defaults.js`);
9
+ const messageBundle = path.normalize(`${process.argv[2]}/messagebundle.properties`);
10
+ const messageBundleDefaultLanguage = path.normalize(`${process.argv[2]}/messagebundle_${defaultLanguage}.properties`);
11
+ const outputFile = path.normalize(`${process.argv[3]}/i18n-defaults.js`);
12
12
 
13
- if (!messageBundle || !outputFile) {
14
- return;
15
- }
13
+ if (!messageBundle || !outputFile) {
14
+ return;
15
+ }
16
16
 
17
- const properties = PropertiesReader(messageBundle)._properties;
17
+ const properties = PropertiesReader(messageBundle)._properties;
18
18
 
19
- let defaultLanguageProperties;
20
- try {
21
- defaultLanguageProperties = PropertiesReader(messageBundleDefaultLanguage)._properties;
22
- }
23
- catch (e) {}
19
+ let defaultLanguageProperties;
20
+ try {
21
+ defaultLanguageProperties = PropertiesReader(messageBundleDefaultLanguage)._properties;
22
+ } catch (e) {
23
+ }
24
24
 
25
25
 
26
- /*
27
- * Returns the single text object to enable single export.
28
- *
29
- * Example:
30
- * const ARIA_LABEL_CARD_CONTENT = {
31
- * key: "ARIA_LABEL_CARD_CONTENT",
32
- * defaultText: "Card Content",
33
- * };
34
- */
35
- const getTextInfo = (key, value, defaultLanguageValue) => {
36
- let effectiveValue = defaultLanguageValue || value;
37
- effectiveValue = effectiveValue.replace(/\"/g, "\\\""); // escape double quotes in translations
26
+ /*
27
+ * Returns the single text object to enable single export.
28
+ *
29
+ * Example:
30
+ * const ARIA_LABEL_CARD_CONTENT = {
31
+ * key: "ARIA_LABEL_CARD_CONTENT",
32
+ * defaultText: "Card Content",
33
+ * };
34
+ */
35
+ const getTextInfo = (key, value, defaultLanguageValue) => {
36
+ let effectiveValue = defaultLanguageValue || value;
37
+ effectiveValue = effectiveValue.replace(/\"/g, "\\\""); // escape double quotes in translations
38
38
 
39
- return `const ${key} = {key: "${key}", defaultText: "${effectiveValue}"};`;
40
- };
39
+ return `const ${key} = {key: "${key}", defaultText: "${effectiveValue}"};`;
40
+ };
41
41
 
42
- /*
43
- * Returns the complete content of i18n-defaults.js file:
44
- * (1) the single text objects
45
- * (2) the export statement at the end of the file
46
- *
47
- * Example:
48
- * export {
49
- * ARIA_LABEL_CARD_CONTENT,
50
- * }
51
- */
52
- const getOutputFileContent = (properties, defaultLanguageProperties) => {
53
- const textKeys = Object.keys(properties);
54
- const texts = textKeys.map(prop => getTextInfo(prop, properties[prop], defaultLanguageProperties && defaultLanguageProperties[prop])).join('');
42
+ /*
43
+ * Returns the complete content of i18n-defaults.js file:
44
+ * (1) the single text objects
45
+ * (2) the export statement at the end of the file
46
+ *
47
+ * Example:
48
+ * export {
49
+ * ARIA_LABEL_CARD_CONTENT,
50
+ * }
51
+ */
52
+ const getOutputFileContent = (properties, defaultLanguageProperties) => {
53
+ const textKeys = Object.keys(properties);
54
+ const texts = textKeys.map(prop => getTextInfo(prop, properties[prop], defaultLanguageProperties && defaultLanguageProperties[prop])).join('');
55
55
 
56
- return `${texts}
56
+ return `${texts}
57
57
  export {${textKeys.join()}};`;
58
- };
59
-
60
- /*
61
- * Writes the i18n-defaults.js.
62
- */
63
- const writeI18nDefaultsFile = (file, content) => {
64
- fs.writeFile(file, content, (err) => {
65
- if (err) {
66
- return console.log(err);
67
- }
58
+ };
68
59
 
69
- console.log(`[i18n]: "${file}" file has been created`);
70
- });
60
+ await fs.mkdir(path.dirname(outputFile), { recursive: true });
61
+ await fs.writeFile(outputFile, getOutputFileContent(properties, defaultLanguageProperties));
71
62
  };
72
63
 
73
- mkdirp.sync(path.dirname(outputFile));
74
- writeI18nDefaultsFile(outputFile, getOutputFileContent(properties, defaultLanguageProperties));
64
+ generate().then(() => {
65
+ console.log("i18n default file generated.");
66
+ });
@@ -8,18 +8,16 @@
8
8
  * The 2nd param './../dist/generated/assets/i18n' is where the JSON files would be written to.
9
9
  */
10
10
  const path = require("path");
11
- const glob = require("glob");
12
11
  const PropertiesReader = require('properties-reader');
13
- const fs = require('fs');
12
+ const fs = require('fs').promises;
14
13
  const assets = require('../../assets-meta.js');
15
- const mkdirp = require("mkdirp");
16
14
 
17
15
  const allLanguages = assets.languages.all;
18
16
 
19
17
  const messagesBundles = path.normalize(`${process.argv[2]}/messagebundle_*.properties`);
20
18
  const messagesJSONDist = path.normalize(`${process.argv[3]}`);
21
19
 
22
- const convertToJSON = (file) => {
20
+ const convertToJSON = async (file) => {
23
21
  const properties = PropertiesReader(file)._properties;
24
22
  const filename = path.basename(file, path.extname(file));
25
23
  const language = filename.match(/^messagebundle_(.*?)$/)[1];
@@ -29,14 +27,17 @@ const messagesJSONDist = path.normalize(`${process.argv[3]}`);
29
27
  }
30
28
  const outputFile = path.normalize(`${messagesJSONDist}/${filename}.json`);
31
29
 
32
- fs.writeFileSync(outputFile, JSON.stringify(properties));
33
- console.log(`[i18n]: "${filename}.json" has been generated!`);
30
+ return fs.writeFile(outputFile, JSON.stringify(properties));
31
+ // console.log(`[i18n]: "${filename}.json" has been generated!`);
34
32
  };
35
33
 
36
- mkdirp.sync(messagesJSONDist);
37
- glob(messagesBundles, {}, (err, files) => {
38
- if (err) {
39
- return console.log("No messagebundle files found!");
40
- }
41
- files.forEach(convertToJSON);
34
+ const generate = async () => {
35
+ const { globby } = await import("globby");
36
+ await fs.mkdir(messagesJSONDist, { recursive: true });
37
+ const files = await globby(messagesBundles);
38
+ return Promise.all(files.map(convertToJSON));
39
+ };
40
+
41
+ generate().then(() => {
42
+ console.log("Message bundle JSON files generated.");
42
43
  });
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "source": {
3
3
  "include": "src",
4
- "excludePattern": "(/|\\\\)library-all\\.js|(/|\\\\).*-preload\\.js|^jquery-.*\\.js|^sap-.*\\.js|.+Renderer\\.lit\\.js|.*library\\.js"
4
+ "excludePattern": "(/|\\\\)library-all\\.js|(/|\\\\).*-preload\\.js|^jquery-.*\\.js|^sap-.*\\.js|.+Renderer\\.lit\\.js|.*library\\.js|thirdparty"
5
5
  },
6
6
  "opts" : {
7
7
  "recurse": true,
@@ -31,6 +31,12 @@
31
31
  *
32
32
  * tagname
33
33
  *
34
+ * native
35
+ *
36
+ * noattribute
37
+ *
38
+ * allowPreventDefault
39
+ *
34
40
  * It furthermore listens to the following JSDoc3 events to implement additional functionality
35
41
  *
36
42
  * parseBegin
@@ -2060,9 +2066,11 @@ exports.defineTags = function(dictionary) {
2060
2066
  });
2061
2067
 
2062
2068
  dictionary.defineTag('slot', {
2063
- mustNotHaveValue: true,
2064
2069
  onTagged: function(doclet, tag) {
2065
2070
  doclet.slot = true;
2071
+ if (tag.value) {
2072
+ doclet.propertyName = tag.value;
2073
+ }
2066
2074
  }
2067
2075
  });
2068
2076
 
@@ -2079,6 +2087,27 @@ exports.defineTags = function(dictionary) {
2079
2087
  doclet.tagname = tag.value;
2080
2088
  }
2081
2089
  });
2090
+
2091
+ dictionary.defineTag('allowPreventDefault', {
2092
+ mustHaveValue: false,
2093
+ onTagged: function(doclet, tag) {
2094
+ doclet.allowPreventDefault = true;
2095
+ }
2096
+ });
2097
+
2098
+ dictionary.defineTag('native', {
2099
+ mustHaveValue: false,
2100
+ onTagged: function(doclet, tag) {
2101
+ doclet.native = true;
2102
+ }
2103
+ });
2104
+
2105
+ dictionary.defineTag('noattribute', {
2106
+ mustHaveValue: false,
2107
+ onTagged: function(doclet, tag) {
2108
+ doclet.noattribute = true;
2109
+ }
2110
+ });
2082
2111
  };
2083
2112
 
2084
2113
  exports.handlers = {
@@ -2804,6 +2804,10 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
2804
2804
  attrib("export", undefined, '', true);
2805
2805
  }
2806
2806
 
2807
+ if (member.noattribute) {
2808
+ attrib("noattribute", true);
2809
+ }
2810
+
2807
2811
  if (member.readonly) {
2808
2812
  attrib("readonly", member.readonly, null);
2809
2813
  }
@@ -2815,7 +2819,14 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
2815
2819
  if ( member.since ) {
2816
2820
  attrib("since", extractVersion(member.since));
2817
2821
  }
2818
- attrib("type", listTypes(member.type));
2822
+
2823
+ var type = listTypes(member.type);
2824
+ attrib("type", type);
2825
+
2826
+ if ((type === "object" || type === "Object") && visibility(member) === "public") {
2827
+ attrib("noattribute", true);
2828
+ }
2829
+
2819
2830
  tag("description", normalizeWS(member.description), true);
2820
2831
  if (member.defaultvalue) {
2821
2832
  attrib("defaultValue", member.defaultvalue);
@@ -2838,6 +2849,9 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
2838
2849
  if (member.slot) {
2839
2850
  tag("property");
2840
2851
  attrib("name", member.name);
2852
+ if (member.propertyName) {
2853
+ attrib("propertyName", member.propertyName);
2854
+ }
2841
2855
  if (member.__ui5.module && member.__ui5.module !== symbol.__ui5.module) {
2842
2856
  attrib("module", member.__ui5.module);
2843
2857
  attrib("export", undefined, '', true);
@@ -2879,6 +2893,12 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
2879
2893
  attrib("module", member.__ui5.module);
2880
2894
  attrib("export", undefined, '', true);
2881
2895
  }
2896
+ if (member.allowPreventDefault) {
2897
+ attrib("allowPreventDefault", true);
2898
+ }
2899
+ if (member.native) {
2900
+ attrib("native", true);
2901
+ }
2882
2902
  attrib("visibility", visibility(member), 'public');
2883
2903
  if ( member.scope === 'static' ) {
2884
2904
  attrib("static", true, false, /* raw = */true);
@@ -3845,7 +3865,7 @@ function createAPIJS(symbols, filename) {
3845
3865
 
3846
3866
  var output = [];
3847
3867
 
3848
- 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|package|private|protected|public|return|short|static|super|switch|synchronized|this|throw|throws|transient|true|try|typeof|use|var|void|volatile|while|with)$/;
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)$/;
3849
3869
 
3850
3870
  function isNoKeyword($) { return !rkeywords.test($.name); }
3851
3871
 
@@ -0,0 +1,178 @@
1
+ /*
2
+ The MIT License (MIT)
3
+
4
+ Copyright (c) 2016 Christian Murphy
5
+
6
+ Permission is hereby granted, free of charge, to any person obtaining a copy
7
+ of this software and associated documentation files (the "Software"), to deal
8
+ in the Software without restriction, including without limitation the rights
9
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10
+ copies of the Software, and to permit persons to whom the Software is
11
+ furnished to do so, subject to the following conditions:
12
+
13
+ The above copyright notice and this permission notice shall be included in all
14
+ copies or substantial portions of the Software.
15
+
16
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22
+ SOFTWARE.
23
+ */
24
+
25
+ const parser = require('postcss-selector-parser');
26
+ const name = "postcss-combine-duplicated-selectors";
27
+
28
+ /**
29
+ * Ensure that attributes with different quotes match.
30
+ * @param {Object} selector - postcss selector node
31
+ */
32
+ function normalizeAttributes(selector) {
33
+ selector.walkAttributes((node) => {
34
+ if (node.value) {
35
+ // remove quotes
36
+ node.value = node.value.replace(/'|\\'|"|\\"/g, '');
37
+ }
38
+ });
39
+ }
40
+
41
+ /**
42
+ * Sort class and id groups alphabetically
43
+ * @param {Object} selector - postcss selector node
44
+ */
45
+ function sortGroups(selector) {
46
+ selector.each((subSelector) => {
47
+ subSelector.nodes.sort((a, b) => {
48
+ // different types cannot be sorted
49
+ if (a.type !== b.type) {
50
+ return 0;
51
+ }
52
+
53
+ // sort alphabetically
54
+ return a.value < b.value ? -1 : 1;
55
+ });
56
+ });
57
+
58
+ selector.sort((a, b) => (a.nodes.join('') < b.nodes.join('') ? -1 : 1));
59
+ }
60
+
61
+ /**
62
+ * Remove duplicated properties
63
+ * @param {Object} selector - postcss selector node
64
+ * @param {Boolean} exact
65
+ */
66
+ function removeDupProperties(selector, exact) {
67
+ if (!exact) { // Remove duplicated properties, regardless of value
68
+ const retainedProps = new Set();
69
+
70
+ for (let actIndex = selector.nodes.length - 1; actIndex >= 1; actIndex--) {
71
+ const prop = selector.nodes[actIndex].prop;
72
+ if (prop !== undefined) {
73
+ if (!retainedProps.has(prop)) {
74
+ retainedProps.add(prop); // Mark the prop as retained, all other occurrences must be removed
75
+ } else {
76
+ selector.nodes[actIndex].remove(); // This occurrence of the prop must be removed
77
+ }
78
+ }
79
+ }
80
+ } else {
81
+ // Remove duplicated properties from bottom to top ()
82
+ for (let actIndex = selector.nodes.length - 1; actIndex >= 1; actIndex--) {
83
+ for (let befIndex = actIndex - 1; befIndex >= 0; befIndex--) {
84
+ if (
85
+ selector.nodes[actIndex].prop === selector.nodes[befIndex].prop &&
86
+ selector.nodes[actIndex].value === selector.nodes[befIndex].value
87
+ ) {
88
+ selector.nodes[befIndex].remove();
89
+ actIndex--;
90
+ }
91
+ }
92
+ }
93
+ }
94
+ }
95
+
96
+ const uniformStyle = parser((selector) => {
97
+ normalizeAttributes(selector);
98
+ sortGroups(selector);
99
+ });
100
+
101
+ const defaultOptions = {
102
+ removeDuplicatedProperties: false,
103
+ };
104
+
105
+ module.exports = (options) => {
106
+ options = Object.assign({}, defaultOptions, options);
107
+ return {
108
+ postcssPlugin: name,
109
+ prepare() {
110
+ // Create a map to store maps
111
+ const mapTable = new Map();
112
+ // root map to store root selectors
113
+ mapTable.set('root', new Map());
114
+
115
+ return {
116
+ Rule: (rule) => {
117
+ let map;
118
+ // Check selector parent for any at rule
119
+ if (rule.parent.type === 'atrule') {
120
+ // Use name and query params as the key
121
+ const query =
122
+ rule.parent.name.toLowerCase() +
123
+ rule.parent.params.replace(/\s+/g, '');
124
+
125
+ // See if this query key is already in the map table
126
+ map = mapTable.has(query) ? // If it is use it
127
+ mapTable.get(query) : // if not set it and get it
128
+ mapTable.set(query, new Map()).get(query);
129
+ } else {
130
+ // Otherwise we are dealing with a selector in the root
131
+ map = mapTable.get('root');
132
+ }
133
+
134
+ // create a uniform selector
135
+ const selector = uniformStyle.processSync(rule.selector, {
136
+ lossless: false,
137
+ });
138
+
139
+ if (map.has(selector)) {
140
+ // store original rule as destination
141
+ const destination = map.get(selector);
142
+
143
+ // check if node has already been processed
144
+ if (destination === rule) return;
145
+
146
+ // move declarations to original rule
147
+ while (rule.nodes.length > 0) {
148
+ destination.append(rule.nodes[0]);
149
+ }
150
+ // remove duplicated rule
151
+ rule.remove();
152
+
153
+ if (
154
+ options.removeDuplicatedProperties ||
155
+ options.removeDuplicatedValues
156
+ ) {
157
+ removeDupProperties(
158
+ destination,
159
+ options.removeDuplicatedValues,
160
+ );
161
+ }
162
+ } else {
163
+ if (
164
+ options.removeDuplicatedProperties ||
165
+ options.removeDuplicatedValues
166
+ ) {
167
+ removeDupProperties(rule, options.removeDuplicatedValues);
168
+ }
169
+ // add new selector to symbol table
170
+ map.set(selector, rule);
171
+ }
172
+ },
173
+ };
174
+ },
175
+ };
176
+ };
177
+
178
+ module.exports.postcss = true;
@@ -1,4 +1,3 @@
1
- const postcss = require('postcss');
2
1
  const fs = require('fs');
3
2
  const path = require('path');
4
3
  const mkdirp = require('mkdirp');
@@ -7,13 +6,13 @@ const assets = require("../../assets-meta.js");
7
6
  const DEFAULT_THEME = assets.themes.default;
8
7
 
9
8
  const getDefaultThemeCode = packageName => {
10
- return `import { registerThemeProperties } from "@ui5/webcomponents-base/dist/asset-registries/Themes.js";
9
+ return `import { registerThemePropertiesLoader } from "@ui5/webcomponents-base/dist/asset-registries/Themes.js";
11
10
 
12
- import defaultThemeBase from "@ui5/webcomponents-theme-base/dist/generated/themes/${DEFAULT_THEME}/parameters-bundle.css.js";
11
+ import defaultThemeBase from "@ui5/webcomponents-theming/dist/generated/themes/${DEFAULT_THEME}/parameters-bundle.css.js";
13
12
  import defaultTheme from "./${DEFAULT_THEME}/parameters-bundle.css.js";
14
13
 
15
- registerThemeProperties("@ui5/webcomponents-theme-base", "${DEFAULT_THEME}", defaultThemeBase);
16
- registerThemeProperties("${packageName}", "${DEFAULT_THEME}", defaultTheme);
14
+ registerThemePropertiesLoader("@ui5/webcomponents-theming", "${DEFAULT_THEME}", () => defaultThemeBase);
15
+ registerThemePropertiesLoader("${packageName}", "${DEFAULT_THEME}", () => defaultTheme);
17
16
  `;
18
17
  };
19
18
 
@@ -25,18 +24,22 @@ const proccessCSS = css => {
25
24
  return JSON.stringify(css);
26
25
  }
27
26
 
28
- module.exports = postcss.plugin('add css to esm transform plugin', function (opts) {
27
+ module.exports = function (opts) {
29
28
  opts = opts || {};
30
29
 
31
- return function (root) {
32
- let css = root.toString();
33
- css = proccessCSS(css);
30
+ return {
31
+ postcssPlugin: 'postcss-css-to-esm',
32
+ Once (root) {
33
+ let css = root.toString();
34
+ css = proccessCSS(css);
34
35
 
35
- const targetFile = root.source.input.from.replace(`/${opts.toReplace}/`, "/dist/generated/").replace(`\\${opts.toReplace}\\`, "\\dist\\generated\\");
36
- mkdirp.sync(path.dirname(targetFile));
36
+ const targetFile = root.source.input.from.replace(`/${opts.toReplace}/`, "/dist/generated/").replace(`\\${opts.toReplace}\\`, "\\dist\\generated\\");
37
+ mkdirp.sync(path.dirname(targetFile));
37
38
 
38
- const filePath = `${targetFile}.js`;
39
- const defaultTheme = opts.includeDefaultTheme ? getDefaultThemeCode(opts.packageName) : ``;
40
- fs.writeFileSync(filePath, `${defaultTheme}export default ${css};`);
41
- }
42
- });
39
+ const filePath = `${targetFile}.js`;
40
+ const defaultTheme = opts.includeDefaultTheme ? getDefaultThemeCode(opts.packageName) : ``;
41
+ fs.writeFileSync(filePath, `${defaultTheme}export default {packageName:"${opts.packageName}",fileName:"${targetFile.substr(targetFile.lastIndexOf("themes"))}",content:${css}}`);
42
+ }
43
+ };
44
+ };
45
+ module.exports.postcss = true;
@@ -1,4 +1,3 @@
1
- const postcss = require('postcss');
2
1
  const fs = require('fs');
3
2
  const path = require('path');
4
3
  const mkdirp = require('mkdirp');
@@ -11,17 +10,27 @@ const proccessCSS = css => {
11
10
  return css;
12
11
  }
13
12
 
14
- module.exports = postcss.plugin('add css to JSON transform plugin', function (opts) {
13
+ module.exports = function (opts) {
15
14
  opts = opts || {};
16
15
 
17
- return function (root) {
18
- let css = root.toString();
19
- css = proccessCSS(css);
16
+ return {
17
+ postcssPlugin: 'postcss-css-to-json',
18
+ Once (root) {
19
+ let css = root.toString();
20
+ css = proccessCSS(css);
20
21
 
21
- const targetFile = root.source.input.from.replace(`/${opts.toReplace}/`, "/dist/generated/assets/").replace(`\\${opts.toReplace}\\`, "\\dist\\generated\\assets\\");
22
- mkdirp.sync(path.dirname(targetFile));
22
+ const targetFile = root.source.input.from.replace(`/${opts.toReplace}/`, "/dist/generated/assets/").replace(`\\${opts.toReplace}\\`, "\\dist\\generated\\assets\\");
23
+ mkdirp.sync(path.dirname(targetFile));
23
24
 
24
- const filePath = `${targetFile}.json`;
25
- fs.writeFileSync(filePath, JSON.stringify({_: css}));
26
- }
27
- });
25
+ const filePath = `${targetFile}.json`;
26
+ const data = {
27
+ packageName: opts.packageName,
28
+ fileName: targetFile.substr(targetFile.lastIndexOf("themes")),
29
+ content: css
30
+ };
31
+ fs.writeFileSync(filePath, JSON.stringify({_: data}));
32
+ }
33
+ };
34
+ };
35
+
36
+ module.exports.postcss = true;
@@ -0,0 +1,36 @@
1
+ const chokidar = require("chokidar");
2
+ const commandLineArgs = require("command-line-args");
3
+ const { exec } = require("child_process");
4
+
5
+ const options = commandLineArgs([
6
+ { name: "srcFiles", type: String },
7
+ ]);
8
+
9
+ const runPostcss = path => {
10
+ let command = `postcss ${path} --config config/postcss.components --base src --dir dist/css/`;
11
+ console.log(`Executing: ${command}`);
12
+ exec(command, (err, stdout, stderr) => {
13
+ if (err) {
14
+ console.log(`Could not run postcss for ${path}. Error: ${err}`);
15
+ }
16
+ });
17
+
18
+ command = `${command} -w`;
19
+ console.log(`Executing: ${command}`);
20
+ exec(command, (err, stdout, stderr) => {
21
+ if (err) {
22
+ console.log(`Could not run postcss in watch mode for ${path}. Error: ${err}`);
23
+ }
24
+ });
25
+ };
26
+
27
+ let ready = false; // Do nothing until the ready event has been fired (we don't want to recompile all files initially)
28
+ const watcher = chokidar.watch(options.srcFiles);
29
+ watcher.on("ready", () => {
30
+ ready = true; // Initial scan is over -> waiting for new files
31
+ });
32
+ watcher.on("add", path => {
33
+ if (ready) {
34
+ runPostcss(path);
35
+ }
36
+ });
@@ -0,0 +1,11 @@
1
+ import 'zx/globals';
2
+
3
+ const inputFiles = await globby("src/**/parameters-bundle.css");
4
+
5
+ const restArgs = process.argv.slice(2);
6
+
7
+ // run all postcss processes in parallel as passing the glob directly to postcss makes them processed sequentially.
8
+ // and the amount of imports give a big speed up when run in parallel
9
+ await Promise.all(inputFiles.map(file => {
10
+ return $`postcss ${file} --config config/postcss.themes --base src --dir dist/css/ ${restArgs}`;
11
+ }));
@@ -0,0 +1,25 @@
1
+ const fs = require("fs").promises;
2
+
3
+ const basePath = process.argv[2];
4
+
5
+ const replaceGlobalCoreUsage = async (srcPath) => {
6
+
7
+ const original = (await fs.readFile(srcPath)).toString();
8
+ let replaced = original.replace(/sap\.ui\.getCore\(\)/g, `Core`);
9
+
10
+ if (original !== replaced) {
11
+ replaced = `import Core from 'sap/ui/core/Core';
12
+ ${replaced}`;
13
+ return fs.writeFile(srcPath, replaced);
14
+ }
15
+ };
16
+
17
+ const generate = async () => {
18
+ const { globby } = await import("globby");
19
+ const fileNames = await globby(basePath + "**/*.js");
20
+ return Promise.all(fileNames.map(replaceGlobalCoreUsage).filter(x => !!x));
21
+ };
22
+
23
+ generate().then(() => {
24
+ console.log("Success: Replaced global core usage in:", basePath);
25
+ });
@@ -10,7 +10,7 @@ const errors = [];
10
10
  glob.sync(path.join(process.cwd(), "src/**/*.css")).forEach(file => {
11
11
  let content = String(fs.readFileSync(file));
12
12
  tags.forEach(tag => {
13
- if (content.match(new RegExp(`(^|[^\-_A-Za-z0-9"\[])(${tag})([^\-_A-Za-z0-9]|$)`, "g"))) {
13
+ if (content.match(new RegExp(`(^|[^\.\-_A-Za-z0-9"\[])(${tag})([^\-_A-Za-z0-9]|$)`, "g"))) {
14
14
  errors.push(`Warning! ${tag} found in ${file}`);
15
15
  }
16
16
  });