-
Notifications
You must be signed in to change notification settings - Fork 414
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Portings for the following PRs from master b to branch 2019.02.xx: - #3988 - #4016 - #3998 - #4003 - #3991 - #4004 - #4006 - #4008 - #4025 - #4071 - #4019 - #4076 - #4077 - #4081 Target release is o add them to 2019.02.01
- Loading branch information
1 parent
90f5860
commit 05ee37b
Showing
56 changed files
with
849 additions
and
490 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,18 @@ | ||
var webpackConfig = require('./webpack.config.js'); | ||
var assign = require('object-assign'); | ||
const themeEntries = require('./themes.js').themeEntries; | ||
const extractThemesPlugin = require('./themes.js').extractThemesPlugin; | ||
|
||
assign(webpackConfig.entry, require('./examples.js')); | ||
const path = require("path"); | ||
|
||
module.exports = webpackConfig; | ||
module.exports = require('./buildConfig')( | ||
require('./examples.js'), | ||
themeEntries, | ||
{ | ||
base: path.join(__dirname, ".."), | ||
dist: path.join(__dirname, "..", "web", "client", "dist"), | ||
framework: path.join(__dirname, "..", "web", "client"), | ||
code: path.join(__dirname, "..", "web", "client") | ||
}, | ||
extractThemesPlugin, | ||
false, | ||
"/dist/" | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.