app-config: merged dev config back into main config

app-config.development.yaml

@@ -1,13 +0,0 @@
-app:
-  baseUrl: http://localhost:3000
-
-backend:
-  baseUrl: http://localhost:7000
-  listen:
-    port: 7000
-  cors:
-    origin: http://localhost:3000
-    methods: [GET, POST, PUT, DELETE]
-    credentials: true
-  csp:
-    connect-src: ["'self'", 'http:', 'https:']

app-config.yaml

@@ -1,6 +1,6 @@
 app:
   title: Backstage Example App
-  baseUrl: http://localhost:7000
+  baseUrl: http://localhost:3000
   googleAnalyticsTrackingId: # UA-000000-0
 
 backend:
@@ -10,8 +10,12 @@ backend:
   database:
     client: sqlite3
     connection: ':memory:'
+  cors:
+    origin: http://localhost:3000
+    methods: [GET, POST, PUT, DELETE]
+    credentials: true
   csp:
-    connect-src: ["'self'", 'https:']
+    connect-src: ["'self'", 'http:', 'https:']
 
 # See README.md in the proxy-backend plugin for information on the configuration format
 proxy:

packages/create-app/templates/default-app/app-config.development.yaml

@@ -1,13 +0,0 @@
-app:
-  baseUrl: http://localhost:3000
-
-backend:
-  baseUrl: http://localhost:7000
-  listen:
-    port: 7000
-  cors:
-    origin: http://localhost:3000
-    methods: [GET, POST, PUT, DELETE]
-    credentials: true
-  csp:
-    connect-src: ["'self'", 'http:', 'https:']

packages/create-app/templates/default-app/app-config.yaml.hbs

@@ -1,6 +1,6 @@
 app:
   title: Scaffolded Backstage App
-  baseUrl: http://localhost:7000
+  baseUrl: http://localhost:3000
 
 organization:
   name: My Company
@@ -10,7 +10,11 @@ backend:
   listen:
     port: 7000
   csp:
-    connect-src: ["'self'", 'https:']
+    connect-src: ["'self'", 'http:', 'https:']
+  cors:
+    origin: http://localhost:3000
+    methods: [GET, POST, PUT, DELETE]
+    credentials: true
   {{#if dbTypeSqlite}}
   database:
     client: sqlite3