Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update locate-reuse-lib.js ui5 linter issues #2334

Merged
merged 20 commits into from
Nov 5, 2024
Merged

Update locate-reuse-lib.js ui5 linter issues #2334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
32697ed
Update locate-reuse-lib.js
devinea Sep 6, 2024
513bc12
update snapshots
devinea Sep 6, 2024
c5ac674
Merge branch 'main' into ui5_lint_issues_locate_reuse_libs
devinea Sep 6, 2024
99c6871
Add linter to other modules
devinea Sep 6, 2024
8688ac4
Merge remote-tracking branch 'origin/ui5_lint_issues_locate_reuse_lib…
devinea Sep 6, 2024
08cb99b
Merge remote-tracking branch 'origin/main' into ui5_lint_issues_locat…
devinea Sep 6, 2024
de0fdc8
Merge remote-tracking branch 'origin/main' into ui5_lint_issues_locat…
devinea Oct 30, 2024
1876fca
further updates to support GTE and LT UI5 1.120.x
devinea Oct 30, 2024
ca3549d
Update FF with locate reuse libs
devinea Oct 30, 2024
3466b77
fixes
devinea Oct 30, 2024
1c56cc5
lint fixes
devinea Oct 30, 2024
3d08d49
Update logic on FF project checks
devinea Nov 1, 2024
cf25797
Merge remote-tracking branch 'origin/main' into ui5_lint_issues_locat…
devinea Nov 1, 2024
818e8c7
fix
devinea Nov 1, 2024
1441cc1
fixes
devinea Nov 4, 2024
a2e81ef
reformat projectChecks
devinea Nov 4, 2024
efafbbe
Merge remote-tracking branch 'origin/main' into ui5_lint_issues_locat…
devinea Nov 4, 2024
f8d1a7b
fix ui5 linter errors in locate-reuse-libs.js
devinea Nov 4, 2024
b460789
Create sixty-dolls-allow.md
devinea Nov 4, 2024
fe74f6a
Merge branch 'main' into ui5_lint_issues_locate_reuse_libs
devinea Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/sixty-dolls-allow.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@sap-ux/fiori-freestyle-writer": patch
"@sap-ux/ui5-application-writer": patch
---

Fix @ui5/linter errors in locate-reuse-lib.js
56 changes: 29 additions & 27 deletions packages/fiori-elements-writer/test/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,37 +165,39 @@ export const projectChecks = async (
config: FioriElementsApp<unknown>,
debugFull = false
): Promise<void> => {
if (debugFull && (config.appOptions?.typescript ?? config.appOptions?.eslint)) {
// Do additonal checks on generated projects
const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
let npmResult;
try {
// Do npm install
npmResult = await exec(`${npm} install`, { cwd: rootPath });
console.log('stdout:', npmResult.stdout);
console.log('stderr:', npmResult.stderr);

// run checks on the project
if (config.appOptions?.typescript && config.service?.type === ServiceType.EDMX) {
// Check TS Types
npmResult = await exec(`${npm} run ts-typecheck`, { cwd: rootPath });
// Do additional checks on generated projects
const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
let npmResult;
try {
if (debugFull) {
if (config.appOptions?.typescript ?? config.appOptions?.eslint) {
// Do npm install
npmResult = await exec(`${npm} install`, { cwd: rootPath });
console.log('stdout:', npmResult.stdout);
console.log('stderr:', npmResult.stderr);

// run checks on the project
if (config.appOptions?.typescript && config.service?.type === ServiceType.EDMX) {
// Check TS Types
npmResult = await exec(`${npm} run ts-typecheck`, { cwd: rootPath });
console.log('stdout:', npmResult.stdout);
console.log('stderr:', npmResult.stderr);
// Check Eslint
npmResult = await exec(`${npm} run lint`, { cwd: rootPath });
console.log('stdout:', npmResult.stdout);
console.log('stderr:', npmResult.stderr);
}
// Check Eslint
npmResult = await exec(`${npm} run lint`, { cwd: rootPath });
console.log('stdout:', npmResult.stdout);
console.log('stderr:', npmResult.stderr);
}
// Check Eslint
if (config.appOptions?.eslint) {
npmResult = await exec(`${npm} run lint`, { cwd: rootPath });
console.log('stdout:', npmResult.stdout);
console.log('stderr:', npmResult.stderr);
if (config.appOptions?.eslint) {
npmResult = await exec(`${npm} run lint`, { cwd: rootPath });
console.log('stdout:', npmResult.stdout);
console.log('stderr:', npmResult.stderr);
}
}
} catch (error) {
console.log('stdout:', error?.stdout);
console.log('stderr:', error?.stderr);
expect(error).toBeUndefined();
}
} catch (error) {
console.log('stdout:', error?.stdout);
console.log('stderr:', error?.stderr);
expect(error).toBeUndefined();
}
};
86 changes: 86 additions & 0 deletions packages/fiori-freestyle-writer/templates/common/add/1.120.0/webapp/test/flpSandbox.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<!DOCTYPE HTML>
<html lang="en">
<!-- Copyright (c) 2015 SAP AG, All Rights Reserved -->
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{{appTitle}}</title>

<!-- Bootstrap the unified shell in sandbox mode for standalone usage.

The renderer is specified in the global Unified Shell configuration object "sap-ushell-config".

The fiori2 renderer will render the shell header allowing, for instance,
testing of additional application setting buttons.

The navigation target resolution service is configured in a way that the empty URL hash is
resolved to our own application.

This example uses relative path references for the SAPUI5 resources and test-resources;
it might be necessary to adapt them depending on the target runtime platform.
The sandbox platform is restricted to development or demo use cases and must NOT be used
for productive scenarios.
-->
<script type="text/javascript">
window["sap-ushell-config"] = {
defaultRenderer: "fiori2",
bootstrapPlugins: {
"RuntimeAuthoringPlugin": {
component: "sap.ushell.plugins.rta",
config: {
validateAppVersion: false
}
}
},
renderers: {
fiori2: {
componentData: {
config: {
search: "hidden",
enableSearch: false
}
}
}
},
applications: {
"<%- app.flpAppId %>": {
title: "<%- escapeFLPText(app.title) %>",
description: "<%- escapeFLPText(app.description) %>",
additionalInformation: "SAPUI5.Component=<%- app.id %>",
applicationType: "URL",
url: "../"
}
}
};
</script>

<script src="<%- locals.uShellBootstrapResourceUrl %>" id="sap-ushell-bootstrap"></script>
<!-- Bootstrap the UI5 core library. 'data-sap-ui-frameOptions="allow"'' is a NON-SECURE setting for test environments -->
<script id="sap-ui-bootstrap"
src="<%- locals.uiBootstrapResourceUrl %>"
data-sap-ui-libs="<%- ui5.ui5Libs %>"
data-sap-ui-async="true"
data-sap-ui-preload="async"
data-sap-ui-theme="<%- ui5.ui5Theme %>"
data-sap-ui-compatVersion="edge"
data-sap-ui-language="en"
data-sap-ui-resourceroots='{"<%- app.id %>": "../"}'
data-sap-ui-frameOptions="allow"
data-sap-ui-flexibilityServices='[{"connector": "LocalStorageConnector"}]'>
</script><% if (appOptions.loadReuseLibs) { %>
<script id="locate-reuse-libs" src="./locate-reuse-libs.js" data-sap-ui-manifest-uri="../manifest.json">
</script><% } else { %>
<script>
sap.ui.getCore().attachInit(function () {
sap.ushell.Container.createRenderer().placeAt("content");
});
</script><% } %>
</head>

<!-- UI Content -->

<body class="sapUiBody" id="content">
</body>

</html>
Loading
Loading