From c42ba283a275b351c312e78c1ee3da2b63f83c73 Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Thu, 21 Mar 2019 00:07:21 +0900 Subject: [PATCH] refs #850 Add tsconfig and build tsfile --- .electron-vue/webpack.main.config.js | 7 ++- .electron-vue/webpack.renderer.config.js | 15 +++++- package-lock.json | 13 ++++++ package.json | 1 + src/renderer/{main.js => main.ts} | 4 +- src/renderer/type.d.ts | 2 + tsconfig.json | 59 ++++++++++++++++++++++++ 7 files changed, 96 insertions(+), 5 deletions(-) rename src/renderer/{main.js => main.ts} (92%) create mode 100644 src/renderer/type.d.ts create mode 100644 tsconfig.json diff --git a/.electron-vue/webpack.main.config.js b/.electron-vue/webpack.main.config.js index 12b29401..182e23a6 100644 --- a/.electron-vue/webpack.main.config.js +++ b/.electron-vue/webpack.main.config.js @@ -29,6 +29,11 @@ let mainConfig = { } } }, + { + test: /\.ts$/, + exclude: /node_modules/, + loader: 'ts-loader' + }, { test: /\.js$/, use: 'babel-loader', @@ -60,7 +65,7 @@ let mainConfig = { ]) ], resolve: { - extensions: ['.js', '.json', '.node'] + extensions: ['.js', '.json', '.node', '.ts'] }, target: 'electron-main' } diff --git a/.electron-vue/webpack.renderer.config.js b/.electron-vue/webpack.renderer.config.js index 99bcba11..07d45ad6 100644 --- a/.electron-vue/webpack.renderer.config.js +++ b/.electron-vue/webpack.renderer.config.js @@ -24,7 +24,7 @@ let whiteListedModules = ['vue'] let rendererConfig = { devtool: '#cheap-module-eval-source-map', entry: { - renderer: path.join(__dirname, '../src/renderer/main.js') + renderer: path.join(__dirname, '../src/renderer/main.ts') }, externals: [ ...Object.keys(dependencies || {}).filter(d => !whiteListedModules.includes(d)) @@ -62,6 +62,17 @@ let rendererConfig = { test: /\.html$/, use: 'vue-html-loader' }, + { + test: /\.ts$/, + exclude: /node_modules/, + loader: 'ts-loader', + options: { + appendTsSuffixTo: [/\.vue$/] + }, + include: [ + path.resolve('../node_modules/vue-awesome') + ] + }, { test: /\.js$/, use: 'babel-loader', @@ -148,7 +159,7 @@ let rendererConfig = { '~': path.join(__dirname, '../'), 'vue$': 'vue/dist/vue.esm.js' }, - extensions: ['.js', '.vue', '.json', '.css', '.node'] + extensions: ['.js', '.vue', '.json', '.css', '.node', '.ts'] }, target: 'electron-renderer' } diff --git a/package-lock.json b/package-lock.json index 80bdb901..9a8468e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19106,6 +19106,19 @@ "utf8-byte-length": "1.0.4" } }, + "ts-loader": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-5.3.3.tgz", + "integrity": "sha512-KwF1SplmOJepnoZ4eRIloH/zXL195F51skt7reEsS6jvDqzgc/YSbz9b8E07GxIUwLXdcD4ssrJu6v8CwaTafA==", + "dev": true, + "requires": { + "chalk": "2.4.1", + "enhanced-resolve": "4.1.0", + "loader-utils": "1.1.0", + "micromatch": "3.1.10", + "semver": "5.5.0" + } + }, "tslib": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", diff --git a/package.json b/package.json index f4574ab0..f13aa97b 100644 --- a/package.json +++ b/package.json @@ -209,6 +209,7 @@ "style-loader": "^0.23.1", "stylelint": "^9.9.0", "stylelint-config-standard": "^18.2.0", + "ts-loader": "^5.3.3", "ttfinfo": "^0.2.0", "url-loader": "^1.1.2", "vue-html-loader": "^1.2.4", diff --git a/src/renderer/main.js b/src/renderer/main.ts similarity index 92% rename from src/renderer/main.js rename to src/renderer/main.ts index 12596f36..37d9d73d 100644 --- a/src/renderer/main.js +++ b/src/renderer/main.ts @@ -4,7 +4,7 @@ import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' import locale from 'element-ui/lib/locale/lang/en' import 'vue-awesome/icons' -import Icon from 'vue-awesome/components/Icon' +import Icon from 'vue-awesome/components/Icon.vue' import Popper from 'vue-popperjs' import 'vue-popperjs/dist/css/vue-popper.css' import { sync } from 'vuex-router-sync' @@ -12,7 +12,7 @@ import shortkey from 'vue-shortkey' import VueI18Next from '@panter/vue-i18next' import './assets/fonts/fonts.css' -import App from './App' +import App from './App.vue' import router from './router' import store from './store' import i18next from '~/src/config/i18n' diff --git a/src/renderer/type.d.ts b/src/renderer/type.d.ts new file mode 100644 index 00000000..444e34cb --- /dev/null +++ b/src/renderer/type.d.ts @@ -0,0 +1,2 @@ +declare module 'element-ui' +declare module 'element-ui/lib/locale/lang/en' diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 00000000..f079cf0f --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,59 @@ +{ + "compilerOptions": { + /* Basic Options */ + "target": "es2015", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */ + "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */ + "lib": ["es6"], /* Specify library files to be included in the compilation. */ + // "allowJs": true, /* Allow javascript files to be compiled. */ + // "checkJs": true, /* Report errors in .js files. */ + // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */ + "declaration": true, /* Generates corresponding '.d.ts' file. */ + // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ + "sourceMap": true, /* Generates corresponding '.map' file. */ + // "outFile": "./", /* Concatenate and emit output to single file. */ + // "outDir": "./lib", /* Redirect output structure to the directory. */ + // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ + // "composite": true, /* Enable project compilation */ + "removeComments": false, /* Do not emit comments to output. */ + // "noEmit": true, /* Do not emit outputs. */ + // "importHelpers": true, /* Import emit helpers from 'tslib'. */ + "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */ + // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ + + /* Strict Type-Checking Options */ + "strict": true, /* Enable all strict type-checking options. */ + "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ + "strictNullChecks": true, /* Enable strict null checks. */ + "strictFunctionTypes": true, /* Enable strict checking of function types. */ + "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */ + "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ + "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ + + /* Additional Checks */ + "noUnusedLocals": true, /* Report errors on unused locals. */ + "noUnusedParameters": true, /* Report errors on unused parameters. */ + "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ + "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ + + /* Module Resolution Options */ + "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ + // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ + // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ + // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ + "typeRoots": ["./types"], /* List of folders to include type definitions from. */ + // "types": [], /* Type declaration files to be included in compilation. */ + // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ + "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ + // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ + + /* Source Map Options */ + // "sourceRoot": "./", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ + // "mapRoot": "./", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */ + // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */ + + /* Experimental Options */ + // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */ + // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ + } +}