Skip to content

Commit

Permalink
chore: update dev deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@develar
develar committed May 23, 2018
1 parent 564720e commit 5ad2481
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 26 deletions.
10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
"@develar/gitbook": "3.2.11",
"@types/electron-devtools-installer": "^2.0.3",
"@types/jest": "^22.2.3",
"@types/memory-fs": "^0.3.0",
"@types/node": "^10.1.0",
"@types/memory-fs": "^0.3.1",
"@types/node": "^10.1.2",
"@types/semver": "^5.5.0",
"@types/webpack": "^4.1.7",
"@types/webpack": "^4.4.0",
"@types/webpack-merge": "^4.1.3",
"babel-preset-ts-node6-bluebird": "^2.0.6",
"cross-env": "^5.1.5",
"cross-env": "^5.1.6",
"develar-typescript-json-schema": "^0.20.0",
"electron-builder-tslint-config": "^1.1.0",
"fs-extra-p": "^4.6.0",
Expand All @@ -34,7 +34,7 @@
"gitbook-plugin-github-buttons": "^3.0.0",
"http-server": "^0.11.1",
"jest-cli": "^23.0.0-beta.2",
"jest-junit": "^3.7.0",
"jest-junit": "^4.0.0",
"memory-fs": "^0.4.1",
"temp-file": "^3.1.2",
"ts-babel": "^5.0.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-webpack-vue/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dependencies": {
"vue-class-component": "^6.2.0",
"vue-html-loader": "^1.2.4",
"vue-loader": "^15.0.11",
"vue-loader": "^15.2.0",
"vue-style-loader": "^4.1.0",
"vue-template-compiler": "^2.5.16"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-webpack/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "electron-webpack",
"version": "2.1.1",
"version": "2.1.2",
"license": "MIT",
"author": "Vladimir Krivosheev <[email protected]>",
"main": "out/main.js",
Expand Down
10 changes: 5 additions & 5 deletions packages/electron-webpack/src/main.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as path from "path"
import { getConfig, validateConfig } from "read-config-file"
import { deepAssign } from "read-config-file/out/deepAssign"
import "source-map-support/register"
import { Configuration, Plugin, Rule } from "webpack"
import { Configuration, Plugin, RuleSetRule } from "webpack"
import merge from "webpack-merge"
import { configureTypescript } from "./configurators/ts"
import { configureVue } from "./configurators/vue/vue"
Expand Down Expand Up @@ -68,7 +68,7 @@ export class WebpackConfigurator {
return this._configuration!!
}

readonly rules: Array<Rule> = []
readonly rules: Array<RuleSetRule> = []
readonly plugins: Array<Plugin> = []

// js must be first - e.g. iview has two files loading-bar.js and loading-bar.vue - when we require "loading-bar", js file must be resolved and not vue
Expand Down Expand Up @@ -248,15 +248,15 @@ export class WebpackConfigurator {

private applyCustomModifications() {
if (this.type === "renderer" && this.electronWebpackConfiguration.renderer && this.electronWebpackConfiguration.renderer.webpackConfig) {
this._configuration = merge.smart(this._configuration!!, require(path.join(this.projectDir, this.electronWebpackConfiguration.renderer.webpackConfig)))
this._configuration = merge.smart(this._configuration as any, require(path.join(this.projectDir, this.electronWebpackConfiguration.renderer.webpackConfig))) as any
}

if (this.type === "renderer-dll" && this.electronWebpackConfiguration.renderer && this.electronWebpackConfiguration.renderer.webpackDllConfig) {
this._configuration = merge.smart(this._configuration!!, require(path.join(this.projectDir, this.electronWebpackConfiguration.renderer.webpackDllConfig)))
this._configuration = merge.smart(this._configuration as any, require(path.join(this.projectDir, this.electronWebpackConfiguration.renderer.webpackDllConfig))) as any
}

if (this.type === "main" && this.electronWebpackConfiguration.main && this.electronWebpackConfiguration.main.webpackConfig) {
this._configuration = merge.smart(this._configuration!!, require(path.join(this.projectDir, this.electronWebpackConfiguration.main.webpackConfig)))
this._configuration = merge.smart(this._configuration as any, require(path.join(this.projectDir, this.electronWebpackConfiguration.main.webpackConfig))) as any
}
}

Expand Down
41 changes: 27 additions & 14 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -679,16 +679,20 @@
version "22.2.3"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-22.2.3.tgz#0157c0316dc3722c43a7b71de3fdf3acbccef10d"

"@types/memory-fs@^0.3.0":
version "0.3.0"
resolved "https://registry.yarnpkg.com/@types/memory-fs/-/memory-fs-0.3.0.tgz#847596a94f9a9688a2e342f4017fcc0050e8e2da"
"@types/memory-fs@^0.3.1":
version "0.3.1"
resolved "https://registry.yarnpkg.com/@types/memory-fs/-/memory-fs-0.3.1.tgz#5cb5a1df4d977fd43edd3f05e0fd1a8a06b0275e"
dependencies:
"@types/node" "*"

"@types/node@*", "@types/node@^10.1.0":
"@types/node@*":
version "10.1.0"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.1.0.tgz#2783ee1b6c47cbd4044f4a233976c1ac5fa9e942"

"@types/node@^10.1.2":
version "10.1.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.1.2.tgz#1b928a0baa408fc8ae3ac012cc81375addc147c6"

"@types/semver@^5.5.0":
version "5.5.0"
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
Expand All @@ -713,7 +717,7 @@
dependencies:
"@types/webpack" "*"

"@types/webpack@*", "@types/webpack@^4.1.7":
"@types/webpack@*":
version "4.1.7"
resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.1.7.tgz#02cf3bf96dd690c5d2bd9e9bee548c1aaf48d6f8"
dependencies:
Expand All @@ -722,6 +726,15 @@
"@types/uglify-js" "*"
source-map "^0.6.0"

"@types/webpack@^4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.0.tgz#c0551b772be241d786c0548812dd75a932f8efb4"
dependencies:
"@types/node" "*"
"@types/tapable" "*"
"@types/uglify-js" "*"
source-map "^0.6.0"

"@vue/component-compiler-utils@^1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-1.2.1.tgz#3d543baa75cfe5dab96e29415b78366450156ef6"
Expand Down Expand Up @@ -2906,9 +2919,9 @@ crocket@^0.9.11:
dependencies:
xpipe "*"

cross-env@^5.1.5:
version "5.1.5"
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.5.tgz#31daf7f3a52ef337c8ddda585f08175cce5d1fa5"
cross-env@^5.1.6:
version "5.1.6"
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.6.tgz#0dc05caf945b24e4b9e3b12871fe0e858d08b38d"
dependencies:
cross-spawn "^5.1.0"
is-windows "^1.0.0"
Expand Down Expand Up @@ -5680,9 +5693,9 @@ jest-jasmine2@^23.0.0-charlie.2:
pretty-format "^23.0.0-charlie.2"
source-map-support "^0.5.0"

jest-junit@^3.7.0:
version "3.7.0"
resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-3.7.0.tgz#34abaed677439eb96557815d18b5ba01364fd897"
jest-junit@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-4.0.0.tgz#6af04d43940d7e81dc7d37ec1b80c97551d91e80"
dependencies:
mkdirp "^0.5.1"
strip-ansi "^4.0.0"
Expand Down Expand Up @@ -9693,9 +9706,9 @@ vue-html-loader@^1.2.4:
loader-utils "^1.0.2"
object-assign "^4.1.0"

vue-loader@^15.0.11:
version "15.0.11"
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.0.11.tgz#b41dee864cdeb0012c8a2c02a66b13459e45e16e"
vue-loader@^15.2.0:
version "15.2.0"
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.2.0.tgz#5a8138e490a1040942d2f10ae68fa72b5a923364"
dependencies:
"@vue/component-compiler-utils" "^1.2.1"
hash-sum "^1.0.2"
Expand Down

0 comments on commit 5ad2481

Please sign in to comment.