feat(package): support of angular v7

angular-material-extensions · Nov 2, 2018 · 22b1bd5 · 22b1bd5
1 parent 974617b
commit 22b1bd5
Show file tree

Hide file tree

Showing 8 changed files with 5,133 additions and 5,186 deletions.
diff --git a/demo/angular.json b/demo/angular.json
@@ -116,6 +116,16 @@
             "outputPath": "dist/server",
             "main": "src/main.server.ts",
             "tsConfig": "src/tsconfig.server.json"
+          },
+          "configurations": {
+            "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ]
+            }
           }
         }
       }
@@ -144,4 +154,4 @@
     }
   },
   "defaultProject": "google-maps-autocomplete-demo"
-}
+}
diff --git a/demo/package-lock.json b/demo/package-lock.json
diff --git a/demo/package.json b/demo/package.json
@@ -8,82 +8,92 @@
     "start": "ng serve",
     "serve:prod": "ng serve --prod",
     "build": "ng build",
-    "test": "jest",
-    "lint": "ng lint",
+    "build:doc": "cd ../ && gulp build:doc",
+    "build:prod": "ng build --prod ",
+    "build:client-and-server-bundles": "ng build --prod &&  ng run ngx-linkifyjs-demo:server:production",
+    "build:prerender": "npm run build:client-and-server-bundles && npm run webpack:server && npm run generate:prerender",
+    "build:ssr": "npm run build:client-and-server-bundles && npm run webpack:server",
+    "compile:server": "tsc -p server.tsconfig.json",
     "e2e": "ng e2e",
-    "postinstall": "npm link @angular-material-extensions/google-maps-autocomplete"
+    "generate:prerender": "cd dist && node prerender",
+    "lint": "ng lint",
+    "test": "ng test",
+    "postinstall": "npm link @angular-material-extensions/google-maps-autocomplete",
+    "serve:prerender": "cd dist/browser && http-server",
+    "serve:ssr": "node dist/server",
+    "webpack:server": "webpack --config webpack.server.config.js --progress --colors"
   },
   "private": true,
   "dependencies": {
     "@angular-material-extensions/faq": "^3.0.2",
     "@angular-material-extensions/jumbotron": "^1.0.1",
-    "@angular/animations": "^6.1.9",
-    "@angular/cdk": "^6.4.7",
-    "@angular/common": "^6.1.9",
-    "@angular/compiler": "^6.1.9",
-    "@angular/core": "^6.1.9",
-    "@angular/flex-layout": "^6.0.0-beta.18",
-    "@angular/forms": "^6.1.9",
-    "@angular/http": "^6.1.9",
-    "@angular/material": "^6.4.7",
-    "@angular/platform-browser": "^6.1.9",
-    "@angular/platform-browser-dynamic": "^6.1.9",
-    "@angular/platform-server": "^6.1.9",
-    "@angular/pwa": "^0.8.4",
-    "@angular/router": "^6.1.9",
-    "@angular/service-worker": "^6.1.9",
-    "@ng-bootstrap/ng-bootstrap": "^2.2.2",
+    "@angular/animations": "^7.0.2",
+    "@angular/cdk": "^7.0.2",
+    "@angular/common": "^7.0.2",
+    "@angular/compiler": "^7.0.2",
+    "@angular/core": "^7.0.2",
+    "@angular/flex-layout": "^7.0.0-beta.19",
+    "@angular/forms": "^7.0.2",
+    "@angular/http": "^7.0.2",
+    "@angular/material": "^7.0.2",
+    "@angular/platform-browser": "^7.0.2",
+    "@angular/platform-browser-dynamic": "^7.0.2",
+    "@angular/platform-server": "^7.0.2",
+    "@angular/pwa": "^0.10.4",
+    "@angular/router": "^7.0.2",
+    "@angular/service-worker": "^7.0.2",
+    "@ng-bootstrap/ng-bootstrap": "^4.0.0",
     "@stackblitz/sdk": "^1.2.0",
-    "angulartics2": "^6.3.1",
+    "angulartics2": "^7.0.2",
     "bootstrap": "^4.1.3",
     "core-js": "^2.5.4",
     "font-awesome": "^4.7.0",
     "include-media": "^1.4.9",
     "material-design-icons": "^3.0.1",
-    "ngx-highlightjs": "^2.1.1",
+    "ngx-highlightjs": "^2.1.3",
     "rxjs": "^6.3.3",
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.7.5",
-    "@angular-devkit/schematics": "^0.7.5",
-    "@angular/cli": "^6.2.4",
-    "@angular/compiler-cli": "^6.1.9",
-    "@angular/language-service": "^6.1.9",
+    "@angular-devkit/build-angular": "^0.10.4",
+    "@angular-devkit/schematics": "^7.0.4",
+    "@angular/cli": "^7.0.4",
+    "@angular/compiler-cli": "^7.0.2",
+    "@angular/language-service": "^7.0.2",
     "@angularclass/hmr": "~2.1.3",
     "@compodoc/gulp-compodoc": "^0.0.9",
-    "@nguniversal/common": "^6.1.0",
-    "@nguniversal/express-engine": "^6.1.0",
-    "@nguniversal/module-map-ngfactory-loader": "^6.1.0",
-    "@types/jest": "^23.3.5",
-    "@types/node": "^10.11.6",
+    "@nguniversal/common": "^7.0.2",
+    "@nguniversal/express-engine": "^7.0.2",
+    "@nguniversal/module-map-ngfactory-loader": "^7.0.2",
+    "@types/jest": "^23.3.9",
+    "@types/node": "^10.12.2",
     "angular-cli-ghpages": "0.5.2",
-    "ansi-colors": "^2.0.5",
+    "ansi-colors": "^3.2.1",
     "codelyzer": "^4.5.0",
     "commitplease": "3.2.0",
     "conventional-github-releaser": "2.0.2",
     "del": "3.0.0",
-    "express": "^4.16.3",
+    "express": "^4.16.4",
     "fancy-log": "1.3.2",
     "greenkeeper-lockfile": "1.15.1",
     "gulp": "3.9.1",
     "gulp-bump": "3.1.1",
-    "gulp-conventional-changelog": "^2.0.3",
+    "gulp-conventional-changelog": "^2.0.9",
     "gulp-coveralls": "0.1.4",
     "gulp-file": "0.4.0",
-    "gulp-git": "2.7.0",
+    "gulp-git": "^2.8.0",
     "gulp-hub": "0.8.0",
     "jest": "^23.6.0",
-    "jest-preset-angular": "^5.2.3",
-    "lodash": "4.17.10",
+    "jest-preset-angular": "^6.0.1",
+    "lodash": "^4.17.11",
     "protractor": "^5.4.1",
     "reflect-metadata": "~0.1.12",
     "run-sequence": "2.2.1",
     "travis-status": "^3.0.1",
-    "ts-loader": "^4.5.0",
+    "ts-loader": "^5.3.0",
     "ts-node": "^7.0.1",
     "tslint": "~5.11.0",
-    "typescript": "~2.9.2",
+    "typescript": "~3.1.6",
     "webpack-cli": "^3.1.2",
     "yargs": "^12.0.2"
   },

diff --git a/demo/prerender.ts b/demo/prerender.ts
@@ -16,7 +16,7 @@ import { ROUTES } from './static.paths';
 // * NOTE :: leave this as require() since this file is built Dynamically from webpack
 const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist/server/main');
 
-const BROWSER_FOLDER = join(process.cwd(), 'dist', 'browser');
+const BROWSER_FOLDER = join(process.cwd(), 'browser');
 
 // Load the index.html file containing referances to your application bundle.
 const index = readFileSync(join(BROWSER_FOLDER, 'index.html'), 'utf8');
@@ -25,7 +25,7 @@ let previousRender = Promise.resolve();
 
 // Iterate each route path
 ROUTES.forEach(route => {
-  var fullPath = join(BROWSER_FOLDER, route);
+  const fullPath = join(BROWSER_FOLDER, route);
 
   // Make sure the directory structure is there
   if (!existsSync(fullPath)) {

diff --git a/demo/src/app/app.module.ts b/demo/src/app/app.module.ts
@@ -15,9 +15,9 @@ import {FlexLayoutModule} from '@angular/flex-layout';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {MatJumbotronModule} from '@angular-material-extensions/jumbotron';
 
-import { Angulartics2Module } from 'angulartics2';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
-import { ServiceWorkerModule } from '@angular/service-worker';
+import {Angulartics2Module} from 'angulartics2';
+import {Angulartics2GoogleAnalytics} from 'angulartics2/ga';
+import {ServiceWorkerModule} from '@angular/service-worker';
 
 // import {} from '@types/googlemaps';
 
@@ -37,7 +37,7 @@ const googleMapsParams = {
     // The application ID can be any identifier which is unique on
     // the page.
     BrowserModule.withServerTransition({appId: '@angular-material-extensions/google-maps-autocomplete-demo-id'}),
-    Angulartics2Module.forRoot([Angulartics2GoogleAnalytics]),
+    Angulartics2Module.forRoot(),
     AgmCoreModule.forRoot(googleMapsParams),
     MatGoogleMapsAutocompleteModule.forRoot(),
     MatJumbotronModule.forRoot(),
@@ -50,7 +50,7 @@ const googleMapsParams = {
     AppRoutingModule,
     AppSharedModule,
     HomeModule,
-    ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production })
+    ServiceWorkerModule.register('ngsw-worker.js', {enabled: environment.production})
   ],
   providers: [],
   bootstrap: [AppComponent]