Browse Source

Config finalized.

pull/297/head
Sebastian 8 years ago
parent
commit
8db577d6d3
  1. 5
      .gitignore
  2. 7
      src/Squidex/app-config/webpack.run.base.js
  3. 10
      src/Squidex/app-config/webpack.run.prod.js
  4. 17220
      src/Squidex/package-lock.json
  5. 2
      src/Squidex/package.json

5
.gitignore

@ -21,8 +21,9 @@ node_modules/
# Scripts (should be copied from node_modules on build) # Scripts (should be copied from node_modules on build)
**/wwwroot/scripts/**/*.* **/wwwroot/scripts/**/*.*
/src/Squidex/Assets
/src/Squidex/appsettings.Development.json /src/Squidex/appsettings.Development.json
/src/Squidex/Assets
/src/Squidex/package-lock.json
/src/Squidex/Properties/launchSettings.json /src/Squidex/Properties/launchSettings.json
/global.json /global.json

7
src/Squidex/app-config/webpack.run.base.js

@ -25,11 +25,14 @@ module.exports = webpackMerge(commonConfig, {
* See: https://github.com/ampedandwired/html-webpack-plugin * See: https://github.com/ampedandwired/html-webpack-plugin
*/ */
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
template: 'wwwroot/index.html', hash: true hash: true,
chunks: ['shims', 'app'],
chunksSortMode: 'manual',
template: 'wwwroot/index.html'
}), }),
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
template: 'wwwroot/theme.html', hash: true, filename: 'theme.html' template: 'wwwroot/theme.html', hash: true, chunksSortMode: 'none', filename: 'theme.html'
}) })
] ]
}); });

10
src/Squidex/app-config/webpack.run.prod.js

@ -5,6 +5,8 @@ MiniCssExtractPlugin = require('mini-css-extract-plugin'),
runConfig = require('./webpack.run.base.js'), runConfig = require('./webpack.run.base.js'),
helpers = require('./helpers'); helpers = require('./helpers');
var CircularDependencyPlugin = require('circular-dependency-plugin');
helpers.removeLoaders(runConfig, ['scss', 'ts']); helpers.removeLoaders(runConfig, ['scss', 'ts']);
module.exports = webpackMerge(runConfig, { module.exports = webpackMerge(runConfig, {
@ -96,5 +98,13 @@ module.exports = webpackMerge(runConfig, {
tsConfigPath: './tsconfig.json', tsConfigPath: './tsconfig.json',
entryModule: 'app/app.module#AppModule' entryModule: 'app/app.module#AppModule'
}), }),
new CircularDependencyPlugin({
onDetected({ module: webpackModuleRecord, paths, compilation }) {
// `paths` will be an Array of the relative module paths that make up the cycle
// `module` will be the module record generated by webpack that caused the cycle
console.log(paths.join(' -> '))
}
})
] ]
}); });

17220
src/Squidex/package-lock.json

File diff suppressed because it is too large

2
src/Squidex/package.json

@ -9,7 +9,7 @@
"test:coverage": "karma start karma.coverage.conf.js", "test:coverage": "karma start karma.coverage.conf.js",
"test:clean": "rimraf _test-output", "test:clean": "rimraf _test-output",
"dev": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ && webpack-dev-server --config app-config/webpack.run.dev.js --inline --port 3000", "dev": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ && webpack-dev-server --config app-config/webpack.run.dev.js --inline --port 3000",
"build": "webpack --config app-config/webpack.run.prod.js --progress", "build": "webpack --config app-config/webpack.run.prod.js",
"build:copy": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/", "build:copy": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/",
"build:clean": "rimraf wwwroot/build", "build:clean": "rimraf wwwroot/build",
"tslint": "tslint -c tslint.json -p tsconfig.json app/**/*.ts" "tslint": "tslint -c tslint.json -p tsconfig.json app/**/*.ts"

Loading…
Cancel
Save