You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2020/09/09 20:18:22 UTC

[incubator-streampipes] branch dev updated (62e0be4 -> a1d1c4d)

This is an automated email from the ASF dual-hosted git repository.

riemer pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.


    from 62e0be4  [STREAMPIPES-174] clean up requirements.txt
     new bf5e026  [hotfix] Add production environment for Angular
     new ec1cc16  [hotfix] Add angular environment config
     new a1d1c4d  Merge branch 'dev' of github.com:apache/incubator-streampipes into dev

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ui/angular.json                                             | 13 +++++++++++--
 ui/package.json                                             |  2 +-
 .../environment.prod.ts}                                    |  4 +++-
 .../environment.ts}                                         |  5 +++--
 ui/src/main.ts                                              | 11 +++++------
 5 files changed, 23 insertions(+), 12 deletions(-)
 copy ui/src/{app/add/dialogs/add-endpoint/add-endpoint.component.scss => environments/environment.prod.ts} (94%)
 copy ui/src/{app/app-transport-monitoring/model/parcel-metrics-event.model.ts => environments/environment.ts} (93%)


[incubator-streampipes] 02/03: [hotfix] Add angular environment config

Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git

commit ec1cc1614512cc179f0e99244de1b95beeb80206
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Mon Sep 7 23:03:57 2020 +0200

    [hotfix] Add angular environment config
---
 ui/angular.json | 13 +++++++++++--
 ui/src/main.ts  | 11 +++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ui/angular.json b/ui/angular.json
index 55b4477..556f339 100644
--- a/ui/angular.json
+++ b/ui/angular.json
@@ -17,7 +17,10 @@
             "main": "src/main.ts",
             "tsConfig": "src/tsconfig.app.json",
             "polyfills": "src/polyfills.ts",
-            "allowedCommonJsDependencies": ["lodash", "codemirror"],
+            "allowedCommonJsDependencies": [
+              "lodash",
+              "codemirror"
+            ],
             "assets": [
               "src/assets",
               {
@@ -42,6 +45,12 @@
           },
           "configurations": {
             "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
               "budgets": [
                 {
                   "type": "anyComponentStyle",
@@ -93,7 +102,7 @@
               "src/assets"
             ],
             "scripts": [
-              ]
+            ]
           }
         },
         "lint": {
diff --git a/ui/src/main.ts b/ui/src/main.ts
index 1feb465..1c1d563 100644
--- a/ui/src/main.ts
+++ b/ui/src/main.ts
@@ -17,14 +17,13 @@
  */
 
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-
+import { environment } from './environments/environment';
 import { AppModule } from './app/appng5.module';
+import { enableProdMode } from "@angular/core";
 
-// platformBrowserDynamic().bootstrapModule(AppModule).then(platformRef => {
-//     const url: UrlService = platformRef.injector.get(UrlService);
-//     url.listen();
-//     url.sync();
-// });
+if (environment.production) {
+    enableProdMode();
+}
 
 platformBrowserDynamic().bootstrapModule(AppModule)
     .catch(err => console.error(err));
\ No newline at end of file


[incubator-streampipes] 01/03: [hotfix] Add production environment for Angular

Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git

commit bf5e0266d9b69664493cac2a16a6347efcdfdf2d
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Wed Sep 9 21:12:41 2020 +0200

    [hotfix] Add production environment for Angular
---
 ui/package.json                         |  2 +-
 ui/src/environments/environment.prod.ts | 21 +++++++++++++++++++++
 ui/src/environments/environment.ts      | 22 ++++++++++++++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/ui/package.json b/ui/package.json
index 9ddb7a7..8a7843f 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -11,7 +11,7 @@
     "start": "node ./deployment/prebuild.js && ng serve",
     "watchtest": "node ./deployment/prebuild.js && karma start ./karma.conf.js --no-auto-watch --single-run",
     "test": "node ./deployment/prebuild.js && karma start ./karma.conf.js",
-    "build": "node ./deployment/prebuild.js && set NODE_OPTIONS=--max-old-space-size=10192 && ng build --prod --stats-json",
+    "build": "node ./deployment/prebuild.js && set NODE_OPTIONS=--max-old-space-size=10192 && ng build --prod",
     "build-rc": "node ./deployment/prebuild.js rel && set NODE_OPTIONS=--max-old-space-size=10192 && ng build --prod",
     "lint": "tslint -c tslint.json 'src/**/*.ts*",
     "analyze": "webpack-bundle-analyzer dist/stats.json"
diff --git a/ui/src/environments/environment.prod.ts b/ui/src/environments/environment.prod.ts
new file mode 100644
index 0000000..f907cd5
--- /dev/null
+++ b/ui/src/environments/environment.prod.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+export const environment = {
+  production: true
+};
diff --git a/ui/src/environments/environment.ts b/ui/src/environments/environment.ts
new file mode 100644
index 0000000..c3570e5
--- /dev/null
+++ b/ui/src/environments/environment.ts
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+export const environment = {
+  production: false
+};
+


[incubator-streampipes] 03/03: Merge branch 'dev' of github.com:apache/incubator-streampipes into dev

Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git

commit a1d1c4de08e1967ea18b0cda07d35b42863b92b4
Merge: ec1cc16 62e0be4
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Mon Sep 7 23:15:11 2020 +0200

    Merge branch 'dev' of github.com:apache/incubator-streampipes into dev

 streampipes-wrapper-python/requirements.txt | 2 --
 1 file changed, 2 deletions(-)