fix(module-template): fix some bugs in module template

6 years ago · 76361fb6fb
11 changed files with 77 additions and 81 deletions
--- a/templates/app/angular/angular.json
+++ b/templates/app/angular/angular.json
@ -26,8 +26,12 @@
            "extractCss": true,
            "assets": ["src/favicon.ico", "src/assets"],
            "styles": [
+              {
+                "input": "node_modules/bootstrap/dist/css/bootstrap.min.css",
+                "inject": true,
+                "bundleName": "bootstrap.min"
+              },
              "src/styles.scss",
-              "node_modules/bootstrap/dist/css/bootstrap.min.css",
              {
                "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
                "inject": false,
@ -98,10 +102,22 @@
            "karmaConfig": "karma.conf.js",
            "assets": ["src/favicon.ico", "src/assets"],
            "styles": [
+              {
+                "input": "node_modules/bootstrap/dist/css/bootstrap.min.css",
+                "inject": true,
+                "bundleName": "bootstrap.min"
+              },
              "src/styles.scss",
-              "node_modules/bootstrap/dist/css/bootstrap.min.css",
-              "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
-              "node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css"
+              {
+                "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
+                "inject": false,
+                "bundleName": "fontawesome-all.min"
+              },
+              {
+                "input": "node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css",
+                "inject": false,
+                "bundleName": "fontawesome-v4-shims.min"
+              }
            ],
            "scripts": []
          }
--- a/templates/module/angular/angular.json
+++ b/templates/module/angular/angular.json
@ -26,12 +26,22 @@
            "extractCss": true,
            "assets": ["src/favicon.ico", "src/assets"],
            "styles": [
+              {
+                "input": "node_modules/bootstrap/dist/css/bootstrap.min.css",
+                "inject": true,
+                "bundleName": "bootstrap.min"
+              },
              "src/styles.scss",
-              "node_modules/bootstrap/dist/css/bootstrap.min.css",
-              "node_modules/font-awesome/css/font-awesome.min.css",
-              "node_modules/primeng/resources/themes/nova-light/theme.css",
-              "node_modules/primeicons/primeicons.css",
-              "node_modules/primeng/resources/primeng.min.css"
+              {
+                "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
+                "inject": false,
+                "bundleName": "fontawesome-all.min"
+              },
+              {
+                "input": "node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css",
+                "inject": false,
+                "bundleName": "fontawesome-v4-shims.min"
+              }
            ],
            "scripts": []
          },
@ -59,14 +69,6 @@
                  "maximumError": "5mb"
                }
              ]
-            },
-            "hmr": {
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.hmr.ts"
-                }
-              ]
            }
          }
        },
@ -78,10 +80,6 @@
          "configurations": {
            "production": {
              "browserTarget": "myProjectName:build:production"
-            },
-            "hmr": {
-              "hmr": true,
-              "browserTarget": "myProjectName:build:hmr"
            }
          }
        },
@ -100,12 +98,22 @@
            "karmaConfig": "karma.conf.js",
            "assets": ["src/favicon.ico", "src/assets"],
            "styles": [
+              {
+                "input": "node_modules/bootstrap/dist/css/bootstrap.min.css",
+                "inject": true,
+                "bundleName": "bootstrap.min"
+              },
              "src/styles.scss",
-              "node_modules/bootstrap/dist/css/bootstrap.min.css",
-              "node_modules/font-awesome/css/font-awesome.min.css",
-              "node_modules/primeng/resources/themes/nova-light/theme.css",
-              "node_modules/primeicons/primeicons.css",
-              "node_modules/primeng/resources/primeng.min.css"
+              {
+                "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
+                "inject": false,
+                "bundleName": "fontawesome-all.min"
+              },
+              {
+                "input": "node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css",
+                "inject": false,
+                "bundleName": "fontawesome-v4-shims.min"
+              }
            ],
            "scripts": []
          }
@ -159,9 +167,7 @@
              "projects/my-project-name/tsconfig.lib.json",
              "projects/my-project-name/tsconfig.spec.json"
            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
          }
        }
      }
@ -194,9 +200,7 @@
              "projects/my-project-name-config/tsconfig.lib.json",
              "projects/my-project-name-config/tsconfig.spec.json"
            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
          }
        }
      }
--- a/templates/module/angular/package.json
+++ b/templates/module/angular/package.json
@ -4,7 +4,7 @@
  "scripts": {
    "ng": "ng",
    "start": "ng serve",
-    "start:hmr": "ng serve --configuration hmr",
+    "start:hmr": "ng serve --open",
    "build": "ng build my-project-name",
    "test": "ng test my-project-name",
    "lint": "ng lint my-project-name",
@ -35,8 +35,6 @@
    "@angular/cli": "~8.3.20",
    "@angular/compiler-cli": "~8.2.14",
    "@angular/language-service": "~8.2.14",
-    "@angularclass/hmr": "^2.1.3",
-    "@ngxs/hmr-plugin": "^3.5.0",
    "@ngxs/logger-plugin": "^3.5.1",
    "@types/jasmine": "~3.3.8",
    "@types/jasminewd2": "~2.0.3",
--- a/templates/module/angular/src/app/app.component.ts
+++ b/templates/module/angular/src/app/app.component.ts
@ -1,4 +1,6 @@
-import { Component } from '@angular/core';
+import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core';
+import { Component, OnInit } from '@angular/core';
+import { forkJoin } from 'rxjs';

@Component({
  selector: 'app-root',
@ -7,4 +9,17 @@ import { Component } from '@angular/core';
    <router-outlet></router-outlet>
  `,
 })
-export class AppComponent {}
+export class AppComponent implements OnInit {
+  constructor(private lazyLoadService: LazyLoadService) {}
+
+  ngOnInit() {
+    forkJoin(
+      this.lazyLoadService.load(
+        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css'),
+      ),
+      this.lazyLoadService.load(
+        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css'),
+      ),
+    ).subscribe();
+  }
+}
--- a/templates/module/angular/src/app/shared/shared.module.ts
+++ b/templates/module/angular/src/app/shared/shared.module.ts
@ -3,7 +3,6 @@ import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { NgModule } from '@angular/core';
 import { ThemeBasicModule } from '@abp/ng.theme.basic';
 import { ThemeSharedModule } from '@abp/ng.theme.shared';
-import { TableModule } from 'primeng/table';
 import { NgxValidateCoreModule } from '@ngx-validate/core';

@NgModule({
@ -12,7 +11,6 @@ import { NgxValidateCoreModule } from '@ngx-validate/core';
    CoreModule,
    ThemeSharedModule,
    ThemeBasicModule,
-    TableModule,
    NgbDropdownModule,
    NgxValidateCoreModule,
  ],
@ -20,7 +18,6 @@ import { NgxValidateCoreModule } from '@ngx-validate/core';
    CoreModule,
    ThemeSharedModule,
    ThemeBasicModule,
-    TableModule,
    NgbDropdownModule,
    NgxValidateCoreModule,
  ],
--- a/templates/module/angular/src/environments/environment.hmr.ts
+++ b/templates/module/angular/src/environments/environment.hmr.ts
@ -1,25 +0,0 @@
-export const environment = {
-  production: false,
-  hmr: true,
-  application: {
-    name: 'MyProjectName',
-    logoUrl: '',
-  },
-  oAuthConfig: {
-    issuer: 'https://localhost:44301',
-    clientId: 'MyProjectName_ConsoleTestApp',
-    dummyClientSecret: '1q2w3e*',
-    scope: 'MyProjectName',
-    showDebugInformation: true,
-    oidc: false,
-    requireHttps: true,
-  },
-  apis: {
-    default: {
-      url: 'https://localhost:44300',
-    },
-  },
-  localization: {
-    defaultResourceName: 'MyProjectName',
-  },
-};
--- a/templates/module/angular/src/environments/environment.prod.ts
+++ b/templates/module/angular/src/environments/environment.prod.ts
@ -1,6 +1,5 @@
 export const environment = {
  production: true,
-  hmr: false,
  application: {
    name: 'MyProjectName',
    logoUrl: '',
--- a/templates/module/angular/src/environments/environment.ts
+++ b/templates/module/angular/src/environments/environment.ts
@ -1,6 +1,5 @@
 export const environment = {
  production: false,
-  hmr: false,
  application: {
    name: 'MyProjectName',
    logoUrl: '',
--- a/templates/module/angular/src/main.ts
+++ b/templates/module/angular/src/main.ts
@ -1,20 +1,13 @@
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-import { BootstrapModuleFn as Bootstrap, hmr, WebpackModule } from '@ngxs/hmr-plugin';

 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';

-declare const module: WebpackModule;
-
 if (environment.production) {
  enableProdMode();
 }

-const bootstrap: Bootstrap = () => platformBrowserDynamic().bootstrapModule(AppModule);
-
-if (environment.hmr) {
-  hmr(module, bootstrap).catch(err => console.error(err));
-} else {
-  bootstrap().catch(err => console.log(err));
-}
+platformBrowserDynamic()
+  .bootstrapModule(AppModule)
+  .catch((err) => console.error(err));
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json
@ -3,7 +3,7 @@
    "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200"
  },
  "ConnectionStrings": {
-    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName_Main;Trusted_Connection=True;MultipleActiveResultSets=true",
+    "Default": "Server=localhost;Database=MyProjectName_Main;User Id=sa;password=myPassw0rd;MultipleActiveResultSets=true",
    "MyProjectName": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName_Module;Trusted_Connection=True;MultipleActiveResultSets=true"
  },
  "Redis": {
@ -12,4 +12,4 @@
  "AuthServer": {
    "Authority": "https://localhost:44301/"
  }
-}
+}
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json
@ -5,7 +5,7 @@
  },
  "AppSelfUrl": "https://localhost:44301/",
  "ConnectionStrings": {
-    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName_Main;Trusted_Connection=True;MultipleActiveResultSets=true"
+    "Default": "Server=localhost;Database=MyProjectName_Main;User Id=sa;password=myPassw0rd;MultipleActiveResultSets=true"
  },
  "Redis": {
    "Configuration": "127.0.0.1"
@ -25,4 +25,4 @@
      }
    }
  }
-}
+}