Skip to content

Commit 6789446

Browse files
authored
Merge pull request #33 from jumpserver/dev
更新支持cast格式
2 parents f903a12 + f3a3db5 commit 6789446

File tree

16 files changed

+8002
-28258
lines changed

16 files changed

+8002
-28258
lines changed

.electron-vue/webpack.renderer.config.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,18 @@ let rendererConfig = {
125125
new HtmlWebpackPlugin({
126126
filename: 'index.html',
127127
template: path.resolve(__dirname, '../src/index.ejs'),
128+
templateParameters(compilation, assets, options) {
129+
return {
130+
compilation: compilation,
131+
webpack: compilation.getStats().toJson(),
132+
webpackConfig: compilation.options,
133+
htmlWebpackPlugin: {
134+
files: assets,
135+
options: options
136+
},
137+
process,
138+
};
139+
},
128140
minify: {
129141
collapseWhitespace: true,
130142
removeAttributeQuotes: true,

.electron-vue/webpack.web.config.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,18 @@ let webConfig = {
9797
new HtmlWebpackPlugin({
9898
filename: 'index.html',
9999
template: path.resolve(__dirname, '../src/index.ejs'),
100+
templateParameters(compilation, assets, options) {
101+
return {
102+
compilation: compilation,
103+
webpack: compilation.getStats().toJson(),
104+
webpackConfig: compilation.options,
105+
htmlWebpackPlugin: {
106+
files: assets,
107+
options: options
108+
},
109+
process,
110+
};
111+
},
100112
minify: {
101113
collapseWhitespace: true,
102114
removeAttributeQuotes: true,

appveyor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ init:
2222
install:
2323
- ps: Install-Product node 10 x64
2424
- git reset --hard HEAD
25+
- yarn config set ignore-engines true
2526
- yarn
2627
- node --version
2728

@@ -32,5 +33,5 @@ build_script:
3233
test: off
3334

3435
artifacts:
35-
- path: build\Jumpserver Video Player Setup 0.1.4.exe
36+
- path: build\Jumpserver Video Player Setup 0.1.5.exe
3637
name: JumpserverVideoPlayer

0 commit comments

Comments
 (0)