Project

General

Profile

« Previous | Next » 

Revision 55609

[angular7|Library]: Bug fixes and addition of @types/express dependency in package.json

View differences:

modules/uoa-services-library/branches/angular7/ng-openaire-library/webpack.server.config.js
14 14
  resolve: { extensions: ['.ts', '.js'] },
15 15
  // Make sure we include all node_modules etc
16 16
  externals: [/(node_modules|main\..*\.js)/,],
17
  optimization: {
18
    minimize: false
19
  },
17 20
  output: {
18 21
    // Puts the output at the root of the dist folder
19 22
    path: path.join(__dirname, 'dist'),
......
22 25
  module: {
23 26
    rules: [
24 27
      { test: /\.ts$/, loader: 'ts-loader' }
28
      ,{
29
        // Mark files inside `@angular/core` as using SystemJS style dynamic imports.
30
        // Removing this will cause deprecation warnings to appear.
31
        test: /(\\|\/)@angular(\\|\/)core(\\|\/).+\.js$/,
32
        parser: { system: true },
33
      },
25 34
    ]
26 35
  },
27 36
  plugins: [
......
39 48
    )
40 49
  ]
41 50
}
42
  
51
  
modules/uoa-services-library/branches/angular7/ng-openaire-library/package.json
35 35
    "@angular/router": "7.2.14",
36 36
    "@nguniversal/express-engine": "^6.0.0",
37 37
    "@nguniversal/module-map-ngfactory-loader": "^6.0.0",
38
    "@types/express": "^4.16.1",
38 39
    "angular-datatables": "^4.4.1",
39 40
    "citation-js": "^0.3.4",
40 41
    "clipboard": "^1.5.16",
modules/uoa-services-library/branches/angular7/ng-openaire-library/package-lock.json
1 1
{
2 2
  "name": "ng-openaire-library",
3
  "version": "0.0.0",
3
  "version": "1.0.0",
4 4
  "lockfileVersion": 1,
5 5
  "requires": true,
6 6
  "dependencies": {
......
830 830
        }
831 831
      }
832 832
    },
833
    "@types/body-parser": {
834
      "version": "1.17.0",
835
      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.0.tgz",
836
      "integrity": "sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==",
837
      "requires": {
838
        "@types/connect": "*",
839
        "@types/node": "*"
840
      }
841
    },
842
    "@types/connect": {
843
      "version": "3.4.32",
844
      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz",
845
      "integrity": "sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==",
846
      "requires": {
847
        "@types/node": "*"
848
      }
849
    },
833 850
    "@types/datatables.net": {
834 851
      "version": "1.10.17",
835 852
      "resolved": "https://registry.npmjs.org/@types/datatables.net/-/datatables.net-1.10.17.tgz",
......
839 856
        "@types/jquery": "*"
840 857
      }
841 858
    },
859
    "@types/express": {
860
      "version": "4.16.1",
861
      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.16.1.tgz",
862
      "integrity": "sha512-V0clmJow23WeyblmACoxbHBu2JKlE5TiIme6Lem14FnPW9gsttyHtk6wq7njcdIWH1njAaFgR8gW09lgY98gQg==",
863
      "requires": {
864
        "@types/body-parser": "*",
865
        "@types/express-serve-static-core": "*",
866
        "@types/serve-static": "*"
867
      }
868
    },
869
    "@types/express-serve-static-core": {
870
      "version": "4.16.4",
871
      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.4.tgz",
872
      "integrity": "sha512-x/8h6FHm14rPWnW2HP5likD/rsqJ3t/77OWx2PLxym0hXbeBWQmcPyHmwX+CtCQpjIfgrUdEoDFcLPwPZWiqzQ==",
873
      "requires": {
874
        "@types/node": "*",
875
        "@types/range-parser": "*"
876
      }
877
    },
842 878
    "@types/jquery": {
843 879
      "version": "3.3.29",
844 880
      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.29.tgz",
......
848 884
        "@types/sizzle": "*"
849 885
      }
850 886
    },
887
    "@types/mime": {
888
      "version": "2.0.1",
889
      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz",
890
      "integrity": "sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="
891
    },
851 892
    "@types/node": {
852 893
      "version": "8.10.48",
853 894
      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.48.tgz",
854
      "integrity": "sha512-c35YEBTkL4rzXY2ucpSKy+UYHjUBIIkuJbWYbsGIrKLEWU5dgJMmLkkIb3qeC3O3Tpb1ZQCwecscvJTDjDjkRw==",
855
      "dev": true
895
      "integrity": "sha512-c35YEBTkL4rzXY2ucpSKy+UYHjUBIIkuJbWYbsGIrKLEWU5dgJMmLkkIb3qeC3O3Tpb1ZQCwecscvJTDjDjkRw=="
856 896
    },
897
    "@types/range-parser": {
898
      "version": "1.2.3",
899
      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz",
900
      "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="
901
    },
902
    "@types/serve-static": {
903
      "version": "1.13.2",
904
      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.2.tgz",
905
      "integrity": "sha512-/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==",
906
      "requires": {
907
        "@types/express-serve-static-core": "*",
908
        "@types/mime": "*"
909
      }
910
    },
857 911
    "@types/sizzle": {
858 912
      "version": "2.3.2",
859 913
      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",
modules/uoa-services-library/branches/angular7/ng-openaire-library/server.ts
26 26
// * NOTE :: leave this as require() since this file is built Dynamically from webpack
27 27
const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist/server/main');
28 28

  
29
/*
29 30
// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
30 31
app.engine('html', ngExpressEngine({
31 32
  bootstrap: AppServerModuleNgFactory,
......
33 34
    provideModuleMap(LAZY_MODULE_MAP)
34 35
  ]
35 36
}));
37
*/
36 38

  
39
app.engine('html', (_, options, callback) => {
40
    let engine = ngExpressEngine({
41
        bootstrap: AppServerModuleNgFactory,
42
        providers: [
43
            { provide: 'request', useFactory: () => options.req, deps: [] },
44
            provideModuleMap(LAZY_MODULE_MAP)
45
        ]
46
    });
47
    engine(_, options, callback);
48
});
49

  
37 50
app.set('view engine', 'html');
38 51
app.set('views', join(DIST_FOLDER, 'browser'));
39 52

  

Also available in: Unified diff