Rename directory built to build

64json · 64json · commit f827ee533011 · 2018-07-12T23:02:17.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
-.idea
-node_modules
-npm-debug.log
+/.idea
+/node_modules
+/build
+/npm-debug.log
+/package-lock.json
 .DS_Store
-built
-package-lock.json
diff --git a/app/backend.js b/app/backend.js
@@ -3,7 +3,7 @@ const {
   __PROD__,
   __DEV__,
   proxyPort,
-  backendBuiltPath,
+  backendBuildPath,
   apiEndpoint,
 } = require('../environment');
 
@@ -31,16 +31,16 @@ if (__DEV__) {
 
       try {
         if (httpServer) httpServer.close();
-        delete require.cache[require.resolve(backendBuiltPath)];
-        const app = require(backendBuiltPath).default;
+        delete require.cache[require.resolve(backendBuildPath)];
+        const app = require(backendBuildPath).default;
         httpServer = app.listen(proxyPort);
       } catch (e) {
         console.error(e);
       }
     }
   });
 } else {
-  const app = require(backendBuiltPath).default;
+  const app = require(backendBuildPath).default;
   app.listen(proxyPort);
 }
 
diff --git a/app/frontend.js b/app/frontend.js
@@ -6,7 +6,7 @@ const {
   frontendSrcPath,
   algorithmApiSrcPath,
   wikiApiSrcPath,
-  frontendBuiltPath,
+  frontendBuildPath,
   apiEndpoint,
 } = require('../environment');
 
@@ -32,5 +32,5 @@ if (__DEV__) {
 
   module.exports = app;
 } else {
-  module.exports = express.static(frontendBuiltPath);
+  module.exports = express.static(frontendBuildPath);
 }
diff --git a/environment.js b/environment.js
@@ -29,9 +29,9 @@ const githubBotAuth = {
 const githubOrg = GITHUB_ORG;
 const githubRepo = GITHUB_REPO;
 
-const builtPath = path.resolve(__dirname, 'built');
-const frontendBuiltPath = path.resolve(builtPath, 'frontend');
-const backendBuiltPath = path.resolve(builtPath, 'backend');
+const buildPath = path.resolve(__dirname, 'build');
+const frontendBuildPath = path.resolve(buildPath, 'frontend');
+const backendBuildPath = path.resolve(buildPath, 'backend');
 
 const srcPath = path.resolve(__dirname, 'src');
 const frontendSrcPath = path.resolve(srcPath, 'frontend');
@@ -49,8 +49,8 @@ module.exports = {
   githubBotAuth,
   githubOrg,
   githubRepo,
-  frontendBuiltPath,
-  backendBuiltPath,
+  frontendBuildPath,
+  backendBuildPath,
   frontendSrcPath,
   backendSrcPath,
   apiEndpoint,
diff --git a/src/backend/controllers/compiler.js b/src/backend/controllers/compiler.js
@@ -4,7 +4,7 @@ import path from 'path';
 const router = express.Router();
 
 const getJsWorker = (req, res, next) => {
-  res.sendFile(path.resolve(__dirname, '..', 'tracers', 'languages', 'js', 'built', 'index.js'));
+  res.sendFile(path.resolve(__dirname, '..', 'tracers', 'languages', 'js', 'build', 'index.js'));
 };
 
 const compileJava = (req, res, next) => {
diff --git a/src/backend/tracers b/src/backend/tracers
@@ -1 +1 @@
-Subproject commit bb36f233ba74c31c7506f5d3df74a6ec6716f8a8
+Subproject commit a5804d922615effe85f7d16b19faf746b38bd108
diff --git a/webpack.backend.config.js b/webpack.backend.config.js
@@ -5,7 +5,7 @@ const fs = require('fs');
 
 const {
   __DEV__,
-  backendBuiltPath: builtPath,
+  backendBuildPath: buildPath,
   backendSrcPath: srcPath,
 } = require('./environment');
 
@@ -29,7 +29,7 @@ module.exports = {
     alias,
   },
   output: {
-    path: builtPath,
+    path: buildPath,
     filename: 'index.js',
     libraryTarget: 'umd',
   },
@@ -39,7 +39,7 @@ module.exports = {
     ],
   },
   plugins: [
-    new CleanWebpackPlugin([builtPath]),
+    new CleanWebpackPlugin([buildPath]),
   ],
   mode: __DEV__ ? 'development' : 'production',
 };
diff --git a/webpack.frontend.config.js b/webpack.frontend.config.js
@@ -11,7 +11,7 @@ const fs = require('fs');
 const {
   __PROD__,
   __DEV__,
-  frontendBuiltPath: builtPath,
+  frontendBuildPath: buildPath,
   frontendSrcPath: srcPath,
 } = require('./environment');
 
@@ -39,7 +39,7 @@ module.exports = {
   },
   output: {
     filename: __DEV__ ? '[name].js' : '[name].[chunkhash].js',
-    path: builtPath,
+    path: buildPath,
     publicPath: '/',
   },
   module: {
@@ -67,8 +67,8 @@ module.exports = {
     ],
   },
   plugins: filter([
-    new CleanWebpackPlugin([builtPath]),
-    new CopyWebpackPlugin([{ from: path.resolve(srcPath, 'static'), to: builtPath }]),
+    new CleanWebpackPlugin([buildPath]),
+    new CopyWebpackPlugin([{ from: path.resolve(srcPath, 'static'), to: buildPath }]),
     new HtmlWebpackPlugin({
       template: path.resolve(srcPath, 'template.html'),
       hash: false,
