11-17

rickyleung · Jul 24, 2019 · dbe3cef · dbe3cef
1 parent 7844abb
commit dbe3cef
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 213 deletions.
diff --git a/sourcecode/ts-base/README.md b/sourcecode/ts-base/README.md
diff --git a/sourcecode/ts-base/build/webpack.config.js b/sourcecode/ts-base/build/webpack.config.js
@@ -3,11 +3,6 @@ const baseConfig = require('./webpack.base.config')
 const devConfig = require('./webpack.dev.config')
 const proConfig = require('./webpack.pro.config')
 
-// Wrong!
-// let config = process.NODE_ENV === 'development' ? devConfig : proConfig
-// module.exports = merge(baseConfig, config)
+let config = process.NODE_ENV === 'development' ? devConfig : proConfig
 
-module.exports = (env, argv) => {
-    let config = argv.mode === 'development' ? devConfig : proConfig;
-    return merge(baseConfig, config);
-};
+module.exports = merge(baseConfig, config)
diff --git a/...ode/ts-base/src/part1.base/05.datatype.ts → ...ode/ts-base/src/part1.base/04.datatype.ts b/...ode/ts-base/src/part1.base/05.datatype.ts → ...ode/ts-base/src/part1.base/04.datatype.ts
diff --git a/sourcecode/ts-base/src/part1.base/06.enum.ts → sourcecode/ts-base/src/part1.base/05.enum.ts b/sourcecode/ts-base/src/part1.base/06.enum.ts → sourcecode/ts-base/src/part1.base/05.enum.ts
diff --git a/...ts-base/src/part1.base/07-08.interface.ts → ...ts-base/src/part1.base/06-07.interface.ts b/...ts-base/src/part1.base/07-08.interface.ts → ...ts-base/src/part1.base/06-07.interface.ts
diff --git a/...ode/ts-base/src/part1.base/09.function.ts → ...ode/ts-base/src/part1.base/08.function.ts b/...ode/ts-base/src/part1.base/09.function.ts → ...ode/ts-base/src/part1.base/08.function.ts
diff --git a/...ode/ts-base/src/part1.base/10-11.class.ts → ...ode/ts-base/src/part1.base/09-10.class.ts b/...ode/ts-base/src/part1.base/10-11.class.ts → ...ode/ts-base/src/part1.base/09-10.class.ts
diff --git a/...base/src/part1.base/12.class-interface.ts → ...base/src/part1.base/11.class-interface.ts b/...base/src/part1.base/12.class-interface.ts → ...base/src/part1.base/11.class-interface.ts
diff --git a/.../ts-base/src/part1.base/13-14.generics.ts → .../ts-base/src/part1.base/12-13.generics.ts b/.../ts-base/src/part1.base/13-14.generics.ts → .../ts-base/src/part1.base/12-13.generics.ts
diff --git a/sourcecode/ts-base/src/part1.base/15.inference.ts b/sourcecode/ts-base/src/part1.base/15.inference.ts
diff --git a/sourcecode/ts-base/src/part1.base/16.compatible.ts b/sourcecode/ts-base/src/part1.base/16.compatible.ts
diff --git a/sourcecode/ts-base/src/part1.base/17.guards.ts b/sourcecode/ts-base/src/part1.base/17.guards.ts