smaller text-polyfill, minor refactors

MartinKavik · Apr 13, 2019 · 83e4c10 · 83e4c10
1 parent f4e2d81
commit 83e4c10
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 30 deletions.
diff --git a/index.html b/index.html
@@ -8,6 +8,8 @@
     />
     <meta name="description" content="" />
     <title>My awesome project</title>
+    <!-- Because of Edge, see https://github.com/samthor/fast-text-encoding -->
+    <script type="text/javascript" src="static/text-polyfill.min.js"></script>
   </head>
   <body>
     <section id="app"></section>

diff --git a/package.json b/package.json
@@ -32,5 +32,6 @@
     "webpack": "^4.29.6",
     "webpack-cli": "^3.3.0",
     "webpack-dev-server": "^3.2.1"
-  }
+  },
+  "dependencies": {}
 }
diff --git a/static/text-polyfill.min.js b/static/text-polyfill.min.js
diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "esNext",
+    "lib": ["dom", "es2015"],
+    "strict": true,
+    "esModuleInterop": true,
+    "sourceMap": true,
+    "noImplicitAny": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noImplicitReturns": true,
+    "noImplicitThis": true,
+    "strictBindCallApply": true,
+    "allowJs": false,
+    "allowUnreachableCode": false,
+    "allowSyntheticDefaultImports": false,
+    "allowUnusedLabels": false,
+    "alwaysStrict": true,
+    "strictFunctionTypes": true,
+    "strictNullChecks": true,
+    "strictPropertyInitialization": true
+  }
+}
diff --git a/tsconfig.css_classes.json b/tsconfig.css_classes.json
@@ -0,0 +1,4 @@
+{
+  "extends": "./tsconfig.base",
+  "exclude": ["index.ts"]
+}
diff --git a/tsconfig.ignore_index_ts.json b/tsconfig.ignore_index_ts.json
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,24 +1,4 @@
 {
-  "compilerOptions": {
-    "target": "es5",
-    "module": "esNext",
-    "lib": ["dom", "es2015"],
-    "strict": true,
-    "esModuleInterop": true,
-    "sourceMap": true,
-    "noImplicitAny": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noImplicitReturns": true,
-    "noImplicitThis": true,
-    "strictBindCallApply": true,
-    "allowJs": false,
-    "allowUnreachableCode": false,
-    "allowSyntheticDefaultImports": false,
-    "allowUnusedLabels": false,
-    "alwaysStrict": true,
-    "strictFunctionTypes": true,
-    "strictNullChecks": true,
-    "strictPropertyInitialization": true
-  }
+  "extends": "./tsconfig.base",
+  "exclude": ["index.css_classes.ts"]
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -8,10 +8,11 @@ const CopyWebpackPlugin = require("copy-webpack-plugin");
 const CleanWebpackPlugin = require('clean-webpack-plugin');
 
 module.exports = {
-  entry: "./index.ts",
+  entry: {
+    app: "./index.ts"
+  },
   output: {
     path: dist,
-    filename: "bundle.js"
   },
   devServer: {
     contentBase: dist,
@@ -27,6 +28,8 @@ module.exports = {
     new WasmPackPlugin({
       crateDirectory: path.resolve(__dirname, "crate"),
     }),
+    // Uncomment if you have problems with Edge and polyfill in index.html isn't enough
+    //
     // Have this example work in Edge which doesn't ship `TextEncoder` or
     // `TextDecoder` at this time.
     // new webpack.ProvidePlugin({

diff --git a/webpack.css_classes.config.js b/webpack.css_classes.config.js
@@ -34,7 +34,7 @@ module.exports = {
       },
       {
         test: /\.ts$/,
-        loader: 'ts-loader?configFile=tsconfig.ignore_index_ts.json',
+        loader: 'ts-loader?configFile=tsconfig.css_classes.json',
       }, {
         test: /\.css$/,
         use: [