diff --git a/package.json b/package.json index acccd41c0406784a5c0846bd773f0c5aabd68ae7..0e79b8e8c84220da89481af693bd4e59b78c86d5 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,8 @@ "dev": "cross-env BUILD_ENV=development PROXY_ENV=development ENV=development father doc dev", "build": "umi-lib build", "lint:ts": "tslint \"src/**/*.ts\" \"src/**/*.tsx\"", - "precommit": "lint-staged:ts" + "precommit": "lint-staged:ts", + "start": "webpack" }, "peerDependencies": { "react": "16.x" @@ -21,6 +22,7 @@ "devDependencies": { "@babel/core": "^7.7.7", "@babel/preset-env": "^7.7.7", + "@types/core-js": "^2.5.2", "@types/react": "^16.9.13", "@types/react-dom": "^16.9.4", "af-webpack": "^1.14.4", @@ -28,6 +30,7 @@ "babel-loader": "^8.0.6", "babel-plugin-import": "^1.13.0", "babel-preset-env": "^1.7.0", + "clean-webpack-plugin": "^3.0.0", "cross-env": "^6.0.3", "css-loader": "^3.3.0", "docz": "^2.0.0-rc.76", diff --git a/test/index.html b/src/index.html similarity index 100% rename from test/index.html rename to src/index.html diff --git a/src/test/index.tsx b/src/test/index.tsx new file mode 100644 index 0000000000000000000000000000000000000000..f94ebc194a5c5a7d5f42091ddacbf8ceb4f1f674 --- /dev/null +++ b/src/test/index.tsx @@ -0,0 +1,5 @@ +import React from 'react'; +import { render } from 'react-dom'; +import ApolloTable from '../src/apollo-table'; + +render(hh, document.getElementById('root')); diff --git a/test/aa.js b/test/aa.js deleted file mode 100644 index f785eac31e7bbd674d03158975cb737f038a2501..0000000000000000000000000000000000000000 --- a/test/aa.js +++ /dev/null @@ -1,7 +0,0 @@ -const a = 111; -const t = (e) => { - return e.toFixed(2); -}; -const temp = t(a); -console.log(temp); -export default t; diff --git a/test/index.tsx b/test/index.tsx deleted file mode 100644 index 8afc3ab6b0b48c7605f01c10dd20790b685fe103..0000000000000000000000000000000000000000 --- a/test/index.tsx +++ /dev/null @@ -1,7 +0,0 @@ -// import React from 'react'; -// import { render } from 'react-dom'; -// import ApolloTable from '../src/apollo-table'; -// -// render(hh, document.getElementById('root')); -import t from './aa'; -console.log(t(56)); diff --git a/tsconfig.json b/tsconfig.json index f42a1aef94cd07ff863f02cf6bac4422d0135f7e..8bd432604f2103b3bff6580de7be705cbbae1598 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,18 +1,71 @@ { - "compilerOptions": { - "target": "esnext", - "module": "esnext", - "moduleResolution": "node", - "importHelpers": true, - "jsx": "react", - "esModuleInterop": true, - "sourceMap": true, - "baseUrl": ".", - "strict": true, - "paths": { - "@/*": ["src/*"] - }, - "allowSyntheticDefaultImports": true - }, - "exclude": ["node_modules"] + "compilerOptions": { + /* Basic Options */ + // "incremental": true, /* Enable incremental compilation */ + "target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */ + "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */ + "lib": [ + "es2016", + "dom" + ], /* 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": false, /* 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": "./dist", /* Redirect output structure to the directory. */ +// "rootDir": "./test", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ + // "composite": true, /* Enable project compilation */ + // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ + "removeComments": true, /* 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": false, /* 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. */ + // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ + // "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": [ + "node_modules/@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. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + + /* 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. */ + + /* Advanced Options */ + "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ + } } diff --git a/typings.d.ts b/typings.d.ts index 4cb75c3397375f692d0479766f399eeb88cbdf57..1109a88e28db415d69950f0986623a1c10f8cd45 100644 --- a/typings.d.ts +++ b/typings.d.ts @@ -1,10 +1,14 @@ declare module '*.css'; declare module "*.png"; declare module "*.less"; -declare module "react"; -declare module "react-virtualized"; -declare module "lodash"; -declare module "antd"; -declare module "@/apollo-table" -declare module "js-cookie" -declare module "@/*" +declare module '@/ant_components/*'; +declare module '@/*'; +declare module 'memoize-one'; +declare module 'classnames'; +declare module 'file-saver'; +declare module 'sha256'; +declare module 'sockjs-client'; +declare module 'stompjs'; +declare module 'js-cookie'; +declare module 'mockjs'; +declare module 'lodash'; diff --git a/webpack.config.js b/webpack.config.js index 3670ffad9be9eb9993c84d1075157e0a1d917905..31f088cf4fe90a5d2322d750070bd9cafd36dc1c 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,5 +1,6 @@ const path = require('path'); const HtmlWebpackPlugin = require('html-webpack-plugin'); +const { CleanWebpackPlugin } = require('clean-webpack-plugin'); const webpack = require('webpack'); // 根据API_ENV环境不同分为debugger开发代理(api),development为使用dev的api,production为使用线上api function getIp() { @@ -26,10 +27,9 @@ const proxyHost = { }; const proxy_env = proxyHost[process.env.PROXY_ENV]; - module.exports = { mode: 'development', - entry: './test/index.tsx', + entry: './src/test/index.tsx', output: { filename: '[name].js', path: path.join(__dirname, 'dist'), @@ -44,14 +44,12 @@ module.exports = { rules: [ { test: /\.tsx?$/, - include: [path.resolve(__dirname, 'src'), path.resolve(__dirname, 'test')], - use: [ - 'ts-loader', - ], + include: [path.resolve(__dirname, 'src')], + use: ['ts-loader'], }, { test: /\.jsx?$/, - include: [path.resolve(__dirname, 'src'), path.resolve(__dirname, 'test')], + include: [path.resolve(__dirname, 'src')], use: [ { loader: 'babel-loader', @@ -63,7 +61,7 @@ module.exports = { }, { test: /\.less$/, - include: [path.resolve(__dirname, 'src'), path.resolve(__dirname, 'test')], + include: [path.resolve(__dirname, 'src')], use: [ 'style-loader', { @@ -87,12 +85,11 @@ module.exports = { ], }, plugins: [ + new webpack.ProgressPlugin(), + new CleanWebpackPlugin(), new HtmlWebpackPlugin({ filename: 'index.html', - template: './test/index.html', - }), - new webpack.HotModuleReplacementPlugin({ - // Options... + template: './src/index.html', }), ], devServer: {