use babel-preset-typescript instead of awesome-typescript-loader

one-more · Sep 4, 2019 · 9d80884 · 9d80884
1 parent 7b3405e
commit 9d80884
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 25 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,10 @@
+{
+    "presets": [
+        "@babel/env",
+        "@babel/preset-typescript"
+    ],
+    "plugins": [
+        "@babel/proposal-class-properties",
+        "@babel/proposal-object-rest-spread"
+    ]
+}
diff --git a/package.json b/package.json
@@ -3,9 +3,13 @@
   "private": false,
   "devDependencies": {
     "@babel/core": "^7.5.5",
+    "@babel/plugin-proposal-class-properties": "^7.5.5",
+    "@babel/plugin-proposal-object-rest-spread": "^7.5.5",
     "@babel/preset-env": "^7.5.5",
+    "@babel/preset-typescript": "^7.3.3",
     "@types/react": "^16.9.2",
-    "awesome-typescript-loader": "^5.2.1",
+    "@types/react-dom": "^16.9.0",
+    "babel-loader": "^8.0.6",
     "clean-webpack-plugin": "^3.0.0",
     "lerna": "^3.15.0",
     "typescript": "^3.6.2",

diff --git a/packages/core/.babelrc b/packages/core/.babelrc
@@ -0,0 +1,3 @@
+{
+  "extends": "../../.babelrc"
+}
diff --git a/packages/framework/.babelrc b/packages/framework/.babelrc
@@ -0,0 +1,3 @@
+{
+  "extends": "../../.babelrc"
+}
diff --git a/packages/framework/dependencies.d.ts b/packages/framework/dependencies.d.ts
@@ -12,14 +12,6 @@ declare module '@micro-frontends/core' {
     function store<T>(key: StorageKey, value: T): void;
 }
 
-declare module react {
-    interface ReactElement {}
-}
-
-declare module 'react-dom' {
-    function render(element: react.ReactElement, container: Element): void;
-}
-
 declare module 'vue' {
     interface VueConstructor {}
     export default class Vue {

diff --git a/packages/framework/package.json b/packages/framework/package.json
@@ -7,7 +7,9 @@
     "build": "webpack --config webpack.config.js && tsc --declaration --outDir dist/ --emitDeclarationOnly",
     "prepublish": "build"
   },
-  "keywords": ["micro-frontends"],
+  "keywords": [
+    "micro-frontends"
+  ],
   "author": "one-more",
   "contributors": [
     "master-7"
@@ -19,8 +21,5 @@
     "react-dom": "^16.8.6",
     "vue": "^2.6.10"
   },
-  "dependencies": {
-    "styled-components": "^4.3.1"
-  },
   "gitHead": "1649eb321d10c42b3136961c9a34edf4b57c894a"
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -2,22 +2,11 @@ const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 
 module.exports = {
     mode: 'production',
-
     module: {
         rules: [
             {
                 test: /\.ts$/,
-                loader: "awesome-typescript-loader",
-                options: {
-                    "useBabel": true,
-                    "babelOptions": {
-                        "babelrc": true,
-                        "presets": [
-                            ["@babel/preset-env", { "targets": "last 2 versions, ie 11", "modules": false }]
-                        ]
-                    },
-                    "babelCore": "@babel/core",
-                }
+                loader: "babel-loader",
             },
         ]
     },