Skip to content

Commit

Permalink
some typos fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
qazbnm456 committed Jul 18, 2017
1 parent 52ca18d commit 4f0f305
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 27 deletions.
15 changes: 8 additions & 7 deletions package.json
@@ -1,7 +1,7 @@
{
"name": "lulumi-browser",
"productName": "Lulumi-browser",
"version": "1.3.2",
"version": "1.3.3",
"electronVersion": "1.7.4",
"description": "Lulumi-browser is a light weight browser coded with vue and electron",
"main": "./dist/main.js",
Expand All @@ -13,8 +13,9 @@
"build:mas": "cross-env BUILD_TARGET=mas node .electron-vue/build.js",
"build:win32": "cross-env BUILD_TARGET=win32 node .electron-vue/build.js",
"dev": "node .electron-vue/dev-runner.js",
"lint": "tslint -c tslint.json -e src/typings/**/*.ts src/**/*.ts helper/**/*.ts",
"lint:fix": "tslint -c tslint.json -e src/typings/**/*.ts --fix src/**/*.ts helper/**/*.ts",
"fmt": "tsfmt -r",
"lint": "yarn run fmt && tslint -c tslint.json -e src/typings/**/*.ts src/**/*.ts helper/**/*.ts",
"lint:fix": "yarn run fmt && tslint -c tslint.json -e src/typings/**/*.ts --fix src/**/*.ts helper/**/*.ts",
"pack": "yarn run pack:main && yarn run pack:renderer",
"pack:main": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js",
"pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js",
Expand All @@ -38,7 +39,7 @@
"strip-css-comments": "^3.0.0",
"vue": "^2.3.4",
"vue-electron": "^1.0.6",
"vue-i18n": "^7.0.4",
"vue-i18n": "^7.0.5",
"vue-router": "^2.6.0",
"vuex": "^2.3.1"
},
Expand Down Expand Up @@ -73,7 +74,7 @@
"eslint-import-resolver-webpack": "^0.8.3",
"eslint-loader": "^1.9.0",
"eslint-plugin-html": "^3.0.0",
"eslint-plugin-import": "^2.6.1",
"eslint-plugin-import": "^2.7.0",
"extract-text-webpack-plugin": "^2.1.2",
"file-loader": "^0.11.2",
"git-rev-sync": "^1.9.1",
Expand Down Expand Up @@ -119,8 +120,8 @@
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.3.4",
"webpack": "^2.6.1",
"webpack-dev-server": "^2.5.0",
"webpack-hot-middleware": "^2.18.1",
"webpack-dev-server": "^2.5.1",
"webpack-hot-middleware": "^2.18.2",
"webpack-merge": "^4.1.0",
"@types/chrome": "^0.0.47",
"@types/mocha": "^2.2.41",
Expand Down
24 changes: 24 additions & 0 deletions src/typings/webpack-hot-middleware.d.ts
@@ -0,0 +1,24 @@
// Type definitions for webpack-hot-middleware 2.15
// Project: https://github.com/glenjamin/webpack-hot-middleware#readme
// Definitions by: Benjamin Lim <https://github.com/bumbleblym>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

import { NextHandleFunction } from 'connect';
import { compiler } from 'webpack';

export = WebpackHotMiddleware;

declare function WebpackHotMiddleware(
compiler: compiler.Compiler,
options?: WebpackHotMiddleware.Options
): NextHandleFunction;

declare namespace WebpackHotMiddleware {
interface Options {
log?: false | Logger;
path?: string;
heartbeat?: number;
}

type Logger = (message?: any, ...optionalParams: any[]) => void;
}
9 changes: 9 additions & 0 deletions tsconfig.json
@@ -0,0 +1,9 @@
{
"include": [
"./src/**/*",
"./helper/**/*"
],
"exclude":[
"./src/typings/*"
]
}
17 changes: 17 additions & 0 deletions tsfmt.json
@@ -0,0 +1,17 @@
{
"tabSize": 2,
"indentSize": 2,
"newLineCharacter": "\n",
"convertTabsToSpaces": true,
"insertSpaceAfterCommaDelimiter": true,
"insertSpaceAfterSemicolonInForStatements": true,
"insertSpaceBeforeAndAfterBinaryOperators": true,
"insertSpaceAfterKeywordsInControlFlowStatements": true,
"insertSpaceAfterFunctionKeywordForAnonymousFunctions": true,
"insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false,
"insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,
"insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": false,
"insertSpaceBeforeFunctionParenthesis": false,
"placeOpenBraceOnNewLineForFunctions": false,
"placeOpenBraceOnNewLineForControlBlocks": false
}
30 changes: 10 additions & 20 deletions yarn.lock
Expand Up @@ -3238,16 +3238,16 @@ eslint-plugin-html@^3.0.0:
dependencies:
htmlparser2 "^3.8.2"

eslint-plugin-import@^2.6.1:
version "2.6.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.6.1.tgz#f580be62bb809421d46e338372764afcc9f59bf6"
eslint-plugin-import@^2.7.0:
version "2.7.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.7.0.tgz#21de33380b9efb55f5ef6d2e210ec0e07e7fa69f"
dependencies:
builtin-modules "^1.1.1"
contains-path "^0.1.0"
debug "^2.6.8"
doctrine "1.5.0"
eslint-import-resolver-node "^0.3.1"
eslint-module-utils "^2.0.0"
eslint-module-utils "^2.1.1"
has "^1.0.1"
lodash.cond "^4.3.0"
minimatch "^3.0.3"
Expand Down Expand Up @@ -4538,15 +4538,6 @@ is-lower-case@^1.1.0:
dependencies:
lower-case "^1.1.0"

is-my-json-valid@^2.16.0:
version "2.16.0"
resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
dependencies:
generate-function "^2.0.0"
generate-object-property "^1.1.0"
jsonpointer "^4.0.0"
xtend "^4.0.0"

is-npm@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
Expand Down Expand Up @@ -8486,9 +8477,9 @@ vue-html-loader@^1.2.4:
loader-utils "^1.0.2"
object-assign "^4.1.0"

vue-i18n@^7.0.4:
version "7.0.4"
resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-7.0.4.tgz#4ab5e4c6a950118ce0cc0c18e79bd77bede72e67"
vue-i18n@^7.0.5:
version "7.0.5"
resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-7.0.5.tgz#f603962bff98a75f75ef1d46d26ecc8551ea68cf"

vue-loader@^12.2.1:
version "12.2.1"
Expand Down Expand Up @@ -8638,13 +8629,12 @@ webpack-dev-server@^2.5.1:
webpack-dev-middleware "^1.11.0"
yargs "^6.0.0"

webpack-hot-middleware@^2.18.1:
version "2.18.1"
resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.18.1.tgz#8b7f4f17a058974213e5058cc861da281506a8a9"
webpack-hot-middleware@^2.18.2:
version "2.18.2"
resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.18.2.tgz#84dee643f037c3d59c9de142548430371aa8d3b2"
dependencies:
ansi-html "0.0.7"
html-entities "^1.2.0"
path-browserify "0.0.0"
querystring "^0.2.0"
strip-ansi "^3.0.0"

Expand Down

0 comments on commit 4f0f305

Please sign in to comment.