-
Notifications
You must be signed in to change notification settings - Fork 115
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #27 from qm3ster/update-1.3.0
Merging since since I applied the "alternative fix" and it currently works even for users of npm on the first try. If this issue is resolved, 814fb80 should be reverted.
- Loading branch information
Showing
12 changed files
with
69 additions
and
66 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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
import axios from "~plugins/axios" | ||
import axios from '~/plugins/axios' | ||
|
||
export const getPeople = async (total = 10) => | ||
(await axios.get('/random-data.json')).data.slice(0, total) | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
declare module '*.vue' { | ||
import Vue from 'vue' | ||
const _default: Vue; | ||
export default _default; | ||
const _default: Vue | ||
export default _default | ||
} |
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 |
---|---|---|
@@ -0,0 +1,32 @@ | ||
module.exports = function() { | ||
// Add .ts extension for store, middleware and more | ||
this.nuxt.options.extensions.push('ts') | ||
// Extend build | ||
this.extendBuild(config => { | ||
const tsLoader = { | ||
loader: 'ts-loader', | ||
options: { | ||
appendTsSuffixTo: [/\.vue$/] | ||
} | ||
} | ||
// Add TypeScript loader | ||
config.module.rules.push( | ||
Object.assign( | ||
{ | ||
test: /((client|server)\.js)|(\.tsx?)$/ | ||
}, | ||
tsLoader | ||
) | ||
) | ||
// Add TypeScript loader for vue files | ||
for (let rule of config.module.rules) { | ||
if (rule.loader === 'vue-loader') { | ||
rule.options.loaders.ts = tsLoader | ||
} | ||
} | ||
// Add .ts extension in webpack resolve | ||
if (config.resolve.extensions.indexOf('.ts') === -1) { | ||
config.resolve.extensions.push('.ts') | ||
} | ||
}) | ||
} |
This file was deleted.
Oops, something went wrong.
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
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