Merge branch 'vnext' into didimmova/add-tailwind-sample-vnext

Author: simeonoff

angular.json

@@ -39,7 +39,12 @@
                 "node_modules"
               ]
             },
-            "browser": "src/main.ts"
+            "browser": "src/main.ts",
+             "server": "src/main.server.ts",
+            "outputMode": "static",
+            "ssr": {
+                "entry": "src/server.ts"
+            }
           },
           "configurations": {
             "production": {
@@ -159,7 +164,12 @@
               ]
             },
             "preserveSymlinks": true,
-            "browser": "projects/app-lob/src/main.ts"
+            "browser": "projects/app-lob/src/main.ts",
+            "server": "projects/app-lob/src/main.server.ts",
+            "outputMode": "static",
+            "ssr": {
+              "entry": "projects/app-lob/src/server.ts"
+            }
           },
           "configurations": {
             "production": {
@@ -284,7 +294,12 @@
                 "node_modules"
               ]
             },
-            "browser": "projects/app-crm/src/main.ts"
+            "browser": "projects/app-crm/src/main.ts",
+            "server": "projects/app-crm/src/main.server.ts",
+            "outputMode": "static",
+            "ssr": {
+              "entry": "projects/app-crm/src/server.ts"
+            }
           },
           "configurations": {
             "production": {

gulpfile.js

@@ -63,66 +63,6 @@ gulp.task("overwrite-package-json", (done) => {
     done();
 });
 
-const createPrependerdLobStructure = (cb) => {
-    const folders = [
-        './dist/app-lob/samples',
-        './dist/app-lob/samples/grid',
-        './dist/app-lob/samples/tree-grid',
-        './dist/app-lob/samples/grid-finjs-dock-manager',
-        './dist/app-lob/samples/hierarchical-grid',
-        './dist/app-lob/grid',
-        './dist/app-lob/tree-grid',
-        './dist/app-lob/grid-finjs-dock-manager',
-        './dist/app-lob/hierarchical-grid'
-    ];
-    folders.forEach(dir => {
-        if (!fs.existsSync(dir)) {
-            fs.mkdirSync(dir);
-        }
-    });
-    cb();
-}
-
-const addPrerenderedLobPages = (cb) => {
-    const { metadata } = require('./projects/app-lob/src/app/metadata');
-    const indexFilePath = path.resolve(__dirname, './', 'dist/app-lob/browser', 'index.html');
-
-    // read in the index.html file
-    fs.readFile(indexFilePath, 'utf8', function (err, data) {
-        if (err) {
-            return console.error(err);
-        }
-
-        metadata.forEach(({ url, title, description, og_url, folder }) => {
-            let result = data;
-            result = result.replace(/\$OG_TITLE/g, title);
-            result = result.replace(/\$OG_DESCRIPTION/g, description);
-            result = result.replace(/\$OG_URL/g, og_url);
-
-            let filename = url.substring(1).replace(/\//g, '-');
-            if (filename.length) {
-                filename = filename + '.html';
-            } else {
-                filename = 'index.html';
-            }
-
-            fs.writeFile(path.resolve(__dirname, './', './dist/app-lob/samples/' + folder, filename), result, (err) => {
-                if (err) {
-                    console.log(err);
-                }
-            });
-            fs.writeFile(path.resolve(__dirname, './', './dist/app-lob/' + folder, filename), result, (err) => {
-                if (err) {
-                    console.log(err);
-                }
-            });
-        })
-    })
-    cb();
-}
-
-exports.prerenderPages = gulp.series(createPrependerdLobStructure, addPrerenderedLobPages);
-
 gulp.task("watch-live-editing", gulp.series("generate-live-editing", () => {
     gulp.watch(["./src/**/*.*", "!./src/assets/**", "./live-editing/**/*.*", "package.json"], function () {
         Object.keys(require.cache).forEach(function (key) {

package.json

@@ -16,7 +16,7 @@
     "watch-live-editing": "gulp watch-live-editing",
     "sass-js-compile-check": "gulp sass-js-compile-check",
     "build": "gulp generate-live-editing && gulp overwrite-package-json && ng build --configuration production",
-    "build:app-lob": "gulp generate-live-editing --appDv=true && gulp overwrite-package-json && ng build app-lob --configuration production && gulp prerenderPages",
+    "build:app-lob": "gulp generate-live-editing --appDv=true && gulp overwrite-package-json && ng build app-lob --configuration production",
     "build:app-crm": "gulp generate-live-editing --appCrm=true && gulp overwrite-package-json && ng build app-crm --configuration production",
     "test": "ng test",
     "lint": "node --max_old_space_size=12192 node_modules/@angular/cli/bin/ng lint",
@@ -27,7 +27,7 @@
     "start:app-lob:live-editing": "gulp generate-live-editing --appDv=true && node node_modules/@angular/cli/bin/ng serve app-lob -o",
     "lint:app-crm": "ng lint app-crm",
     "build-ci": "gulp overwrite-package-json && ng build --configuration production",
-    "build-ci:app-lob": "gulp overwrite-package-json && ng build app-lob --configuration production && gulp prerenderPages",
+    "build-ci:app-lob": "gulp overwrite-package-json && ng build app-lob --configuration production",
     "build-ci:app-crm": "gulp overwrite-package-json && ng build app-crm --configuration production",
     "repositoryfyAngularDemos": "gulp repositoryfyAngularDemos",
     "repositoryfyAngularDemos:prod": "gulp repositoryfyAngularDemos --configuration production",

projects/app-lob/src/app/app.routes.server.ts

@@ -10,11 +10,11 @@ export const serverRoutes: ServerRoute[] = [
         renderMode: RenderMode.Client // TODO: Fails with Prerender
     },
     {
-        path: 'grid-finjs-dock-manager',
+        path: 'grid-finjs-dock-manager/**',
         renderMode: RenderMode.Client // TODO: Fails with Prerender
     },
     {
-        path: 'samples/grid-finjs-dock-manager',
+        path: 'samples/grid-finjs-dock-manager/**',
         renderMode: RenderMode.Client // TODO: Fails with Prerender
     },
     {

projects/app-lob/src/app/metadata.js

@@ -26,7 +26,7 @@
           <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
           <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
         </conditions>
-        <action type="Rewrite" url="/angular-demos/" />
+        <action type="Rewrite" url="/angular-demos/index.csr.html" />
       </rule>
       <rule name="Angular Root Redirect" enabled="true" stopProcessing="true">
         <match url="^/?$" />