Skip to content

Commit d73d0e3

Browse files
committed
Update VueJsTypeScriptAspNetCoreSample project
1 parent c0bc8df commit d73d0e3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+268
-132
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,4 +252,4 @@ paket-files/
252252
*.sln.iml
253253

254254
src/**/src/**/*.js
255-
.vscode
255+
.vscode

src/VueJsTypeScriptAspNetCoreSample/.babelrc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
{
22
"presets": [
3-
["es2015", { "modules": false }],
3+
["latest", {
4+
"es2015": { "modules": false }
5+
}],
46
"stage-2"
57
],
68
"plugins": ["transform-runtime"],
79
"comments": false,
810
"env": {
911
"test": {
12+
"presets": ["latest", "stage-2"],
1013
"plugins": [ "istanbul" ]
1114
}
1215
}
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
build/*.js
22
config/*.js
3-
src/**/*.js

src/VueJsTypeScriptAspNetCoreSample/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
node_modules/
33
dist/
44
npm-debug.log
5+
yarn-error.log
56
test/unit/coverage
67
test/e2e/reports
78
selenium-debug.log
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// https://github.com/michael-ciniawsky/postcss-load-config
2+
3+
module.exports = {
4+
"plugins": {
5+
// to edit target browsers: use "browserlist" field in package.json
6+
"autoprefixer": {}
7+
}
8+
}

src/VueJsTypeScriptAspNetCoreSample/build/vue-loader.conf.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,5 @@ module.exports = {
88
? config.build.productionSourceMap
99
: config.dev.cssSourceMap,
1010
extract: isProduction
11-
}),
12-
postcss: [
13-
require('autoprefixer')({
14-
browsers: ['last 2 versions']
15-
})
16-
]
11+
})
1712
}

src/VueJsTypeScriptAspNetCoreSample/build/webpack.base.conf.js

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,33 +20,32 @@ module.exports = {
2020
},
2121
resolve: {
2222
extensions: ['.js', '.vue', '.json', '.ts'],
23-
modules: [
24-
resolve('src'),
25-
resolve('node_modules')
26-
],
2723
alias: {
28-
'vue$': 'vue/dist/vue.common.js',
29-
'src': resolve('src'),
30-
'assets': resolve('src/assets'),
31-
'components': resolve('src/components')
24+
'vue$': 'vue/dist/vue.esm.js',
25+
'@': resolve('src')
3226
}
3327
},
3428
module: {
3529
rules: [
36-
{
37-
test: /\.(js|vue)$/,
38-
loader: 'eslint-loader',
39-
enforce: 'pre',
40-
include: [resolve('src'), resolve('test')],
41-
options: {
42-
formatter: require('eslint-friendly-formatter')
43-
}
44-
},
30+
// {
31+
// test: /\.(js|vue)$/,
32+
// loader: 'eslint-loader',
33+
// enforce: "pre",
34+
// include: [resolve('src'), resolve('test')],
35+
// options: {
36+
// formatter: require('eslint-friendly-formatter')
37+
// }
38+
// },
4539
{
4640
test: /\.vue$/,
4741
loader: 'vue-loader',
4842
options: vueLoaderConfig
4943
},
44+
// {
45+
// test: /\.js$/,
46+
// loader: 'babel-loader',
47+
// include: [resolve('src'), resolve('test')]
48+
// },
5049
{
5150
test: /\.ts$/,
5251
loader: 'ts-loader',

src/VueJsTypeScriptAspNetCoreSample/config/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ var path = require('path')
44
module.exports = {
55
build: {
66
env: require('./prod.env'),
7-
index: path.resolve(__dirname, '../wwwroot/index.html'),
8-
assetsRoot: path.resolve(__dirname, '../wwwroot'),
7+
index: path.resolve(__dirname, '../dist/index.html'),
8+
assetsRoot: path.resolve(__dirname, '../dist'),
99
assetsSubDirectory: 'static',
1010
assetsPublicPath: '/',
1111
productionSourceMap: true,

src/VueJsTypeScriptAspNetCoreSample/package.json

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515
"lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs"
1616
},
1717
"dependencies": {
18-
"aspnet-webpack": "^1.0.27",
18+
"aspnet-webpack": "^1.0.28",
1919
"axios": "^0.15.3",
20-
"typescript": "^2.1.6",
21-
"vue": "^2.1.10",
22-
"vue-class-component": "^4.4.0",
20+
"vue": "^2.2.1",
21+
"vue-class-component": "^5.0.0",
2322
"vue-router": "^2.2.0"
2423
},
2524
"devDependencies": {
@@ -29,7 +28,7 @@
2928
"babel-loader": "^6.2.10",
3029
"babel-plugin-istanbul": "^3.1.2",
3130
"babel-plugin-transform-runtime": "^6.22.0",
32-
"babel-preset-es2015": "^6.22.0",
31+
"babel-preset-latest": "^6.22.0",
3332
"babel-preset-stage-2": "^6.22.0",
3433
"babel-register": "^6.22.0",
3534
"chai": "^3.5.0",
@@ -49,7 +48,7 @@
4948
"eslint-plugin-standard": "^2.0.1",
5049
"eventsource-polyfill": "^0.9.6",
5150
"express": "^4.14.1",
52-
"extract-text-webpack-plugin": "^2.0.0-rc.3",
51+
"extract-text-webpack-plugin": "^2.0.0",
5352
"file-loader": "^0.10.0",
5453
"friendly-errors-webpack-plugin": "^1.1.3",
5554
"function-bind": "^1.1.0",
@@ -78,9 +77,9 @@
7877
"sinon-chai": "^2.8.0",
7978
"ts-loader": "^2.0.1",
8079
"url-loader": "^0.5.7",
81-
"vue-loader": "^11.0.0",
80+
"vue-loader": "^11.1.4",
8281
"vue-style-loader": "^2.0.0",
83-
"vue-template-compiler": "^2.1.10",
82+
"vue-template-compiler": "^2.2.1",
8483
"vue-typescript-import-dts": "^3.0.1",
8584
"webpack": "^2.2.1",
8685
"webpack-bundle-analyzer": "^2.2.1",
@@ -91,5 +90,10 @@
9190
"engines": {
9291
"node": ">= 4.0.0",
9392
"npm": ">= 3.0.0"
94-
}
93+
},
94+
"browserlist": [
95+
"> 1%",
96+
"last 2 versions",
97+
"not ie <= 8"
98+
]
9599
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import * as Vue from "vue";
1+
import Vue from "vue";
22
import Component from "vue-class-component";
33

44
@Component({
5-
name: "App",
5+
name: "App"
66
})
77
export default class App extends Vue {
8-
}
8+
}

0 commit comments

Comments
 (0)