Merge pull request #869 from MrTimscampi/where-no-module-has-gone-before

Start conversion of modules to ES6

.eslintrc.yml

@@ -3,6 +3,12 @@ env:
   browser: true
   amd: true
 
+parserOptions:
+  ecmaVersion: 6
+  sourceType: module
+  ecmaFeatures:
+    impliedStrict: true
+
 globals:
   # New browser globals
   DataView: readonly

package.json

@@ -7,6 +7,7 @@
   "devDependencies": {
     "@babel/core": "^7.8.6",
     "@babel/polyfill": "^7.8.7",
+    "@babel/plugin-transform-modules-amd": "^7.8.3",
     "@babel/preset-env": "^7.8.6",
     "autoprefixer": "^9.7.4",
     "babel-loader": "^8.0.6",
@@ -69,9 +70,11 @@
     "whatwg-fetch": "^3.0.0"
   },
   "babel": {
-    "presets": [
-      "@babel/preset-env"
-    ]
+    "presets": ["@babel/preset-env"],
+    "overrides": [{
+        "test": ["src/components/cardbuilder/cardBuilder.js"],
+        "plugins": ["@babel/plugin-transform-modules-amd"]
+    }]
   },
   "browserslist": [
     "last 2 Firefox versions",

webpack.common.js

@@ -6,12 +6,12 @@ const CopyPlugin = require("copy-webpack-plugin");
 const Assets = [
     "alameda/alameda.js",
     "native-promise-only/npo.js",
-    "libass-wasm/dist/subtitles-octopus-worker.js",
-    "libass-wasm/dist/subtitles-octopus-worker.data",
-    "libass-wasm/dist/subtitles-octopus-worker.wasm",
-    "libass-wasm/dist/subtitles-octopus-worker-legacy.js",
-    "libass-wasm/dist/subtitles-octopus-worker-legacy.data",
-    "libass-wasm/dist/subtitles-octopus-worker-legacy.js.mem"
+    "libass-wasm/dist/js/subtitles-octopus-worker.js",
+    "libass-wasm/dist/js/subtitles-octopus-worker.data",
+    "libass-wasm/dist/js/subtitles-octopus-worker.wasm",
+    "libass-wasm/dist/js/subtitles-octopus-worker-legacy.js",
+    "libass-wasm/dist/js/subtitles-octopus-worker-legacy.data",
+    "libass-wasm/dist/js/subtitles-octopus-worker-legacy.js.mem"
 ];
 
 module.exports = {