@sap/cds-dk 6.4.0 → 6.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "6.4.0",
+  "version": "6.5.0",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [
@@ -18,13 +18,11 @@
   "dependencies": {
     "@sap/cds": "^6.4.0",
     "@sap/cds-foss": "^4",
+    "@sap/cds-mtxs": "^1.4.3",
     "@sap/eslint-plugin-cds": "^2.6.0",
     "axios": ">=0.21",
-    "connect-livereload": "^0.6.1",
     "eslint": "^8",
     "express": "^4.17.1",
-    "glob": "^8.0.3",
-    "htmlparser2": "^8.0.0",
     "livereload-js": "^3.3.1",
     "md5": "^2.3.0",
     "mustache": "^4.0.1",
@@ -34,7 +32,6 @@
     "xml-js": "^1.6.11"
   },
   "optionalDependencies": {
-    "@sap/cds-mtxs": "^1.4.0",
     "sqlite3": "^5.0.4"
   },
   "files": [

package/lib/init/template/hana/files/hana-deployer-job.yaml

@@ -1,49 +0,0 @@
-#
-# HANA single-tenant DB deployment
-#
-{{- if .Values.hana_deployer }}
-  {{- if or (not (hasKey .Values.hana_deployer "enabled")) .Values.hana_deployer.enabled }}
-{{- $ := merge (dict "root" . "name" "hana-deployer") .Values.hana_deployer . }}
-{{- template "cap.expect" (list . "hana_deployer.bindings.hana.fromSecret" "hana_deployer.image.repository") }}
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ .Release.Name }}-hana-deployer
-  labels: {{- include "cap.labels" $ | nindent 4 }}
-  annotations:
-    "helm.sh/hook": "post-install,pre-upgrade"
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
-  namespace: {{ .Release.Namespace }}
-spec:
-  backoffLimit: 4
-  template:
-    metadata:
-      labels:
-        {{- include "cap.labels" $ | nindent 8 }}
-        sidecar.istio.io/inject: "false"
-    spec:
-      restartPolicy: Never
-      {{- include "cap.imagePullSecrets" $ | nindent 6 }}
-      volumes:
-        {{- include "cap.sapcp.bindingsVolumes" $ | nindent 10 }}
-      containers:
-      - name: hana-deployer
-        image: {{ include "cap.image" $ }}
-        imagePullPolicy: {{ include "cap.imagePullPolicy" $ }}
-        env:
-        {{- range $k, $v := .Values.hana_deployer.env }}
-        - name: {{ $k }}
-          value: {{ $v | quote }}
-        {{- end }}
-        - name: SERVICE_BINDING_ROOT
-          value: /bindings
-        - name: EXIT
-          value: 'true'
-        volumeMounts:
-          {{- include "cap.sapcp.bindingsVolumeMounts" $ | nindent 10 }}
-        resources:
-          {{- toYaml .Values.hana_deployer.resources | nindent 10 }}
----
-{{ include "cap.sapcp.bindings" $ }}
-{{ end }}
-{{ end }}

package/lib/init/template/html5-repo/files/_html5_deployment_helpers.tpl

@@ -1,16 +0,0 @@
-{{/*
-Backend Destinations
-*/}}
-{{- define "cap.backendDestinations" -}}
-{{- $ := . -}}
-{{- $destinations := list -}}
-{{- range $destinationName, $destination := .backendDestinations -}}
-    {{- $destination := merge (dict "name" $destinationName) $destination -}}
-    {{- $deployment := (get $.root.Values $destination.service) -}}
-    {{- $srv := merge (dict "name" $destination.service "destination" $destination "deployment" $deployment) $.root -}}
-    {{- $destinationHost := include "cap.deploymentHost" $srv -}}
-    {{- $currentDestination := dict "Name" $destination.name "Type" "HTTP" "ProxyType" "Internet" "URL" (print  "https://" $destinationHost "." $.root.Values.global.domain ($destination.path | default "")) "Authentication" "NoAuthentication" "sap.cloud.service" $.cloudService "HTML5.forwardAuthToken" "true" -}}
-    {{- $destinations = (append $destinations $currentDestination) -}}
-{{- end -}}
-{{- $destinations | toJson }}
-{{- end -}}

package/lib/init/template/html5-repo/files/html5-apps-deployer-job.yaml

@@ -1,61 +0,0 @@
-{{- if .Values.html5_apps_deployer }}
-  {{- if or (not (hasKey .Values.html5_apps_deployer "enabled")) .Values.html5_apps_deployer.enabled }}
-
-{{- $ := merge (dict "root" . "name" "html5-apps-deployer") .Values.html5_apps_deployer . }}
-{{- if $.backendDestinations }}
-  {{- if not (.Values.destination.parameters.HTML5Runtime_enabled) }}
-    {{- fail "destinations.parameters.HTML5Runtime_enabled must be set to true for use with Launchpad Service" }}
-  {{- end }}
-{{- end }}
-{{- template "cap.expect" (list . "html5_apps_deployer.image.repository") }}
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ .Release.Name }}-html5-apps-deployer
-  namespace: {{ .Release.Namespace }}
-  labels: {{- include "cap.labels" $ | nindent 4 }}
-  annotations:
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
-spec:
-  backoffLimit: 4
-  template:
-    metadata:
-      labels:
-        {{- include "cap.labels" $ | nindent 8 }}
-        sidecar.istio.io/inject: "false"
-    spec:
-      {{- include "cap.imagePullSecrets" $ | nindent 6 }}
-      restartPolicy: Never
-      volumes:
-        {{- include "cap.sapcp.bindingsVolumes" $ | nindent 10 }}
-      containers:
-      - name: html5-deployer
-        image: {{ include "cap.image" $ }}
-        imagePullPolicy: {{ include "cap.imagePullPolicy" $ }}
-        volumeMounts:
-          {{- include "cap.sapcp.bindingsVolumeMounts" $ | nindent 10 }}
-        resources:
-          {{- toYaml .Values.html5_apps_deployer.resources | nindent 10 }}
-        env:
-          {{- range $k, $v := .Values.html5_apps_deployer.env }}
-          - name: {{ $k }}
-            value: {{ $v | quote }}
-          {{- end }}
-          - name: SERVICE_BINDING_ROOT
-            value: /bindings
-          - name: EXIT_PROCESS_AFTER_UPLOAD
-            value: "true"
-          - name: PORT
-            value: "5000"
-            # TODO: cloud service should be configurable in the HTML5 apps
-          - name: SAP_CLOUD_SERVICE
-            value: {{ $.cloudService }}
-            # TODO: destination name should be configurable in the HTML5 apps
-          - name: BACKEND_DESTINATIONS
-            value: >
-              {{ include "cap.backendDestinations" $ }}
----
-{{ include "cap.sapcp.bindings" $ }}
-  {{- end }}
-{{- end }}

package/lib/init/util/spinner.js

@@ -1,80 +0,0 @@
-
-const SPINNER_THEMES = {
-    spin: ['—', '\\', '|', '/'],
-    bounce: ['_', '—', '‾', '—', '/', '|', '/', '—'],
-    balloon: ['o', 'O']
-}
-
-const RENDER_DELAY = 1000;
-
-const ESC_SEQ = '\u001B[';
-const HIDE_CURSOR = ESC_SEQ + '?25l';
-const SHOW_CURSOR = ESC_SEQ + '?25h';
-const MOVE_CURSOR_UP = ESC_SEQ + '1A';
-const ERASE_LINE = ESC_SEQ + 'K';
-// const MOVE_CURSOR_START = '\r';
-// const SAVE_CURSOR = ESC_SEQ + 's';
-// const RESTORE_CURSOR = ESC_SEQ + 'u';
-
-const LOG = console
-const DEBUG = /\bcli\b/.test(process.env.DEBUG) && LOG.debug
-
-class Spinner {
-    constructor(theme = Spinner.THEME_SPIN, initialDelay = 1000) {
-        this.theme = theme;
-        this.initialDelay = initialDelay;
-    }
-
-    static get THEME_RANDOM() {
-        const keys = Object.keys(SPINNER_THEMES);
-        const idx = Math.round(Math.random() * (keys.length - 1));
-        return keys[idx];
-    }
-
-    async run(msg, cb, postfix = '') {
-        try {
-            this._start(msg);
-            // use return await to catch errors here
-            return await cb();
-        } finally {
-            this._stop(msg, postfix);
-        }
-    }
-
-    _start(msg) {
-        if (!DEBUG && process.stdout.isTTY) {
-            LOG.info(msg + HIDE_CURSOR + ERASE_LINE + MOVE_CURSOR_UP);
-            this.timeoutId = setTimeout(() => {
-                let idx = 0;
-                this.intervalId = setInterval(() => {
-                    LOG.info(msg + ' ' + SPINNER_THEMES[this.theme][idx] + ERASE_LINE + MOVE_CURSOR_UP);
-                    idx = (idx + 1) % SPINNER_THEMES[this.theme].length;
-                }, RENDER_DELAY);
-            }, this.initialDelay);
-        } else {
-            LOG.info(msg);
-        }
-    }
-
-    _stop(msg, postfix) {
-        if (!DEBUG && process.stdout.isTTY) {
-            if (this.timeoutId) {
-                clearTimeout(this.timeoutId);
-                this.timeoutId = null;
-            }
-
-            if (this.intervalId) {
-                clearInterval(this.intervalId);
-                this.intervalId = null;
-            }
-
-            LOG.info(SHOW_CURSOR + msg + ' ' + postfix + ERASE_LINE);
-        }
-    }
-}
-
-Spinner.THEME_SPIN = 'spin';
-Spinner.THEME_BOUNCE = 'bounce';
-Spinner.THEME_BALLOON = 'balloon';
-
-module.exports = Spinner;