From bef8b2ebee6fd25ec466cead832b647f2f6bda80 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Tue, 31 Jul 2018 10:13:26 -0700 Subject: [PATCH] Rename server => modules --- {server => modules}/.eslintrc | 0 {server => modules}/AuthAPI.js | 0 {server => modules}/BlacklistAPI.js | 0 {server => modules}/CloudflareAPI.js | 0 {server => modules}/StatsAPI.js | 0 {server => modules}/__tests__/.eslintrc | 0 {server => modules}/__tests__/AuthAPI-test.js | 0 .../__tests__/BlacklistAPI-test.js | 0 {server => modules}/__tests__/server-test.js | 0 .../__tests__/utils/clearBlacklist.js | 0 .../__tests__/utils/withBlacklist.js | 0 .../__tests__/utils/withRevokedToken.js | 0 {server => modules}/__tests__/utils/withToken.js | 0 {server => modules}/actions/addToBlacklist.js | 0 {server => modules}/actions/createAuth.js | 0 .../actions/removeFromBlacklist.js | 0 {server => modules}/actions/serveAutoIndexPage.js | 0 {server => modules}/actions/serveFile.js | 0 .../actions/serveJavaScriptModule.js | 0 {server => modules}/actions/serveMainPage.js | 0 {server => modules}/actions/serveMetadata.js | 0 {server => modules}/actions/serveStaticFile.js | 0 {server => modules}/actions/showAuth.js | 0 {server => modules}/actions/showBlacklist.js | 0 {server => modules}/actions/showPublicKey.js | 0 {server => modules}/actions/showStats.js | 0 {server => modules}/client/.babelrc | 0 {server => modules}/client/.eslintrc | 0 {server => modules}/client/MainPage.js | 0 {server => modules}/client/autoIndex.css | 0 {server => modules}/client/autoIndex.js | 0 {server => modules}/client/autoIndex/App.css | 0 {server => modules}/client/autoIndex/App.js | 0 .../client/autoIndex/DirectoryListing.css | 0 .../client/autoIndex/DirectoryListing.js | 0 {server => modules}/client/main.css | 0 {server => modules}/client/main.js | 0 {server => modules}/client/main/About.css | 0 {server => modules}/client/main/About.js | 0 {server => modules}/client/main/About.md | 0 {server => modules}/client/main/App.js | 0 .../client/main/CloudflareLogo.png | Bin {server => modules}/client/main/HerokuLogo.png | Bin {server => modules}/client/main/Home.css | 0 {server => modules}/client/main/Home.js | 0 {server => modules}/client/main/Home.md | 0 {server => modules}/client/main/Layout.css | 0 {server => modules}/client/main/Layout.js | 0 {server => modules}/client/main/Stats.css | 0 {server => modules}/client/main/Stats.js | 0 {server => modules}/client/main/WindowSize.js | 0 {server => modules}/client/utils/addEvent.js | 0 {server => modules}/client/utils/createHTML.js | 0 {server => modules}/client/utils/execScript.js | 0 {server => modules}/client/utils/formatNumber.js | 0 {server => modules}/client/utils/formatPercent.js | 0 {server => modules}/client/utils/parseNumber.js | 0 {server => modules}/client/utils/removeEvent.js | 0 {server => modules}/clientRuntime.js | 2 +- {server => modules}/createDevCompiler.js | 0 {server => modules}/createDevServer.js | 0 {server => modules}/createRouter.js | 0 {server => modules}/createServer.js | 0 {server => modules}/ingestLogs.js | 0 {server => modules}/middleware/checkBlacklist.js | 0 {server => modules}/middleware/devAssets.js | 0 {server => modules}/middleware/fetchPackage.js | 0 {server => modules}/middleware/findFile.js | 0 .../middleware/redirectLegacyURLs.js | 0 {server => modules}/middleware/requireAuth.js | 0 {server => modules}/middleware/staticAssets.js | 0 {server => modules}/middleware/userToken.js | 0 .../middleware/utils/createAssets.js | 0 .../middleware/validatePackageName.js | 0 .../middleware/validatePackageURL.js | 0 {server => modules}/middleware/validateQuery.js | 0 {server => modules}/plugins/__tests__/.eslintrc | 0 .../plugins/__tests__/unpkgRewrite-test.js | 0 {server => modules}/plugins/unpkgRewrite.js | 2 +- {server => modules}/secretKey.js | 0 server/config.js => modules/serverConfig.js | 0 {server => modules}/utils/__tests__/.eslintrc | 0 .../utils/__tests__/createSearch-test.js | 0 .../utils/__tests__/getContentType-test.js | 0 .../utils/__tests__/parsePackageURL-test.js | 0 {server => modules}/utils/addLeadingSlash.js | 0 {server => modules}/utils/bufferStream.js | 0 {server => modules}/utils/cache.js | 0 {server => modules}/utils/createPackageURL.js | 0 {server => modules}/utils/createSearch.js | 0 {server => modules}/utils/data.js | 0 {server => modules}/utils/fetchNpmPackage.js | 0 {server => modules}/utils/fetchNpmPackageInfo.js | 4 ++-- {server => modules}/utils/getContentType.js | 0 {server => modules}/utils/getContentTypeHeader.js | 0 {server => modules}/utils/getIntegrity.js | 0 {server => modules}/utils/getNpmPackageInfo.js | 0 {server => modules}/utils/incrementCounter.js | 0 {server => modules}/utils/isValidPackageName.js | 0 {server => modules}/utils/parsePackageURL.js | 0 {server => modules}/utils/registryAgent.js | 0 {server => modules}/utils/renderPage.js | 0 server.js | 14 +++++++------- webpack.config.js | 4 ++-- 104 files changed, 13 insertions(+), 13 deletions(-) rename {server => modules}/.eslintrc (100%) rename {server => modules}/AuthAPI.js (100%) rename {server => modules}/BlacklistAPI.js (100%) rename {server => modules}/CloudflareAPI.js (100%) rename {server => modules}/StatsAPI.js (100%) rename {server => modules}/__tests__/.eslintrc (100%) rename {server => modules}/__tests__/AuthAPI-test.js (100%) rename {server => modules}/__tests__/BlacklistAPI-test.js (100%) rename {server => modules}/__tests__/server-test.js (100%) rename {server => modules}/__tests__/utils/clearBlacklist.js (100%) rename {server => modules}/__tests__/utils/withBlacklist.js (100%) rename {server => modules}/__tests__/utils/withRevokedToken.js (100%) rename {server => modules}/__tests__/utils/withToken.js (100%) rename {server => modules}/actions/addToBlacklist.js (100%) rename {server => modules}/actions/createAuth.js (100%) rename {server => modules}/actions/removeFromBlacklist.js (100%) rename {server => modules}/actions/serveAutoIndexPage.js (100%) rename {server => modules}/actions/serveFile.js (100%) rename {server => modules}/actions/serveJavaScriptModule.js (100%) rename {server => modules}/actions/serveMainPage.js (100%) rename {server => modules}/actions/serveMetadata.js (100%) rename {server => modules}/actions/serveStaticFile.js (100%) rename {server => modules}/actions/showAuth.js (100%) rename {server => modules}/actions/showBlacklist.js (100%) rename {server => modules}/actions/showPublicKey.js (100%) rename {server => modules}/actions/showStats.js (100%) rename {server => modules}/client/.babelrc (100%) rename {server => modules}/client/.eslintrc (100%) rename {server => modules}/client/MainPage.js (100%) rename {server => modules}/client/autoIndex.css (100%) rename {server => modules}/client/autoIndex.js (100%) rename {server => modules}/client/autoIndex/App.css (100%) rename {server => modules}/client/autoIndex/App.js (100%) rename {server => modules}/client/autoIndex/DirectoryListing.css (100%) rename {server => modules}/client/autoIndex/DirectoryListing.js (100%) rename {server => modules}/client/main.css (100%) rename {server => modules}/client/main.js (100%) rename {server => modules}/client/main/About.css (100%) rename {server => modules}/client/main/About.js (100%) rename {server => modules}/client/main/About.md (100%) rename {server => modules}/client/main/App.js (100%) rename {server => modules}/client/main/CloudflareLogo.png (100%) rename {server => modules}/client/main/HerokuLogo.png (100%) rename {server => modules}/client/main/Home.css (100%) rename {server => modules}/client/main/Home.js (100%) rename {server => modules}/client/main/Home.md (100%) rename {server => modules}/client/main/Layout.css (100%) rename {server => modules}/client/main/Layout.js (100%) rename {server => modules}/client/main/Stats.css (100%) rename {server => modules}/client/main/Stats.js (100%) rename {server => modules}/client/main/WindowSize.js (100%) rename {server => modules}/client/utils/addEvent.js (100%) rename {server => modules}/client/utils/createHTML.js (100%) rename {server => modules}/client/utils/execScript.js (100%) rename {server => modules}/client/utils/formatNumber.js (100%) rename {server => modules}/client/utils/formatPercent.js (100%) rename {server => modules}/client/utils/parseNumber.js (100%) rename {server => modules}/client/utils/removeEvent.js (100%) rename {server => modules}/clientRuntime.js (86%) rename {server => modules}/createDevCompiler.js (100%) rename {server => modules}/createDevServer.js (100%) rename {server => modules}/createRouter.js (100%) rename {server => modules}/createServer.js (100%) rename {server => modules}/ingestLogs.js (100%) rename {server => modules}/middleware/checkBlacklist.js (100%) rename {server => modules}/middleware/devAssets.js (100%) rename {server => modules}/middleware/fetchPackage.js (100%) rename {server => modules}/middleware/findFile.js (100%) rename {server => modules}/middleware/redirectLegacyURLs.js (100%) rename {server => modules}/middleware/requireAuth.js (100%) rename {server => modules}/middleware/staticAssets.js (100%) rename {server => modules}/middleware/userToken.js (100%) rename {server => modules}/middleware/utils/createAssets.js (100%) rename {server => modules}/middleware/validatePackageName.js (100%) rename {server => modules}/middleware/validatePackageURL.js (100%) rename {server => modules}/middleware/validateQuery.js (100%) rename {server => modules}/plugins/__tests__/.eslintrc (100%) rename {server => modules}/plugins/__tests__/unpkgRewrite-test.js (100%) rename {server => modules}/plugins/unpkgRewrite.js (96%) rename {server => modules}/secretKey.js (100%) rename server/config.js => modules/serverConfig.js (100%) rename {server => modules}/utils/__tests__/.eslintrc (100%) rename {server => modules}/utils/__tests__/createSearch-test.js (100%) rename {server => modules}/utils/__tests__/getContentType-test.js (100%) rename {server => modules}/utils/__tests__/parsePackageURL-test.js (100%) rename {server => modules}/utils/addLeadingSlash.js (100%) rename {server => modules}/utils/bufferStream.js (100%) rename {server => modules}/utils/cache.js (100%) rename {server => modules}/utils/createPackageURL.js (100%) rename {server => modules}/utils/createSearch.js (100%) rename {server => modules}/utils/data.js (100%) rename {server => modules}/utils/fetchNpmPackage.js (100%) rename {server => modules}/utils/fetchNpmPackageInfo.js (92%) rename {server => modules}/utils/getContentType.js (100%) rename {server => modules}/utils/getContentTypeHeader.js (100%) rename {server => modules}/utils/getIntegrity.js (100%) rename {server => modules}/utils/getNpmPackageInfo.js (100%) rename {server => modules}/utils/incrementCounter.js (100%) rename {server => modules}/utils/isValidPackageName.js (100%) rename {server => modules}/utils/parsePackageURL.js (100%) rename {server => modules}/utils/registryAgent.js (100%) rename {server => modules}/utils/renderPage.js (100%) diff --git a/server/.eslintrc b/modules/.eslintrc similarity index 100% rename from server/.eslintrc rename to modules/.eslintrc diff --git a/server/AuthAPI.js b/modules/AuthAPI.js similarity index 100% rename from server/AuthAPI.js rename to modules/AuthAPI.js diff --git a/server/BlacklistAPI.js b/modules/BlacklistAPI.js similarity index 100% rename from server/BlacklistAPI.js rename to modules/BlacklistAPI.js diff --git a/server/CloudflareAPI.js b/modules/CloudflareAPI.js similarity index 100% rename from server/CloudflareAPI.js rename to modules/CloudflareAPI.js diff --git a/server/StatsAPI.js b/modules/StatsAPI.js similarity index 100% rename from server/StatsAPI.js rename to modules/StatsAPI.js diff --git a/server/__tests__/.eslintrc b/modules/__tests__/.eslintrc similarity index 100% rename from server/__tests__/.eslintrc rename to modules/__tests__/.eslintrc diff --git a/server/__tests__/AuthAPI-test.js b/modules/__tests__/AuthAPI-test.js similarity index 100% rename from server/__tests__/AuthAPI-test.js rename to modules/__tests__/AuthAPI-test.js diff --git a/server/__tests__/BlacklistAPI-test.js b/modules/__tests__/BlacklistAPI-test.js similarity index 100% rename from server/__tests__/BlacklistAPI-test.js rename to modules/__tests__/BlacklistAPI-test.js diff --git a/server/__tests__/server-test.js b/modules/__tests__/server-test.js similarity index 100% rename from server/__tests__/server-test.js rename to modules/__tests__/server-test.js diff --git a/server/__tests__/utils/clearBlacklist.js b/modules/__tests__/utils/clearBlacklist.js similarity index 100% rename from server/__tests__/utils/clearBlacklist.js rename to modules/__tests__/utils/clearBlacklist.js diff --git a/server/__tests__/utils/withBlacklist.js b/modules/__tests__/utils/withBlacklist.js similarity index 100% rename from server/__tests__/utils/withBlacklist.js rename to modules/__tests__/utils/withBlacklist.js diff --git a/server/__tests__/utils/withRevokedToken.js b/modules/__tests__/utils/withRevokedToken.js similarity index 100% rename from server/__tests__/utils/withRevokedToken.js rename to modules/__tests__/utils/withRevokedToken.js diff --git a/server/__tests__/utils/withToken.js b/modules/__tests__/utils/withToken.js similarity index 100% rename from server/__tests__/utils/withToken.js rename to modules/__tests__/utils/withToken.js diff --git a/server/actions/addToBlacklist.js b/modules/actions/addToBlacklist.js similarity index 100% rename from server/actions/addToBlacklist.js rename to modules/actions/addToBlacklist.js diff --git a/server/actions/createAuth.js b/modules/actions/createAuth.js similarity index 100% rename from server/actions/createAuth.js rename to modules/actions/createAuth.js diff --git a/server/actions/removeFromBlacklist.js b/modules/actions/removeFromBlacklist.js similarity index 100% rename from server/actions/removeFromBlacklist.js rename to modules/actions/removeFromBlacklist.js diff --git a/server/actions/serveAutoIndexPage.js b/modules/actions/serveAutoIndexPage.js similarity index 100% rename from server/actions/serveAutoIndexPage.js rename to modules/actions/serveAutoIndexPage.js diff --git a/server/actions/serveFile.js b/modules/actions/serveFile.js similarity index 100% rename from server/actions/serveFile.js rename to modules/actions/serveFile.js diff --git a/server/actions/serveJavaScriptModule.js b/modules/actions/serveJavaScriptModule.js similarity index 100% rename from server/actions/serveJavaScriptModule.js rename to modules/actions/serveJavaScriptModule.js diff --git a/server/actions/serveMainPage.js b/modules/actions/serveMainPage.js similarity index 100% rename from server/actions/serveMainPage.js rename to modules/actions/serveMainPage.js diff --git a/server/actions/serveMetadata.js b/modules/actions/serveMetadata.js similarity index 100% rename from server/actions/serveMetadata.js rename to modules/actions/serveMetadata.js diff --git a/server/actions/serveStaticFile.js b/modules/actions/serveStaticFile.js similarity index 100% rename from server/actions/serveStaticFile.js rename to modules/actions/serveStaticFile.js diff --git a/server/actions/showAuth.js b/modules/actions/showAuth.js similarity index 100% rename from server/actions/showAuth.js rename to modules/actions/showAuth.js diff --git a/server/actions/showBlacklist.js b/modules/actions/showBlacklist.js similarity index 100% rename from server/actions/showBlacklist.js rename to modules/actions/showBlacklist.js diff --git a/server/actions/showPublicKey.js b/modules/actions/showPublicKey.js similarity index 100% rename from server/actions/showPublicKey.js rename to modules/actions/showPublicKey.js diff --git a/server/actions/showStats.js b/modules/actions/showStats.js similarity index 100% rename from server/actions/showStats.js rename to modules/actions/showStats.js diff --git a/server/client/.babelrc b/modules/client/.babelrc similarity index 100% rename from server/client/.babelrc rename to modules/client/.babelrc diff --git a/server/client/.eslintrc b/modules/client/.eslintrc similarity index 100% rename from server/client/.eslintrc rename to modules/client/.eslintrc diff --git a/server/client/MainPage.js b/modules/client/MainPage.js similarity index 100% rename from server/client/MainPage.js rename to modules/client/MainPage.js diff --git a/server/client/autoIndex.css b/modules/client/autoIndex.css similarity index 100% rename from server/client/autoIndex.css rename to modules/client/autoIndex.css diff --git a/server/client/autoIndex.js b/modules/client/autoIndex.js similarity index 100% rename from server/client/autoIndex.js rename to modules/client/autoIndex.js diff --git a/server/client/autoIndex/App.css b/modules/client/autoIndex/App.css similarity index 100% rename from server/client/autoIndex/App.css rename to modules/client/autoIndex/App.css diff --git a/server/client/autoIndex/App.js b/modules/client/autoIndex/App.js similarity index 100% rename from server/client/autoIndex/App.js rename to modules/client/autoIndex/App.js diff --git a/server/client/autoIndex/DirectoryListing.css b/modules/client/autoIndex/DirectoryListing.css similarity index 100% rename from server/client/autoIndex/DirectoryListing.css rename to modules/client/autoIndex/DirectoryListing.css diff --git a/server/client/autoIndex/DirectoryListing.js b/modules/client/autoIndex/DirectoryListing.js similarity index 100% rename from server/client/autoIndex/DirectoryListing.js rename to modules/client/autoIndex/DirectoryListing.js diff --git a/server/client/main.css b/modules/client/main.css similarity index 100% rename from server/client/main.css rename to modules/client/main.css diff --git a/server/client/main.js b/modules/client/main.js similarity index 100% rename from server/client/main.js rename to modules/client/main.js diff --git a/server/client/main/About.css b/modules/client/main/About.css similarity index 100% rename from server/client/main/About.css rename to modules/client/main/About.css diff --git a/server/client/main/About.js b/modules/client/main/About.js similarity index 100% rename from server/client/main/About.js rename to modules/client/main/About.js diff --git a/server/client/main/About.md b/modules/client/main/About.md similarity index 100% rename from server/client/main/About.md rename to modules/client/main/About.md diff --git a/server/client/main/App.js b/modules/client/main/App.js similarity index 100% rename from server/client/main/App.js rename to modules/client/main/App.js diff --git a/server/client/main/CloudflareLogo.png b/modules/client/main/CloudflareLogo.png similarity index 100% rename from server/client/main/CloudflareLogo.png rename to modules/client/main/CloudflareLogo.png diff --git a/server/client/main/HerokuLogo.png b/modules/client/main/HerokuLogo.png similarity index 100% rename from server/client/main/HerokuLogo.png rename to modules/client/main/HerokuLogo.png diff --git a/server/client/main/Home.css b/modules/client/main/Home.css similarity index 100% rename from server/client/main/Home.css rename to modules/client/main/Home.css diff --git a/server/client/main/Home.js b/modules/client/main/Home.js similarity index 100% rename from server/client/main/Home.js rename to modules/client/main/Home.js diff --git a/server/client/main/Home.md b/modules/client/main/Home.md similarity index 100% rename from server/client/main/Home.md rename to modules/client/main/Home.md diff --git a/server/client/main/Layout.css b/modules/client/main/Layout.css similarity index 100% rename from server/client/main/Layout.css rename to modules/client/main/Layout.css diff --git a/server/client/main/Layout.js b/modules/client/main/Layout.js similarity index 100% rename from server/client/main/Layout.js rename to modules/client/main/Layout.js diff --git a/server/client/main/Stats.css b/modules/client/main/Stats.css similarity index 100% rename from server/client/main/Stats.css rename to modules/client/main/Stats.css diff --git a/server/client/main/Stats.js b/modules/client/main/Stats.js similarity index 100% rename from server/client/main/Stats.js rename to modules/client/main/Stats.js diff --git a/server/client/main/WindowSize.js b/modules/client/main/WindowSize.js similarity index 100% rename from server/client/main/WindowSize.js rename to modules/client/main/WindowSize.js diff --git a/server/client/utils/addEvent.js b/modules/client/utils/addEvent.js similarity index 100% rename from server/client/utils/addEvent.js rename to modules/client/utils/addEvent.js diff --git a/server/client/utils/createHTML.js b/modules/client/utils/createHTML.js similarity index 100% rename from server/client/utils/createHTML.js rename to modules/client/utils/createHTML.js diff --git a/server/client/utils/execScript.js b/modules/client/utils/execScript.js similarity index 100% rename from server/client/utils/execScript.js rename to modules/client/utils/execScript.js diff --git a/server/client/utils/formatNumber.js b/modules/client/utils/formatNumber.js similarity index 100% rename from server/client/utils/formatNumber.js rename to modules/client/utils/formatNumber.js diff --git a/server/client/utils/formatPercent.js b/modules/client/utils/formatPercent.js similarity index 100% rename from server/client/utils/formatPercent.js rename to modules/client/utils/formatPercent.js diff --git a/server/client/utils/parseNumber.js b/modules/client/utils/parseNumber.js similarity index 100% rename from server/client/utils/parseNumber.js rename to modules/client/utils/parseNumber.js diff --git a/server/client/utils/removeEvent.js b/modules/client/utils/removeEvent.js similarity index 100% rename from server/client/utils/removeEvent.js rename to modules/client/utils/removeEvent.js diff --git a/server/clientRuntime.js b/modules/clientRuntime.js similarity index 86% rename from server/clientRuntime.js rename to modules/clientRuntime.js index e5a4a79..c0fe699 100644 --- a/server/clientRuntime.js +++ b/modules/clientRuntime.js @@ -1,6 +1,6 @@ // Use babel to compile JSX on the fly. require("babel-register")({ - only: /server\/client/ + only: /modules\/client/ }); // Ignore require("*.css") calls. diff --git a/server/createDevCompiler.js b/modules/createDevCompiler.js similarity index 100% rename from server/createDevCompiler.js rename to modules/createDevCompiler.js diff --git a/server/createDevServer.js b/modules/createDevServer.js similarity index 100% rename from server/createDevServer.js rename to modules/createDevServer.js diff --git a/server/createRouter.js b/modules/createRouter.js similarity index 100% rename from server/createRouter.js rename to modules/createRouter.js diff --git a/server/createServer.js b/modules/createServer.js similarity index 100% rename from server/createServer.js rename to modules/createServer.js diff --git a/server/ingestLogs.js b/modules/ingestLogs.js similarity index 100% rename from server/ingestLogs.js rename to modules/ingestLogs.js diff --git a/server/middleware/checkBlacklist.js b/modules/middleware/checkBlacklist.js similarity index 100% rename from server/middleware/checkBlacklist.js rename to modules/middleware/checkBlacklist.js diff --git a/server/middleware/devAssets.js b/modules/middleware/devAssets.js similarity index 100% rename from server/middleware/devAssets.js rename to modules/middleware/devAssets.js diff --git a/server/middleware/fetchPackage.js b/modules/middleware/fetchPackage.js similarity index 100% rename from server/middleware/fetchPackage.js rename to modules/middleware/fetchPackage.js diff --git a/server/middleware/findFile.js b/modules/middleware/findFile.js similarity index 100% rename from server/middleware/findFile.js rename to modules/middleware/findFile.js diff --git a/server/middleware/redirectLegacyURLs.js b/modules/middleware/redirectLegacyURLs.js similarity index 100% rename from server/middleware/redirectLegacyURLs.js rename to modules/middleware/redirectLegacyURLs.js diff --git a/server/middleware/requireAuth.js b/modules/middleware/requireAuth.js similarity index 100% rename from server/middleware/requireAuth.js rename to modules/middleware/requireAuth.js diff --git a/server/middleware/staticAssets.js b/modules/middleware/staticAssets.js similarity index 100% rename from server/middleware/staticAssets.js rename to modules/middleware/staticAssets.js diff --git a/server/middleware/userToken.js b/modules/middleware/userToken.js similarity index 100% rename from server/middleware/userToken.js rename to modules/middleware/userToken.js diff --git a/server/middleware/utils/createAssets.js b/modules/middleware/utils/createAssets.js similarity index 100% rename from server/middleware/utils/createAssets.js rename to modules/middleware/utils/createAssets.js diff --git a/server/middleware/validatePackageName.js b/modules/middleware/validatePackageName.js similarity index 100% rename from server/middleware/validatePackageName.js rename to modules/middleware/validatePackageName.js diff --git a/server/middleware/validatePackageURL.js b/modules/middleware/validatePackageURL.js similarity index 100% rename from server/middleware/validatePackageURL.js rename to modules/middleware/validatePackageURL.js diff --git a/server/middleware/validateQuery.js b/modules/middleware/validateQuery.js similarity index 100% rename from server/middleware/validateQuery.js rename to modules/middleware/validateQuery.js diff --git a/server/plugins/__tests__/.eslintrc b/modules/plugins/__tests__/.eslintrc similarity index 100% rename from server/plugins/__tests__/.eslintrc rename to modules/plugins/__tests__/.eslintrc diff --git a/server/plugins/__tests__/unpkgRewrite-test.js b/modules/plugins/__tests__/unpkgRewrite-test.js similarity index 100% rename from server/plugins/__tests__/unpkgRewrite-test.js rename to modules/plugins/__tests__/unpkgRewrite-test.js diff --git a/server/plugins/unpkgRewrite.js b/modules/plugins/unpkgRewrite.js similarity index 96% rename from server/plugins/unpkgRewrite.js rename to modules/plugins/unpkgRewrite.js index 2f4873d..f6090ce 100644 --- a/server/plugins/unpkgRewrite.js +++ b/modules/plugins/unpkgRewrite.js @@ -1,7 +1,7 @@ const URL = require("whatwg-url"); const warning = require("warning"); -const origin = require("../config").origin; +const origin = require("../serverConfig").origin; const bareIdentifierFormat = /^((?:@[^/]+\/)?[^/]+)(\/.*)?$/; diff --git a/server/secretKey.js b/modules/secretKey.js similarity index 100% rename from server/secretKey.js rename to modules/secretKey.js diff --git a/server/config.js b/modules/serverConfig.js similarity index 100% rename from server/config.js rename to modules/serverConfig.js diff --git a/server/utils/__tests__/.eslintrc b/modules/utils/__tests__/.eslintrc similarity index 100% rename from server/utils/__tests__/.eslintrc rename to modules/utils/__tests__/.eslintrc diff --git a/server/utils/__tests__/createSearch-test.js b/modules/utils/__tests__/createSearch-test.js similarity index 100% rename from server/utils/__tests__/createSearch-test.js rename to modules/utils/__tests__/createSearch-test.js diff --git a/server/utils/__tests__/getContentType-test.js b/modules/utils/__tests__/getContentType-test.js similarity index 100% rename from server/utils/__tests__/getContentType-test.js rename to modules/utils/__tests__/getContentType-test.js diff --git a/server/utils/__tests__/parsePackageURL-test.js b/modules/utils/__tests__/parsePackageURL-test.js similarity index 100% rename from server/utils/__tests__/parsePackageURL-test.js rename to modules/utils/__tests__/parsePackageURL-test.js diff --git a/server/utils/addLeadingSlash.js b/modules/utils/addLeadingSlash.js similarity index 100% rename from server/utils/addLeadingSlash.js rename to modules/utils/addLeadingSlash.js diff --git a/server/utils/bufferStream.js b/modules/utils/bufferStream.js similarity index 100% rename from server/utils/bufferStream.js rename to modules/utils/bufferStream.js diff --git a/server/utils/cache.js b/modules/utils/cache.js similarity index 100% rename from server/utils/cache.js rename to modules/utils/cache.js diff --git a/server/utils/createPackageURL.js b/modules/utils/createPackageURL.js similarity index 100% rename from server/utils/createPackageURL.js rename to modules/utils/createPackageURL.js diff --git a/server/utils/createSearch.js b/modules/utils/createSearch.js similarity index 100% rename from server/utils/createSearch.js rename to modules/utils/createSearch.js diff --git a/server/utils/data.js b/modules/utils/data.js similarity index 100% rename from server/utils/data.js rename to modules/utils/data.js diff --git a/server/utils/fetchNpmPackage.js b/modules/utils/fetchNpmPackage.js similarity index 100% rename from server/utils/fetchNpmPackage.js rename to modules/utils/fetchNpmPackage.js diff --git a/server/utils/fetchNpmPackageInfo.js b/modules/utils/fetchNpmPackageInfo.js similarity index 92% rename from server/utils/fetchNpmPackageInfo.js rename to modules/utils/fetchNpmPackageInfo.js index 64881b2..43ebc1c 100644 --- a/server/utils/fetchNpmPackageInfo.js +++ b/modules/utils/fetchNpmPackageInfo.js @@ -1,7 +1,7 @@ const url = require("url"); const https = require("https"); -const config = require("../config"); +const serverConfig = require("../serverConfig"); const bufferStream = require("./bufferStream"); const agent = require("./registryAgent"); @@ -16,7 +16,7 @@ function fetchNpmPackageInfo(packageName) { ? `@${encodeURIComponent(packageName.substring(1))}` : encodeURIComponent(packageName); - const infoURL = `${config.registryURL}/${encodedPackageName}`; + const infoURL = `${serverConfig.registryURL}/${encodedPackageName}`; console.log( `info: Fetching package info for ${packageName} from ${infoURL}` diff --git a/server/utils/getContentType.js b/modules/utils/getContentType.js similarity index 100% rename from server/utils/getContentType.js rename to modules/utils/getContentType.js diff --git a/server/utils/getContentTypeHeader.js b/modules/utils/getContentTypeHeader.js similarity index 100% rename from server/utils/getContentTypeHeader.js rename to modules/utils/getContentTypeHeader.js diff --git a/server/utils/getIntegrity.js b/modules/utils/getIntegrity.js similarity index 100% rename from server/utils/getIntegrity.js rename to modules/utils/getIntegrity.js diff --git a/server/utils/getNpmPackageInfo.js b/modules/utils/getNpmPackageInfo.js similarity index 100% rename from server/utils/getNpmPackageInfo.js rename to modules/utils/getNpmPackageInfo.js diff --git a/server/utils/incrementCounter.js b/modules/utils/incrementCounter.js similarity index 100% rename from server/utils/incrementCounter.js rename to modules/utils/incrementCounter.js diff --git a/server/utils/isValidPackageName.js b/modules/utils/isValidPackageName.js similarity index 100% rename from server/utils/isValidPackageName.js rename to modules/utils/isValidPackageName.js diff --git a/server/utils/parsePackageURL.js b/modules/utils/parsePackageURL.js similarity index 100% rename from server/utils/parsePackageURL.js rename to modules/utils/parsePackageURL.js diff --git a/server/utils/registryAgent.js b/modules/utils/registryAgent.js similarity index 100% rename from server/utils/registryAgent.js rename to modules/utils/registryAgent.js diff --git a/server/utils/renderPage.js b/modules/utils/renderPage.js similarity index 100% rename from server/utils/renderPage.js rename to modules/utils/renderPage.js diff --git a/server.js b/server.js index ab7ea5f..486cdeb 100644 --- a/server.js +++ b/server.js @@ -2,11 +2,11 @@ const path = require("path"); const throng = require("throng"); const raven = require("raven"); -const createServer = require("./server/createServer"); -const createDevServer = require("./server/createDevServer"); -const config = require("./server/config"); +const createServer = require("./modules/createServer"); +const createDevServer = require("./modules/createDevServer"); +const serverConfig = require("./modules/serverConfig"); -require("./server/clientRuntime"); +require("./modules/clientRuntime"); if (process.env.SENTRY_DSN) { raven @@ -26,14 +26,14 @@ function startServer(id) { : createDevServer( path.resolve(__dirname, "public"), require("./webpack.config"), - config.origin + serverConfig.origin ); - server.listen(config.port, () => { + server.listen(serverConfig.port, () => { console.log( "Server #%s listening on port %s, Ctrl+C to stop", id, - config.port + serverConfig.port ); }); diff --git a/webpack.config.js b/webpack.config.js index ebdeca9..0a2955a 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -4,8 +4,8 @@ const ExtractTextPlugin = require("extract-text-webpack-plugin"); module.exports = { entry: { - main: path.resolve(__dirname, "./server/client/main.js"), - autoIndex: path.resolve(__dirname, "./server/client/autoIndex.js") + main: path.resolve(__dirname, "./modules/client/main.js"), + autoIndex: path.resolve(__dirname, "./modules/client/autoIndex.js") }, externals: {