@ui5/webcomponents-tools 0.0.0-e7dd012d7 → 0.0.0-e818f286e
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 +200 -0
- package/README.md +5 -6
- package/assets-meta.js +16 -1
- package/bin/dev.js +1 -5
- package/components-package/nps.js +68 -46
- package/components-package/postcss.themes.js +6 -3
- package/components-package/vite.config.js +12 -0
- package/components-package/wdio.js +73 -31
- package/components-package/wdio.sync.js +360 -0
- package/icons-collection/nps.js +46 -8
- package/lib/copy-and-watch/index.js +30 -5
- package/lib/copy-list/index.js +28 -0
- package/lib/create-icons/index.js +82 -52
- package/lib/create-illustrations/index.js +161 -0
- package/lib/create-new-component/index.js +12 -4
- 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 +58 -0
- package/lib/generate-json-imports/i18n.js +75 -30
- package/lib/generate-json-imports/themes.js +62 -24
- package/lib/hbs2lit/src/compiler.js +12 -3
- package/lib/hbs2lit/src/includesReplacer.js +5 -5
- package/lib/hbs2lit/src/litVisitor2.js +31 -6
- package/lib/hbs2lit/src/svgProcessor.js +3 -3
- package/lib/hbs2ui5/RenderTemplates/LitRenderer.js +4 -11
- package/lib/hbs2ui5/index.js +37 -21
- package/lib/i18n/defaults.js +49 -57
- package/lib/i18n/toJSON.js +13 -12
- package/lib/jsdoc/config.json +1 -1
- package/lib/jsdoc/plugin.js +30 -1
- package/lib/jsdoc/template/publish.js +22 -2
- package/lib/postcss-combine-duplicated-selectors/index.js +178 -0
- package/lib/postcss-css-to-esm/index.js +33 -18
- package/lib/postcss-css-to-json/index.js +31 -11
- package/lib/postcss-new-files/index.js +36 -0
- package/lib/postcss-p/postcss-p.mjs +14 -0
- package/lib/replace-global-core/index.js +25 -0
- package/lib/scoping/lint-src.js +1 -1
- package/lib/scoping/missing-dependencies.js +65 -0
- package/lib/scoping/report-tags-usage.js +28 -0
- package/lib/scoping/scope-test-pages.js +1 -1
- package/lib/test-runner/test-runner.js +63 -0
- package/package.json +42 -52
- package/bin/init-ui5-package.js +0 -3
- package/components-package/rollup.js +0 -145
- package/components-package/serve.json +0 -3
- package/lib/documentation/index.js +0 -143
- 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 -40
- package/lib/documentation/templates/api-slots-section.js +0 -28
- package/lib/documentation/templates/template.js +0 -38
- package/lib/init-package/index.js +0 -123
- package/lib/init-package/resources/.eslintignore +0 -3
- package/lib/init-package/resources/bundle.es5.js +0 -25
- package/lib/init-package/resources/bundle.esm.js +0 -34
- package/lib/init-package/resources/config/.eslintrc.js +0 -1
- package/lib/init-package/resources/config/postcss.components/postcss.config.js +0 -1
- package/lib/init-package/resources/config/postcss.themes/postcss.config.js +0 -1
- package/lib/init-package/resources/config/rollup.config.js +0 -1
- package/lib/init-package/resources/config/wdio.conf.js +0 -1
- package/lib/init-package/resources/package-scripts.js +0 -11
- package/lib/init-package/resources/src/Assets.js +0 -5
- package/lib/init-package/resources/src/MyFirstComponent.hbs +0 -1
- package/lib/init-package/resources/src/MyFirstComponent.js +0 -56
- package/lib/init-package/resources/src/i18n/messagebundle.properties +0 -2
- package/lib/init-package/resources/src/i18n/messagebundle_de.properties +0 -1
- package/lib/init-package/resources/src/i18n/messagebundle_en.properties +0 -1
- package/lib/init-package/resources/src/i18n/messagebundle_es.properties +0 -1
- package/lib/init-package/resources/src/i18n/messagebundle_fr.properties +0 -1
- package/lib/init-package/resources/src/themes/MyFirstComponent.css +0 -11
- package/lib/init-package/resources/src/themes/sap_belize/parameters-bundle.css +0 -3
- package/lib/init-package/resources/src/themes/sap_belize_hcb/parameters-bundle.css +0 -3
- package/lib/init-package/resources/src/themes/sap_belize_hcw/parameters-bundle.css +0 -3
- package/lib/init-package/resources/src/themes/sap_fiori_3/parameters-bundle.css +0 -3
- package/lib/init-package/resources/src/themes/sap_fiori_3_dark/parameters-bundle.css +0 -3
- package/lib/init-package/resources/src/themes/sap_fiori_3_hcb/parameters-bundle.css +0 -3
- package/lib/init-package/resources/src/themes/sap_fiori_3_hcw/parameters-bundle.css +0 -3
- package/lib/init-package/resources/test/pages/index.html +0 -56
- package/lib/init-package/resources/test/specs/Demo.spec.js +0 -12
- package/package-lock.json +0 -48
package/lib/i18n/toJSON.js
CHANGED
@@ -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
|
-
|
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.
|
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
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
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
|
});
|
package/lib/jsdoc/config.json
CHANGED
@@ -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,
|
package/lib/jsdoc/plugin.js
CHANGED
@@ -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
|
-
|
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 {
|
9
|
+
return `import { registerThemePropertiesLoader } from "@ui5/webcomponents-base/dist/asset-registries/Themes.js";
|
11
10
|
|
12
|
-
import defaultThemeBase from "@ui5/webcomponents-
|
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
|
-
|
16
|
-
|
14
|
+
registerThemePropertiesLoader("@ui5/webcomponents-theming", "${DEFAULT_THEME}", () => defaultThemeBase);
|
15
|
+
registerThemePropertiesLoader("${packageName}", "${DEFAULT_THEME}", () => defaultTheme);
|
17
16
|
`;
|
18
17
|
};
|
19
18
|
|
@@ -25,18 +24,34 @@ const proccessCSS = css => {
|
|
25
24
|
return JSON.stringify(css);
|
26
25
|
}
|
27
26
|
|
28
|
-
module.exports =
|
27
|
+
module.exports = function (opts) {
|
29
28
|
opts = opts || {};
|
30
29
|
|
31
|
-
return
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
30
|
+
return {
|
31
|
+
postcssPlugin: 'postcss-css-to-esm',
|
32
|
+
Once (root) {
|
33
|
+
let css = root.toString();
|
34
|
+
css = proccessCSS(css);
|
35
|
+
|
36
|
+
const targetFile = root.source.input.from.replace(`/${opts.toReplace}/`, "/dist/generated/").replace(`\\${opts.toReplace}\\`, "\\dist\\generated\\");
|
37
|
+
mkdirp.sync(path.dirname(targetFile));
|
38
|
+
|
39
|
+
const filePath = `${targetFile}.js`;
|
40
|
+
const defaultTheme = opts.includeDefaultTheme ? getDefaultThemeCode(opts.packageName) : ``;
|
41
|
+
|
42
|
+
// it seems slower to read the old content, but writing the same content with no real changes
|
43
|
+
// (as in initial build and then watch mode) will cause an unnecessary dev server refresh
|
44
|
+
let oldContent = "";
|
45
|
+
try {
|
46
|
+
oldContent = fs.readFileSync(filePath).toString();
|
47
|
+
} catch (e) {
|
48
|
+
// file not found
|
49
|
+
}
|
50
|
+
const content = `${defaultTheme}export default {packageName:"${opts.packageName}",fileName:"${targetFile.substr(targetFile.lastIndexOf("themes"))}",content:${css}}`
|
51
|
+
if (content !== oldContent) {
|
52
|
+
fs.writeFileSync(filePath, content);
|
53
|
+
}
|
54
|
+
}
|
55
|
+
};
|
56
|
+
};
|
57
|
+
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,38 @@ const proccessCSS = css => {
|
|
11
10
|
return css;
|
12
11
|
}
|
13
12
|
|
14
|
-
module.exports =
|
13
|
+
module.exports = function (opts) {
|
15
14
|
opts = opts || {};
|
16
15
|
|
17
|
-
return
|
18
|
-
|
19
|
-
|
16
|
+
return {
|
17
|
+
postcssPlugin: 'postcss-css-to-json',
|
18
|
+
Once (root) {
|
19
|
+
let css = root.toString();
|
20
|
+
css = proccessCSS(css);
|
20
21
|
|
21
|
-
|
22
|
-
|
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
|
-
|
25
|
-
|
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
|
+
// it seems slower to read the old content, but writing the same content with no real changes
|
32
|
+
// (as in initial build and then watch mode) will cause an unnecessary dev server refresh
|
33
|
+
let oldContent = "";
|
34
|
+
try {
|
35
|
+
oldContent = fs.readFileSync(filePath).toString();
|
36
|
+
} catch (e) {
|
37
|
+
// file not found
|
38
|
+
}
|
39
|
+
const content = JSON.stringify({_: data});
|
40
|
+
if (content !== oldContent) {
|
41
|
+
fs.writeFileSync(filePath, content);
|
42
|
+
}
|
43
|
+
}
|
44
|
+
};
|
45
|
+
};
|
46
|
+
|
47
|
+
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,14 @@
|
|
1
|
+
import 'zx/globals';
|
2
|
+
|
3
|
+
// don't print executed commands and their output
|
4
|
+
$.verbose = false;
|
5
|
+
|
6
|
+
const inputFiles = await globby("src/**/parameters-bundle.css");
|
7
|
+
|
8
|
+
const restArgs = process.argv.slice(2);
|
9
|
+
|
10
|
+
// run all postcss processes in parallel as passing the glob directly to postcss makes them processed sequentially.
|
11
|
+
// and the amount of imports give a big speed up when run in parallel
|
12
|
+
await Promise.all(inputFiles.map(file => {
|
13
|
+
return $`postcss ${file} --config config/postcss.themes --base src --dir dist/css/ ${restArgs}`;
|
14
|
+
}));
|
@@ -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
|
+
});
|
package/lib/scoping/lint-src.js
CHANGED
@@ -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(`(^|[
|
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
|
});
|
@@ -0,0 +1,65 @@
|
|
1
|
+
const fs = require("fs");
|
2
|
+
const glob = require("glob");
|
3
|
+
const path = require("path");
|
4
|
+
const process = require("process");
|
5
|
+
|
6
|
+
const projectPath = process.argv[2];
|
7
|
+
|
8
|
+
// gather all tags from all files
|
9
|
+
const tagsToFiles = new Map();
|
10
|
+
const filesToTags = new Map();
|
11
|
+
|
12
|
+
let files = [
|
13
|
+
...glob.sync(path.join("packages/main/src/**/*.js")),
|
14
|
+
...glob.sync(path.join("packages/fiori/src/**/*.js")),
|
15
|
+
];
|
16
|
+
files.forEach(file => {
|
17
|
+
let matches = file.match(/([a-zA-Z0-9_]+)\.js$/);
|
18
|
+
const name = matches[1];
|
19
|
+
|
20
|
+
const content = `${fs.readFileSync(file)}`;
|
21
|
+
matches = content.match(/tag: "(.*?)",/);
|
22
|
+
if (matches) {
|
23
|
+
const tag = matches[1];
|
24
|
+
tagsToFiles.set(tag, name);
|
25
|
+
filesToTags.set(name, tag);
|
26
|
+
}
|
27
|
+
});
|
28
|
+
|
29
|
+
// Process the package
|
30
|
+
files = glob.sync(path.join(projectPath, "src/**/*.js"));
|
31
|
+
tagsToFiles.forEach((file, tag) => {
|
32
|
+
const sourcePath = path.join(projectPath, "src/", `${file}.js`);
|
33
|
+
if (!fs.existsSync(sourcePath)) {
|
34
|
+
return;
|
35
|
+
}
|
36
|
+
const sourceContent = `${fs.readFileSync(sourcePath)}`.split("\n").join(" ");
|
37
|
+
|
38
|
+
const hbsPath = path.join(projectPath, "src/", `${file}.hbs`);
|
39
|
+
const hbsContent = fs.existsSync(hbsPath) ? `${fs.readFileSync(hbsPath)}` : "";
|
40
|
+
|
41
|
+
const hbsPopoverPath = path.join(projectPath, "src/", `${file}Popover.hbs`);
|
42
|
+
const hbsPopoverContent = fs.existsSync(hbsPopoverPath) ? `${fs.readFileSync(hbsPopoverPath)}` : "";
|
43
|
+
|
44
|
+
// deps
|
45
|
+
let deps = [];
|
46
|
+
let matches = sourceContent.match(/static get dependencies\(\) \{\s+return \[(.*?)\]/);
|
47
|
+
if (matches) {
|
48
|
+
deps = matches[1].split(",").map(x => x.trim()).filter(x => !!x);
|
49
|
+
}
|
50
|
+
|
51
|
+
// tags
|
52
|
+
matches = [
|
53
|
+
...hbsContent.matchAll(/<ui5-[a-z0-9-]+/g),
|
54
|
+
...hbsPopoverContent.matchAll(/<ui5-[a-z0-9-]+/g),
|
55
|
+
];
|
56
|
+
if (matches) {
|
57
|
+
matches.forEach(match => {
|
58
|
+
const tagUsed = match[0].substr(1);
|
59
|
+
const dep = tagsToFiles.get(tagUsed);
|
60
|
+
if (!deps.includes(dep)) {
|
61
|
+
console.log(`${file} used ${tagUsed}`);
|
62
|
+
}
|
63
|
+
});
|
64
|
+
}
|
65
|
+
});
|
@@ -0,0 +1,28 @@
|
|
1
|
+
const fs = require("fs");
|
2
|
+
const glob = require("glob");
|
3
|
+
const path = require("path");
|
4
|
+
const process = require("process");
|
5
|
+
|
6
|
+
// gather all tags from all files
|
7
|
+
const tags = new Set();
|
8
|
+
const files = glob.sync(path.join(process.argv[2], "src/**/*.js"));
|
9
|
+
files.forEach(file => {
|
10
|
+
const content = `${fs.readFileSync(file)}`;
|
11
|
+
const matches = content.match(/tag: "(.*?)",/);
|
12
|
+
if (matches) {
|
13
|
+
tags.add(matches[1]);
|
14
|
+
}
|
15
|
+
});
|
16
|
+
|
17
|
+
// report all usages of any tag within any file, which is not the tag definition and is not hasAttribute
|
18
|
+
files.forEach(file => {
|
19
|
+
const content = `${fs.readFileSync(file)}`;
|
20
|
+
const lines = content.split("\n");
|
21
|
+
lines.forEach(line => {
|
22
|
+
tags.forEach(tag => {
|
23
|
+
if (line.includes(`"${tag}"`) && !line.includes(`tag: "${tag}",`) && !line.includes(`hasAttribute("${tag}")`)) {
|
24
|
+
console.log(`${file}: ${line.trim()}`);
|
25
|
+
}
|
26
|
+
});
|
27
|
+
});
|
28
|
+
});
|
@@ -27,7 +27,7 @@ const replaceTagsAny = content => {
|
|
27
27
|
// Replace bundle names and HTML tag names in test pages
|
28
28
|
glob.sync(path.join(root, "/**/*.html")).forEach(file => {
|
29
29
|
let content = String(fs.readFileSync(file));
|
30
|
-
content = content.replace(/bundle\.(.*?)\.js/g,
|
30
|
+
content = content.replace(/bundle\.(.*?)\.js/g, `../bundle.scoped.$1.js`);
|
31
31
|
content = replaceTagsHTML(content);
|
32
32
|
fs.writeFileSync(file, content);
|
33
33
|
});
|