Skip to content

Commit

Permalink
Fix dependency versions of npm packages (#346)
Browse files Browse the repository at this point in the history
- Check in `package-lock.json` files to fix dependencies of Node-based
apps.
- Use `moduleLookupDirectories` to find `@sap/cds-mtxs` modules from
`mtx/sidecar`
- Use `@sap/cds-dk` with `npx --package` in cds-maven-plugin goals
- Delete `package.json` in root directory.
  • Loading branch information
beckermarc authored Jul 22, 2024
1 parent f0ecebd commit ad8222a
Show file tree
Hide file tree
Showing 13 changed files with 4,184 additions and 33 deletions.
5 changes: 4 additions & 1 deletion .cdsrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@
"extensibility": true,
"toggles": true
},
"profile": "with-mtx-sidecar"
"profile": "with-mtx-sidecar",
"cdsc": {
"moduleLookupDirectories": [ "node_modules/", "target/cds/", "mtx/sidecar/node_modules/" ]
}
}
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ target/

node/
node_modules/
package-lock.json

.mta/
*.mtar
Expand All @@ -32,9 +31,9 @@ hs_err*
.DS_Store

*.db
*.sqlite
*.sqlite*

.cdsrc-private.json

/chart/
.reloadtrigger
.reloadtrigger
4 changes: 2 additions & 2 deletions app/fiori.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
};
</script>

<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.123.2/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.123.2/resources/sap-ui-core.js"
<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.124.2/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.124.2/resources/sap-ui-core.js"
data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
data-sap-ui-compatVersion="edge"
data-sap-ui-theme="sap_horizon"
Expand Down
Loading

0 comments on commit ad8222a

Please sign in to comment.