WIP: Update to Webpack 4 and Babel 7 (#835)

* Update to Webpack 4 and Babel 7 * Update karma tests * Update browserlist, fix tests, remove all requires * Update karma browserlist query * Update webpack externals * remove gulp and serve * Fix webpack for karma * Fix test externals
futurepress · Jun 5, 2020 · cb4facb · cb4facb
1 parent 50fcbb2
commit cb4facb
Show file tree

Hide file tree

Showing 24 changed files with 11,339 additions and 15,001 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/.babelrc.json b/.babelrc.json
@@ -0,0 +1,11 @@
+{
+	"presets": [
+		["@babel/preset-env", {
+			"targets": "last 2 Chrome versions, last 2 Safari versions, last 2 ChromeAndroid versions, last 2 iOS versions, last 2 Firefox versions, last 2 Edge versions",
+			"corejs": 3,
+			"useBuiltIns": "usage",
+			"bugfixes": true,
+			"modules": "auto"
+		}]
+	],
+}
diff --git a/bower.json b/bower.json
@@ -15,7 +15,7 @@
     "epub"
   ],
   "license": "MIT",
-  "homepage": "futurepress.org",
+  "homepage": "http://futurepress.org",
   "ignore": [
     "**/.*",
     "node_modules",
@@ -27,11 +27,13 @@
   ],
   "dependencies": {
     "event-emitter": "^0.3.5",
-    "jszip": "^3.1.5",
-    "lodash": "^4.17.4",
-    "marks-pane": "^1.0.7",
+    "jszip": "^3.4.0",
+    "localforage": "^1.7.3",
+    "lodash": "^4.17.15",
+    "marks-pane": "^1.0.9",
     "path-webpack": "0.0.3",
-    "stream-browserify": "^2.0.1",
-    "xmldom": "^0.1.27"
+    "stream-browserify": "^3.0.0",
+    "url-polyfill": "^1.1.9",
+    "xmldom": "^0.3.0"
   }
 }
diff --git a/gulpfile.js b/gulpfile.js
diff --git a/karma.conf.js b/karma.conf.js
@@ -1,5 +1,10 @@
-// Karma configuration
-// Generated on Wed Oct 26 2016 10:56:59 GMT+0200 (CEST)
+let webpackConfig = require("./webpack.config.js");
+webpackConfig.mode = "development";
+webpackConfig.externals = {};
+webpackConfig.module.rules.push({
+  test: /\.xhtml$/i,
+  use: 'raw-loader',
+});
 
 module.exports = function(config) {
   config.set({
@@ -19,10 +24,10 @@ module.exports = function(config) {
       {pattern: 'src/*.js', watched: true, included: false, served: false},
 
       {pattern: 'test/*.js', watched: false},
-      // {pattern: 'test/**/*.js', watched: false}
+
       {pattern: 'test/fixtures/**/*', watched: false, included: false, served: true},
 
-      {pattern: 'node_modules/jszip/dist/jszip.js', watched: false, included: true, served: true},
+      // {pattern: 'node_modules/jszip/dist/jszip.js', watched: false, included: true, served: true},
 
       // {pattern: 'node_modules/es6-promise/dist/es6-promise.auto.js', watched: false, included: true, served: true},
 
@@ -43,34 +48,39 @@ module.exports = function(config) {
       // 'test/**/*.js': ['webpack', 'sourcemap']
     },
 
-    webpack:{
-      externals: {
-        "jszip": "JSZip"
-        // "xmldom": "xmldom"
-      },
-      devtool: 'inline-source-map',
-      resolve: {
-        alias: {
-          path: "path-webpack"
-        }
-      },
-      module: {
-        loaders: [
-          {
-            test: /\.js$/,
-            exclude: /node_modules\/(?!(marks-pane)\/).*/,
-            loader: "babel-loader",
-            query: {
-              presets: ['es2015'],
-              plugins: [
-                "add-module-exports",
-                "transform-runtime"
-              ]
-            }
-          }
-        ]
-      }
-    },
+    webpack: webpackConfig, 
+
+    // {
+    //   mode: "development",
+    //   externals: {
+    //     "jszip": "JSZip"
+    //     // "xmldom": "xmldom"
+    //   },
+    //   devtool: 'inline-source-map',
+    //   resolve: {
+    //     alias: {
+    //       path: "path-webpack"
+    //     }
+    //   },
+    //   module: {
+    //     rules: [
+    //       {
+    //         test: /\.js$/,
+    //         exclude: /node_modules/,
+    //         loader: "babel-loader",
+    //         query: {
+    //           presets: [["@babel/preset-env", {
+    //             targets: "defaults",
+    //           }]],
+    //         }
+    //       },
+    //       {
+    //         test: /\.xhtml$/i,
+    //         use: 'raw-loader',
+    //       }
+    //     ]
+    //   }
+    // },
 
     webpackMiddleware: {
       stats: 'errors-only'

diff --git a/libs/mime/mime.js b/libs/mime/mime.js
@@ -166,6 +166,4 @@ function lookup(filename) {
 	return filename && mimeTypes[filename.split(".").pop().toLowerCase()] || defaultValue;
 };
 
-module.exports = {
-	'lookup': lookup
-}
+export default { lookup };