Skip to content

Commit

Permalink
feat: support Vue Loader v15
Browse files Browse the repository at this point in the history
Close #135
  • Loading branch information
develar committed May 8, 2018
1 parent c0cc228 commit f64ee27
Show file tree
Hide file tree
Showing 8 changed files with 361 additions and 137 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
jobs:
build:
docker:
- image: circleci/node:8.10.0
- image: circleci/node:10
environment:
JEST_JUNIT_OUTPUT: ./test-reports/test.xml
steps:
Expand Down
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "MIT",
"author": "Vladimir Krivosheev <develar@gmail.com>",
"scripts": {
"compile": "ts-babel packages/electron-webpack test && yarn schema",
"compile": "cross-env BABEL_WORKAROUND2=true ts-babel packages/electron-webpack test && yarn schema",
"lint": "tslint -c ./node_modules/electron-builder-tslint-config/tslint.json -p packages/electron-webpack --exclude '**/*.js'",
"release": "BABEL_ENV=production yarn compile && ./npm-publish.sh && conventional-changelog -p angular -i CHANGELOG.md -s",
"test": "yarn compile && yarn lint && jest",
Expand All @@ -19,13 +19,13 @@
"@types/electron-devtools-installer": "^2.0.3",
"@types/jest": "^22.2.3",
"@types/memory-fs": "^0.3.0",
"@types/node": "^10.0.0",
"@types/node": "^10.0.4",
"@types/semver": "^5.5.0",
"@types/webpack": "^4.1.4",
"babel-preset-ts-node6-bluebird": "^2.0.5",
"develar-typescript-json-schema": "^0.20.0",
"electron-builder-tslint-config": "^1.1.0",
"fs-extra-p": "^4.5.2",
"fs-extra-p": "^4.6.0",
"gitbook-plugin-analytics": "^0.2.1",
"gitbook-plugin-edit-link": "^2.0.2",
"gitbook-plugin-github": "^3.0.0",
Expand All @@ -34,11 +34,12 @@
"jest-cli": "^23.0.0-beta.2",
"jest-junit": "^3.7.0",
"memory-fs": "^0.4.1",
"temp-file": "^3.1.1",
"ts-babel": "^5.0.3",
"tslint": "^5.9.1",
"temp-file": "^3.1.2",
"ts-babel": "^5.0.4",
"tslint": "^5.10.0",
"typescript": "^2.8.3",
"webpack": "^4.6.0"
"webpack": "^4.8.1",
"cross-env": "^5.1.4"
},
"babel": {
"presets": [
Expand Down
4 changes: 2 additions & 2 deletions packages/electron-webpack-ts/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "electron-webpack-ts",
"version": "2.0.1",
"version": "2.0.2",
"license": "MIT",
"author": "Vladimir Krivosheev <develar@gmail.com>",
"files": [],
"repository": "electron-userland/electron-webpack",
"dependencies": {
"fork-ts-checker-webpack-plugin": "^0.4.1",
"ts-loader": "^4.2.0"
"ts-loader": "^4.3.0"
},
"peerDependencies": {
"typescript": "^2.8.3"
Expand Down
4 changes: 2 additions & 2 deletions packages/electron-webpack-vue/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "electron-webpack-vue",
"version": "2.1.1",
"version": "2.1.2",
"license": "MIT",
"author": "Vladimir Krivosheev <develar@gmail.com>",
"files": [],
"repository": "electron-userland/electron-webpack",
"dependencies": {
"vue-class-component": "^6.2.0",
"vue-html-loader": "^1.2.4",
"vue-loader": "^15.0.4",
"vue-loader": "^15.0.9",
"vue-style-loader": "^4.1.0",
"vue-template-compiler": "^2.5.16"
}
Expand Down
10 changes: 5 additions & 5 deletions packages/electron-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,24 @@
"css-hot-loader": "^1.3.9",
"css-loader": "^0.28.11",
"debug": "^3.1.0",
"electron-devtools-installer": "^2.2.3",
"electron-devtools-installer": "^2.2.4",
"electron-webpack-js": "~2.0.2",
"mini-css-extract-plugin": "^0.4.0",
"file-loader": "^1.1.11",
"fs-extra-p": "^4.5.2",
"fs-extra-p": "^4.6.0",
"html-loader": "^1.0.0-alpha.0",
"html-webpack-plugin": "^3.2.0",
"lazy-val": "^1.0.3",
"node-loader": "^0.6.0",
"read-config-file": "^3.0.0",
"read-config-file": "^3.0.1",
"semver": "^5.5.0",
"source-map-support": "^0.5.5",
"style-loader": "^0.21.0",
"url-loader": "^1.0.1",
"webpack-dev-server": "^3.1.3",
"webpack-dev-server": "^3.1.4",
"webpack-merge": "^4.1.2",
"yargs": "^11.1.0",
"webpack-cli": "^2.0.15"
"webpack-cli": "^2.1.3"
},
"devDependencies": {
"@types/webpack-merge": "^4.1.3"
Expand Down
4 changes: 3 additions & 1 deletion packages/electron-webpack/src/configurators/vue/vue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ export function configureVueRenderer(configurator: WebpackConfigurator) {
use: {
loader: "vue-loader",
options: {
extractCSS: configurator.isProduction,
loaders: {
sass: "vue-style-loader!css-loader!sass-loader?indentedSyntax=1",
scss: "vue-style-loader!css-loader!sass-loader",
Expand All @@ -41,4 +40,7 @@ export function configureVueRenderer(configurator: WebpackConfigurator) {
}
},
)

const VueLoaderPlugin = require("vue-loader/lib/plugin")
configurator.plugins.push(new VueLoaderPlugin())
}
90 changes: 45 additions & 45 deletions test/out/__snapshots__/test.js.snap

Large diffs are not rendered by default.

Loading

0 comments on commit f64ee27

Please sign in to comment.