fix(lib): upgraded the lib to angular v9 + fixed the schematics

Author: AnthonyNahas

projects/angular-material-extensions/google-maps-autocomplete/schematics/helpers/angular/config.ts

@@ -1,16 +1,13 @@
 export * from './ast-utils';
 export * from './change';
 export * from './component-schema';
-export * from './config';
 export * from './dependencies';
 export * from './find-module';
 export * from './json-utils';
 export * from './latest-versions';
-export * from './lint-fix';
 export * from './ng-ast-utils';
 export * from './parse-name';
 export * from './paths';
 export * from './project';
-export * from './project-targets';
 export * from './validation';
 export * from './workspace-models';

projects/angular-material-extensions/google-maps-autocomplete/schematics/helpers/angular/index.ts

@@ -1,14 +1,8 @@
 import {chain, noop, Rule, SchematicContext, Tree} from '@angular-devkit/schematics';
 import {NodePackageInstallTask} from '@angular-devkit/schematics/tasks';
-import {
-  addModuleImportToRootModule,
-  addPackageJsonDependency,
-  getProjectFromWorkspace,
-  getWorkspace,
-  NodeDependency,
-  NodeDependencyType
-} from '../helpers';
-
+import {addPackageJsonDependency, NodeDependency, NodeDependencyType} from '../helpers';
+import {getWorkspace} from '@schematics/angular/utility/config';
+import {addModuleImportToRootModule, getProjectFromWorkspace,} from '@angular/cdk/schematics';
 
 /** Loads the full version from the given Angular package gracefully. */
 function loadPackageVersionGracefully(context: SchematicContext): string | null {
@@ -35,9 +29,9 @@ export function addPackageJsonDependencies(): Rule {
         name: '@angular-material-extensions/google-maps-autocomplete'
       },
       {type: NodeDependencyType.Default, version: '^1.0.0-beta.7', name: '@agm/core'},
-      {type: NodeDependencyType.Default, version: '^3.37.0', name: '@types/googlemaps'},
-      {type: NodeDependencyType.Default, version: ngCoreVersionTag || '^8.1.2', name: '@angular/animations'},
-      {type: NodeDependencyType.Default, version: ngCoreVersionTag || '^8.1.2', name: '@angular/forms'}
+      {type: NodeDependencyType.Default, version: '^3.39.2', name: '@types/googlemaps'},
+      {type: NodeDependencyType.Default, version: ngCoreVersionTag || '~9.0.0', name: '@angular/animations'},
+      {type: NodeDependencyType.Default, version: ngCoreVersionTag || '~9.0.0', name: '@angular/forms'}
     ];
 
     dependencies.forEach(dependency => {
@@ -61,11 +55,7 @@ export function installPackageJsonDependencies(): Rule {
 export function addModuleToImports(options: any): Rule {
   return (host: Tree, context: SchematicContext) => {
     const workspace = getWorkspace(host);
-    const project = getProjectFromWorkspace(
-      workspace,
-      // Takes the first project in case it's not provided by CLI
-      options.project ? options.project : Object.keys(workspace.projects)[0]
-    );
+    const project = getProjectFromWorkspace(workspace, options.project);
     const moduleName = 'MatGoogleMapsAutocompleteModule';
     const agmCoreModule = 'AgmCoreModule.forRoot()';
 

projects/angular-material-extensions/google-maps-autocomplete/schematics/helpers/angular/lint-fix.ts

@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.lib.json",
+  "angularCompilerOptions": {
+    "enableIvy": false
+  }
+}

projects/angular-material-extensions/google-maps-autocomplete/schematics/helpers/angular/project-targets.ts

@@ -0,0 +1,58 @@
+/**
+ * *** NOTE ON IMPORTING FROM ANGULAR AND NGUNIVERSAL IN THIS FILE ***
+ *
+ * If your application uses third-party dependencies, you'll need to
+ * either use Webpack or the Angular CLI's `bundleDependencies` feature
+ * in order to adequately package them for use on the server without a
+ * node_modules directory.
+ *
+ * However, due to the nature of the CLI's `bundleDependencies`, importing
+ * Angular in this file will create a different instance of Angular than
+ * the version in the compiled application code. This leads to unavoidable
+ * conflicts. Therefore, please do not explicitly import from @angular or
+ * @nguniversal in this file. You can export any needed resources
+ * from your application's main.server.ts file, as seen below with the
+ * import for `ngExpressEngine`.
+ */
+
+import 'zone.js/dist/zone-node';
+
+import * as express from 'express';
+import {join} from 'path';
+
+// Express server
+const app = express();
+
+const PORT = process.env.PORT || 4000;
+const DIST_FOLDER = join(process.cwd(), 'dist/browser');
+
+// * NOTE :: leave this as require() since this file is built Dynamically from webpack
+const {AppServerModuleNgFactory, LAZY_MODULE_MAP, ngExpressEngine, provideModuleMap} = require('./dist/server/main');
+
+// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
+app.engine('html', ngExpressEngine({
+  bootstrap: AppServerModuleNgFactory,
+  providers: [
+    provideModuleMap(LAZY_MODULE_MAP)
+  ]
+}));
+
+app.set('view engine', 'html');
+app.set('views', DIST_FOLDER);
+
+// Example Express Rest API endpoints
+// app.get('/api/**', (req, res) => { });
+// Serve static files from /browser
+app.get('*.*', express.static(DIST_FOLDER, {
+  maxAge: '1y'
+}));
+
+// All regular routes use the Universal engine
+app.get('*', (req, res) => {
+  res.render('index', { req });
+});
+
+// Start up the Node server
+app.listen(PORT, () => {
+  console.log(`Node Express server listening on http://localhost:${PORT}`);
+});

projects/angular-material-extensions/google-maps-autocomplete/schematics/ng-add/index.ts

@@ -0,0 +1,53 @@
+// Work around for https://github.com/angular/angular-cli/issues/7200
+
+const path = require('path');
+const webpack = require('webpack');
+
+module.exports = {
+  mode: 'none',
+  entry: {
+    // This is our Express server for Dynamic universal
+    server: './server.ts',
+    // This is an example of Static prerendering (generative)
+    prerender: './prerender.ts'
+  },
+  externals: {
+    './dist/server/main': 'require("./server/main")'
+  },
+  target: 'node',
+  resolve: { extensions: ['.ts', '.js'] },
+  optimization: {
+    minimize: false
+  },
+  output: {
+    // Puts the output at the root of the dist folder
+    path: path.join(__dirname, 'dist'),
+    filename: '[name].js'
+  },
+  module: {
+    noParse: /polyfills-.*\.js/,
+    rules: [
+      { test: /\.ts$/, loader: 'ts-loader' },
+      {
+        // Mark files inside `@angular/core` as using SystemJS style dynamic imports.
+        // Removing this will cause deprecation warnings to appear.
+        test: /(\\|\/)@angular(\\|\/)core(\\|\/).+\.js$/,
+        parser: { system: true },
+      },
+    ]
+  },
+  plugins: [
+    new webpack.ContextReplacementPlugin(
+      // fixes WARNING Critical dependency: the request of a dependency is an expression
+      /(.+)?angular(\\|\/)core(.+)?/,
+      path.join(__dirname, 'src'), // location of your src
+      {} // a map of your routes
+    ),
+    new webpack.ContextReplacementPlugin(
+      // fixes WARNING Critical dependency: the request of a dependency is an expression
+      /(.+)?express(\\|\/)(.+)?/,
+      path.join(__dirname, 'src'),
+      {}
+    )
+  ]
+};