feat(sifrr-serviceworker): convert to es6 module syntax

sifrr · Aug 7, 2019 · 20724af · 20724af
1 parent 58454fa
commit 20724af
Show file tree

Hide file tree

Showing 15 changed files with 61 additions and 35 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -10,7 +10,10 @@ module.exports = function(api) {
     ]
   ];
 
+  const plugins = [['@babel/plugin-proposal-class-properties', { loose: true }]];
+
   return {
-    presets
+    presets,
+    plugins
   };
 };
diff --git a/package.json b/package.json
@@ -47,11 +47,12 @@
   "homepage": "https://github.com/sifrr/sifrr",
   "dependencies": {},
   "devDependencies": {
-    "@sifrr/dev": "^0.0.26",
+    "@sifrr/dev": "^0.0.27",
     "cache-manager": "^2.10.0",
     "loadtest": "^3.0.7"
   },
   "resolutions": {
-    "@sifrr/server": "file:./packages/server/sifrr-server"
+    "@sifrr/server": "file:./packages/server/sifrr-server",
+    "@sifrr/fetch": "file:./packages/browser/sifrr-fetch"
   }
 }
diff --git a/packages/browser/sifrr-fetch/package.json b/packages/browser/sifrr-fetch/package.json
@@ -12,9 +12,9 @@
     "url": "https://github.com/sifrr/sifrr/issues"
   },
   "homepage": "https://github.com/sifrr/sifrr",
-  "main": "src/sifrr.fetch.js",
-  "module": "dist/sifrr.fetch.module.js",
-  "browser": "dist/sifrr.fetch.js",
+  "main": "dist/sifrr.fetch.cjs.js",
+  "module": "src/sifrr.fetch.js",
+  "browser": "dist/sifrr.fetch.min.js",
   "browserslist": [
     "chrome >= 55",
     "safari >= 10.1",
@@ -38,7 +38,8 @@
     "@sifrr/dev": "^0.0.26",
     "cache-manager": "^2.10.0",
     "loadtest": "^3.0.7",
-    "node-fetch": "^2.6.0"
+    "node-fetch": "^2.6.0",
+    "@babel/plugin-proposal-class-properties": "^7.5.5"
   },
   "files": [
     "bin",

diff --git a/packages/browser/sifrr-route/package.json b/packages/browser/sifrr-route/package.json
@@ -12,9 +12,9 @@
     "url": "https://github.com/sifrr/sifrr/issues"
   },
   "homepage": "https://github.com/sifrr/sifrr",
-  "main": "src/sifrr.route.js",
-  "module": "dist/sifrr.route.module.js",
-  "browser": "dist/sifrr.route.js",
+  "main": "dist/sifrr.route.cjs.js",
+  "module": "src/sifrr.route.js",
+  "browser": "dist/sifrr.route.min.js",
   "browserslist": [
     "chrome >= 55",
     "safari >= 10.1",
@@ -40,7 +40,8 @@
   "devDependencies": {
     "@sifrr/dev": "^0.0.26",
     "cache-manager": "^2.10.0",
-    "loadtest": "^3.0.7"
+    "loadtest": "^3.0.7",
+    "@babel/plugin-proposal-class-properties": "^7.5.5"
   },
   "files": [
     "bin",

diff --git a/packages/browser/sifrr-serviceworker/package.json b/packages/browser/sifrr-serviceworker/package.json
@@ -12,9 +12,9 @@
     "url": "https://github.com/sifrr/sifrr/issues"
   },
   "homepage": "https://github.com/sifrr/sifrr",
-  "main": "src/sifrr.serviceworker.js",
-  "module": "dist/sifrr.serviceworker.module.js",
-  "browser": "dist/sifrr.serviceworker.js",
+  "main": "dist/sifrr.serviceworker.cjs.js",
+  "module": "src/sifrr.serviceworker.js",
+  "browser": "dist/sifrr.serviceworker.min.js",
   "browserslist": [
     "chrome >= 55",
     "safari >= 10.1",
@@ -37,7 +37,8 @@
   "devDependencies": {
     "@sifrr/dev": "^0.0.26",
     "cache-manager": "^2.10.0",
-    "loadtest": "^3.0.7"
+    "loadtest": "^3.0.7",
+    "@babel/plugin-proposal-class-properties": "^7.5.5"
   },
   "files": [
     "bin",

diff --git a/packages/browser/sifrr-serviceworker/src/sifrr.serviceworker.js b/packages/browser/sifrr-serviceworker/src/sifrr.serviceworker.js
@@ -186,4 +186,5 @@ class SW {
   }
 }
 
-module.exports = SW;
+export { SW as ServiceWorker };
+export default SW;
diff --git a/packages/browser/sifrr-storage/package.json b/packages/browser/sifrr-storage/package.json
@@ -12,9 +12,9 @@
     "url": "https://github.com/sifrr/sifrr/issues"
   },
   "homepage": "https://github.com/sifrr/sifrr",
-  "main": "src/sifrr.storage.js",
-  "module": "dist/sifrr.storage.module.js",
-  "browser": "dist/sifrr.storage.js",
+  "main": "dist/sifrr.storage.cjs.js",
+  "module": "src/sifrr.storage.js",
+  "browser": "dist/sifrr.storage.min.js",
   "browserslist": [
     "chrome >= 55",
     "safari >= 10.1",
@@ -41,7 +41,8 @@
   "devDependencies": {
     "@sifrr/dev": "^0.0.26",
     "cache-manager": "^2.10.0",
-    "loadtest": "^3.0.7"
+    "loadtest": "^3.0.7",
+    "@babel/plugin-proposal-class-properties": "^7.5.5"
   },
   "files": [
     "bin",

diff --git a/packages/server/sifrr-api/package.json b/packages/server/sifrr-api/package.json
@@ -39,7 +39,8 @@
   "devDependencies": {
     "@sifrr/dev": "^0.0.26",
     "cache-manager": "^2.10.0",
-    "loadtest": "^3.0.7"
+    "loadtest": "^3.0.7",
+    "@babel/plugin-proposal-class-properties": "^7.5.5"
   },
   "files": [
     "bin",

diff --git a/packages/server/sifrr-cli/package.json b/packages/server/sifrr-cli/package.json
@@ -35,7 +35,8 @@
   "devDependencies": {
     "@sifrr/dev": "^0.0.26",
     "cache-manager": "^2.10.0",
-    "loadtest": "^3.0.7"
+    "loadtest": "^3.0.7",
+    "@babel/plugin-proposal-class-properties": "^7.5.5"
   },
   "files": [
     "bin",

diff --git a/packages/server/sifrr-seo/package.json b/packages/server/sifrr-seo/package.json
@@ -34,7 +34,8 @@
   "devDependencies": {
     "@sifrr/dev": "^0.0.26",
     "cache-manager": "^2.10.0",
-    "loadtest": "^3.0.7"
+    "loadtest": "^3.0.7",
+    "@babel/plugin-proposal-class-properties": "^7.5.5"
   },
   "files": [
     "bin",

diff --git a/packages/server/sifrr-server/README.md b/packages/server/sifrr-server/README.md
@@ -125,9 +125,8 @@ app.folder('/example', folder, options);
 `overwriteRoute`: if set to `true`, it will overwrite old pattern if same pattern is added.
 `failOnDuplicateRoute`: if set to `true`, it will throw error if you try add same pattern again.
 By default, it will serve the file you added first with a pattern.
-
-There is one more option available for `folder` with all the sendFile options:
 `watch`: if it is `true`, it will watch for new Files / deleted files and serve/unserve them as needed.
+`livereload`: default: `false`, [more details here](#live-reload-experimental)
 
 ### Post requests
 

diff --git a/packages/server/sifrr-server/package.json b/packages/server/sifrr-server/package.json
@@ -40,7 +40,8 @@
     "@sifrr/dev": "^0.0.26",
     "cache-manager": "^2.10.0",
     "loadtest": "^3.0.7",
-    "uWebSockets.js": "uNetworking/uWebSockets.js#v15.11.0"
+    "uWebSockets.js": "uNetworking/uWebSockets.js#v15.11.0",
+    "@babel/plugin-proposal-class-properties": "^7.5.5"
   },
   "files": [
     "bin",

diff --git a/rollup.base.js b/rollup.base.js
@@ -28,19 +28,20 @@ const globals = {
 };
 const footer = '/*! (c) @aadityataparia */';
 
-function moduleConfig(name, root, minify = false, isModule = false) {
+function moduleConfig(name, root, minify = false, type) {
   const filename = name.toLowerCase();
   const banner = `/*! ${name} v${version} - sifrr project | MIT licensed | https://github.com/sifrr/sifrr */`;
   const mergeConfig = {
     output: {
       banner,
       footer,
-      globals
+      globals,
+      exports: 'named'
     },
     external
   };
 
-  if (!isModule) {
+  if (type === 'browser') {
     mergeConfig.output.outro = 'if (exports.default) exports = exports.default;';
   }
 
@@ -51,7 +52,7 @@ function moduleConfig(name, root, minify = false, isModule = false) {
       outputFolder: path.join(root, './dist'),
       outputFileName: filename,
       minify,
-      type: isModule ? 'module' : 'browser'
+      type
     },
     mergeConfig
   );
@@ -60,10 +61,13 @@ function moduleConfig(name, root, minify = false, isModule = false) {
 module.exports = (name, __dirname, isBrowser = true) => {
   let ret = [];
   if (isBrowser) {
-    ret = [moduleConfig(name, __dirname), moduleConfig(name, __dirname, true)];
+    ret = [
+      moduleConfig(name, __dirname, true, 'browser'),
+      moduleConfig(name, __dirname, false, 'browser')
+    ];
   }
-  ret.push(moduleConfig(name, __dirname, false, true));
-  ret.push(moduleConfig(name, __dirname, true, true));
+  ret.push(moduleConfig(name, __dirname, false, 'cjs'));
+  ret.push(moduleConfig(name, __dirname, false, 'module'));
 
   return ret;
 };
diff --git a/scripts/release/change_config.js b/scripts/release/change_config.js
@@ -29,7 +29,9 @@ module.exports = function(folder, isBrowser) {
   };
 
   if (isBrowser) {
-    pkgToMerge.browser = `dist/${jsFileName}.js`;
+    pkgToMerge.module = `src/${jsFileName}.js`;
+    pkgToMerge.main = `dist/${jsFileName}.cjs.js`;
+    pkgToMerge.browser = `dist/${jsFileName}.min.js`;
     pkgToMerge.browserslist = pkg.browserslist;
   }
 

diff --git a/yarn.lock b/yarn.lock
@@ -322,6 +322,14 @@
     "@babel/helper-remap-async-to-generator" "^7.1.0"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
 
+"@babel/plugin-proposal-class-properties@^7.5.5":
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz#a974cfae1e37c3110e71f3c6a2e48b8e71958cd4"
+  integrity sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.5.5"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-proposal-json-strings@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317"
@@ -7781,7 +7789,7 @@ typescript@^3.5.3:
   integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
 
 uWebSockets.js@uNetworking/uWebSockets.js#v15.11.0:
-  version "15.10.0"
+  version "15.11.0"
   resolved "https://codeload.github.com/uNetworking/uWebSockets.js/tar.gz/e7552889a50a7ffa654c41c99a9bad46dd0024c5"
 
 uglify-js@3.4.x: