debug

.gitignore

@@ -8,6 +8,8 @@
 
 # production
 /build
+/dist
+/.vscode
 
 # misc
 .DS_Store
@@ -19,3 +21,10 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+/coverage
+.idea
+yarn.lock
+package-lock.json
+*bak
+.vscode

.gitlab-ci.yml

@@ -36,7 +36,7 @@ build-node-dev:
     #- svr251
   cache:
     paths:
-      - ./build
+      - ./dist
 
 docker-push-dev:
   image: docker:stable
@@ -48,7 +48,7 @@ docker-push-dev:
 #    DOCKER_DRIVER: overlay2
   script:
     - ls -al
-    - find ./ -name build
+    - find ./ -name dist
     - docker build -t registry.cn-shenzhen.aliyuncs.com/thinker-vc/communicaten-web:1.0.0 .
     - docker push registry.cn-shenzhen.aliyuncs.com/thinker-vc/communicate-web:1.0.0
   tags:
@@ -74,7 +74,7 @@ build-node-pro:
     #- svr251
   cache:
     paths:
-      - ./build
+      - ./dist
 
 
 docker-push-pro:
@@ -87,7 +87,7 @@ docker-push-pro:
 #    DOCKER_DRIVER: overlay2
   script:
     - ls -al
-    - find ./ -name build
+    - find ./ -name dist
     - docker build -t registry.cn-shenzhen.aliyuncs.com/thinker-vc/communicate-web:release-1.0.0 .
     - docker push registry.cn-shenzhen.aliyuncs.com/thinker-vc/communicate-web:release-1.0.0
   tags:

.idea/workspace.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="a6d092de-b4f8-454d-99f5-4dac3ce112e5" name="Default Changelist" comment="" />
+    <list default="true" id="a6d092de-b4f8-454d-99f5-4dac3ce112e5" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gitlab-ci.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.gitlab-ci.yml" afterDir="false" />
+    </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
     <ignored path="$PROJECT_DIR$/tmp/" />
@@ -64,32 +67,29 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1925">
-              <caret line="116" column="32" selection-start-line="116" selection-start-column="32" selection-end-line="116" selection-end-column="32" />
+            <state relative-caret-position="250">
+              <caret line="47" column="28" lean-forward="true" selection-start-line="47" selection-start-column="28" selection-end-line="47" selection-end-column="28" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/package.json">
+        <entry file="file://$PROJECT_DIR$/.gitignore">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="448">
-              <caret line="37" selection-start-line="37" selection-end-line="37" />
+            <state relative-caret-position="572">
+              <caret line="29" column="7" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="7" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/package.json">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="250">
-              <caret line="58" column="39" selection-start-line="58" selection-start-column="39" selection-end-line="58" selection-end-column="39" />
-              <folding>
-                <element signature="e#0#49#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="373">
+              <caret line="19" column="31" selection-start-line="19" selection-start-column="14" selection-end-line="19" selection-end-column="31" />
             </state>
           </provider>
         </entry>
@@ -175,7 +175,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/Pages/Communicate/Communicate.jsx" />
         <option value="$PROJECT_DIR$/src/components/List/index.less" />
         <option value="$PROJECT_DIR$/src/components/StepCard/index.less" />
         <option value="$PROJECT_DIR$/src/components/TopSearch/index.less" />
@@ -225,6 +224,7 @@
         <option value="$PROJECT_DIR$/src/utils/instance.js" />
         <option value="$PROJECT_DIR$/src/pages/Login/index.jsx" />
         <option value="$PROJECT_DIR$/config-overrides.js" />
+        <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/.gitlab-ci.yml" />
       </list>
     </option>
@@ -251,11 +251,6 @@
               <item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
               <item name="create-react-app" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
-              <item name="create-react-app" type="462c0819:PsiDirectoryNode" />
-              <item name="dist" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
               <item name="create-react-app" type="462c0819:PsiDirectoryNode" />
@@ -317,12 +312,12 @@
       <workItem from="1591419899087" duration="268000" />
       <workItem from="1591493817957" duration="11217000" />
       <workItem from="1591579020550" duration="32744000" />
-      <workItem from="1591665260536" duration="9904000" />
+      <workItem from="1591665260536" duration="10217000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="145463000" />
+    <option name="totallyTimeSpent" value="145776000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="784" extended-state="6" />
@@ -353,7 +348,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/resize.js" />
     <entry file="file://$PROJECT_DIR$/src/index.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="475">
@@ -695,24 +689,31 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/package.json">
+    <entry file="file://$PROJECT_DIR$/config-overrides.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="448">
-          <caret line="37" selection-start-line="37" selection-end-line="37" />
+        <state relative-caret-position="423">
+          <caret line="107" column="28" selection-start-line="107" selection-start-column="28" selection-end-line="107" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config-overrides.js">
+    <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="423">
-          <caret line="107" column="28" selection-start-line="107" selection-start-column="28" selection-end-line="107" selection-end-column="28" />
+        <state relative-caret-position="572">
+          <caret line="29" column="7" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="7" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1925">
-          <caret line="116" column="32" selection-start-line="116" selection-start-column="32" selection-end-line="116" selection-end-column="32" />
+        <state relative-caret-position="250">
+          <caret line="47" column="28" lean-forward="true" selection-start-line="47" selection-start-column="28" selection-end-line="47" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/package.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="373">
+          <caret line="19" column="31" selection-start-line="19" selection-start-column="14" selection-end-line="19" selection-end-column="31" />
         </state>
       </provider>
     </entry>

config-overrides.js

@@ -2,7 +2,8 @@ const { injectBabelPlugin, getLoader } = require('react-app-rewired');
 const {override}  = require("customize-cra")
 const path = require("path")
 const rewirePostcss = require('react-app-rewire-postcss');
-const px2rem = require('postcss-px2rem')
+const px2rem = require('postcss-px2rem');
+const paths = require('react-scripts/config/paths');
 
 
 const fileLoaderMatcher = function (rule) {
@@ -107,5 +108,7 @@ module.exports = function override(config, env) {
   let l = getLoader(config.module.rules, fileLoaderMatcher);
   l.exclude.push(/\.less$/);
 
+  paths.appBuild = path.join(path.dirname(paths.appBuild), 'dist');
+  config.output.path = path.join(path.dirname(config.output.path), 'dist');
   return config;
 };