Skip to content
This repository was archived by the owner on Oct 14, 2024. It is now read-only.

Commit ac849ac

Browse files
authored
Revert "build: remove webpack process and replace with tsc (#626)"
This reverts commit 7d59edf.
1 parent 91b1201 commit ac849ac

File tree

5 files changed

+247
-36
lines changed

5 files changed

+247
-36
lines changed

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
"lint": "ng lint ng-universal-demo",
2323
"build:client-and-server-bundles": "ng build --prod && ng run ng-universal-demo:server:production",
2424
"build:prerender": "npm run build:client-and-server-bundles && npm run webpack:server && npm run generate:prerender",
25-
"build:ssr": "npm run build:client-and-server-bundles && npm run compile:server",
26-
"compile:server": "tsc -p server.tsconfig.json",
25+
"build:ssr": "npm run build:client-and-server-bundles && npm run webpack:server",
2726
"generate:prerender": "cd dist && node prerender",
27+
"webpack:server": "webpack --config webpack.server.config.js --progress --colors",
2828
"serve:prerender": "cd dist/browser && http-server",
2929
"serve:ssr": "node dist/server"
3030
},
@@ -61,6 +61,7 @@
6161
"reflect-metadata": "^0.1.10",
6262
"ts-loader": "^4.2.0",
6363
"tslint": "^5.7.0",
64-
"typescript": "~2.7.2"
64+
"typescript": "~2.7.2",
65+
"webpack-cli": "^3.1.0"
6566
}
6667
}

server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const PORT = process.env.PORT || 4000;
1919
const DIST_FOLDER = join(process.cwd(), 'dist');
2020

2121
// * NOTE :: leave this as require() since this file is built Dynamically from webpack
22-
const {AppServerModuleNgFactory, LAZY_MODULE_MAP} = require('./server/main');
22+
const {AppServerModuleNgFactory, LAZY_MODULE_MAP} = require('./dist/server/main');
2323

2424
// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
2525
app.engine('html', ngExpressEngine({

server.tsconfig.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

webpack.server.config.js

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
// Work around for https://github.com/angular/angular-cli/issues/7200
2+
3+
const path = require('path');
4+
const webpack = require('webpack');
5+
6+
module.exports = {
7+
mode: 'none',
8+
entry: {
9+
// This is our Express server for Dynamic universal
10+
server: './server.ts',
11+
// This is an example of Static prerendering (generative)
12+
prerender: './prerender.ts'
13+
},
14+
target: 'node',
15+
resolve: { extensions: ['.ts', '.js'] },
16+
optimization: {
17+
minimize: false
18+
},
19+
output: {
20+
// Puts the output at the root of the dist folder
21+
path: path.join(__dirname, 'dist'),
22+
filename: '[name].js'
23+
},
24+
module: {
25+
rules: [
26+
{ test: /\.ts$/, loader: 'ts-loader' },
27+
{
28+
// Mark files inside `@angular/core` as using SystemJS style dynamic imports.
29+
// Removing this will cause deprecation warnings to appear.
30+
test: /(\\|\/)@angular(\\|\/)core(\\|\/).+\.js$/,
31+
parser: { system: true },
32+
},
33+
]
34+
},
35+
plugins: [
36+
new webpack.ContextReplacementPlugin(
37+
// fixes WARNING Critical dependency: the request of a dependency is an expression
38+
/(.+)?angular(\\|\/)core(.+)?/,
39+
path.join(__dirname, 'src'), // location of your src
40+
{} // a map of your routes
41+
),
42+
new webpack.ContextReplacementPlugin(
43+
// fixes WARNING Critical dependency: the request of a dependency is an expression
44+
/(.+)?express(\\|\/)(.+)?/,
45+
path.join(__dirname, 'src'),
46+
{}
47+
)
48+
]
49+
}

0 commit comments

Comments
 (0)