fix(express-engine): modify dist directories to provide consistent access (#1082)

Author: CaerusKaru

modules/express-engine/schematics/install/files/root/__serverFileName@stripTsExtension__.ts

@@ -16,10 +16,10 @@ enableProdMode();
 const app = express();
 
 const PORT = process.env.PORT || <%= serverPort %>;
-const DIST_FOLDER = join(process.cwd(), 'dist');
+const DIST_FOLDER = join(process.cwd(), '<%= getBrowserDistDirectory() %>');
 
 // * NOTE :: leave this as require() since this file is built Dynamically from webpack
-const {AppServerModuleNgFactory, LAZY_MODULE_MAP} = require('./<%= clientProject %>-server/main');
+const {AppServerModuleNgFactory, LAZY_MODULE_MAP} = require('./<%= getServerDistDirectory() %>/main');
 
 // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
 app.engine('html', ngExpressEngine({
@@ -30,12 +30,12 @@ app.engine('html', ngExpressEngine({
 }));
 
 app.set('view engine', 'html');
-app.set('views', join(DIST_FOLDER, '<%= clientProject %>'));
+app.set('views', DIST_FOLDER);
 
 // Example Express Rest API endpoints
 // app.get('/api/**', (req, res) => { });
 // Server static files from /browser
-app.get('*.*', express.static(join(DIST_FOLDER, '<%= clientProject %>'), {
+app.get('*.*', express.static(DIST_FOLDER, {
   maxAge: '1y'
 }));
 

modules/express-engine/schematics/install/index.ts

@@ -28,6 +28,9 @@ import {
   NodeDependencyType,
 } from '@schematics/angular/utility/dependencies';
 
+// TODO(CaerusKaru): make these configurable
+const BROWSER_DIST = 'dist/browser';
+const SERVER_DIST = 'dist/server';
 
 function getClientProject(
   host: Tree, options: UniversalOptions,
@@ -126,6 +129,10 @@ function updateConfigFile(options: UniversalOptions): Rule {
     }
 
     clientProject.architect.server.configurations = serverConfig;
+    // TODO(CaerusKaru): make this configurable
+    clientProject.architect.server.options.outputPath = SERVER_DIST;
+    // TODO(CaerusKaru): make this configurable
+    clientProject.architect.build.options.outputPath = BROWSER_DIST;
 
     const workspacePath = getWorkspacePath(host);
 
@@ -153,7 +160,9 @@ export default function (options: UniversalOptions): Rule {
       template({
         ...strings,
         ...options as object,
-        stripTsExtension: (s: string) => { return s.replace(/\.ts$/, ''); }
+        stripTsExtension: (s: string) => s.replace(/\.ts$/, ''),
+        getBrowserDistDirectory: () => BROWSER_DIST,
+        getServerDistDirectory: () => SERVER_DIST,
       })
     ]);
 

package.json

@@ -72,8 +72,8 @@
     "test:watch": "ibazel test //..."
   },
   "devDependencies": {
-    "@angular-devkit/core": "^0.7.3",
-    "@angular-devkit/schematics": "^0.7.3",
+    "@angular-devkit/core": "^0.7.5",
+    "@angular-devkit/schematics": "^0.7.5",
     "@angular/animations": "6.0.4",
     "@angular/bazel": "6.0.4",
     "@angular/common": "6.0.4",
@@ -87,7 +87,7 @@
     "@angular/router": "6.0.4",
     "@angular/upgrade": "6.0.4",
     "@bazel/ibazel": "^0.3.1",
-    "@schematics/angular": "^0.7.3",
+    "@schematics/angular": "^0.7.5",
     "@types/express": "^4.0.39",
     "@types/fs-extra": "^4.0.5",
     "@types/hapi": "^17.0.12",

yarn.lock

@@ -2,22 +2,22 @@
 # yarn lockfile v1
 
 
-"@angular-devkit/core@0.7.3", "@angular-devkit/core@^0.7.3":
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.7.3.tgz#a18f7b922390503b5226b3d64c4c54fb43ad15e2"
-  integrity sha512-2fKNmv4sJ6EEONp6QJ2VcHlR0O2TAXWm6jQsWxJjfVvROhAY7eJkzhqi0pUoWhUiamxCk5ssl8p9KkhtOiTa4Q==
+"@angular-devkit/core@0.7.5", "@angular-devkit/core@^0.7.5":
+  version "0.7.5"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.7.5.tgz#49f7854ccadf3ddda8d0ea4359543a1cbdc6854d"
+  integrity sha512-r99BZvvuNAqSRm05jXfx0sb3Ip0zvHPtAM6NReXzWPoqaVFpjVUdj/CKA+9HWG/Zt9meG9pEQt/HKK8UXaZDVA==
   dependencies:
     ajv "~6.4.0"
     chokidar "^2.0.3"
     rxjs "^6.0.0"
     source-map "^0.5.6"
 
-"@angular-devkit/schematics@0.7.3", "@angular-devkit/schematics@^0.7.3":
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.7.3.tgz#49dc93d55246814924e19db37dae43867ed563ea"
-  integrity sha512-OqZ9qzxDxEqAxV8n4uoq8IeSU+a2GN82z2N3a7z5nNxV6zfJo6K/33SLDuagGFSZfOUuP+35qaR+rHzSzByRig==
+"@angular-devkit/schematics@0.7.5", "@angular-devkit/schematics@^0.7.5":
+  version "0.7.5"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.7.5.tgz#f46b121f29cb40ad6095285d27a515114a56c5d6"
+  integrity sha512-E7HkQeJawUskf2gPnogMc+cTdjJ2Iv3QEZOgprh/ExEmBYByWkGDRX5fQOuy8wME8VZqUBvQACZaVkEredn5EA==
   dependencies:
-    "@angular-devkit/core" "0.7.3"
+    "@angular-devkit/core" "0.7.5"
     rxjs "^6.0.0"
 
 "@angular/animations@6.0.4":
@@ -127,13 +127,13 @@
     tsickle "0.25.x"
     tsutils "2.20.0"
 
-"@schematics/angular@^0.7.3":
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.7.3.tgz#d4a33a78b152bded557efddba4616a8fafa9ae24"
-  integrity sha512-L5n9QGWho/SdNAZjw1im3bfNWdkLAJTW0sye9i3rCHM4oyZ59N+LASCN5LvjrhSjKP8LVqmJm/yArUExzpOaiQ==
+"@schematics/angular@^0.7.5":
+  version "0.7.5"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.7.5.tgz#ccb5ce587161b24042195e100be556ae19b3b7f6"
+  integrity sha512-NrtvFwHCoWon8KInsvA1jdPu4pVJGa8GAWM/jqnE7HpwPwM7hMML08lV0P8r3NX5t2/i0CKvfp4AAEr5MXorEQ==
   dependencies:
-    "@angular-devkit/core" "0.7.3"
-    "@angular-devkit/schematics" "0.7.3"
+    "@angular-devkit/core" "0.7.5"
+    "@angular-devkit/schematics" "0.7.5"
     typescript ">=2.6.2 <2.10"
 
 "@types/body-parser@*":