update

Dockerfile

@@ -1,37 +1,19 @@
-FROM costbase:2.0 as build
+FROM costbase_package_new_node_npm as build
 
 WORKDIR /home/ConstructionCost
 
 COPY package.json /home/ConstructionCost/
-COPY .babelrc /home/ConstructionCost/
+COPY npm-shrinkwrap.json /home/ConstructionCost/
 
-RUN cnpm install
-
-FROM base-alpine:latest as babel
-
-COPY --from=build /home/ConstructionCost /home/ConstructionCost
-
-COPY config /home/ConstructionCost/src/config/
-COPY logs /home/ConstructionCost/src/logs/
-COPY modules /home/ConstructionCost/src/modules/
-COPY public /home/ConstructionCost/src/public/
-COPY importserver.js server.js socket.js  /home/ConstructionCost/src/
-
-WORKDIR /home/ConstructionCost
-
-RUN babel src -d dist
-
-FROM base-alpine:latest
+RUN npm install
 
+FROM base-alpine-new-node:latest
 
 COPY . /home/ConstructionCost
 
 WORKDIR /home/ConstructionCost
 
-COPY --from=babel /home/ConstructionCost/dist /home/ConstructionCost
-COPY --from=babel /home/ConstructionCost/node_modules /home/ConstructionCost/node_modules/
-COPY public/web /home/ConstructionCost/public/web/
-
+COPY --from=build /home/ConstructionCost/node_modules /home/ConstructionCost/node_modules/
 
 RUN gulp build
 

npm-shrinkwrap.json

@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "graceful-fs": {
+      "version": "4.2.3"
+    }
+  }
+}

package.json

@@ -4,11 +4,7 @@
   "description": "Smart Soft - Construct Cost",
   "devDependencies": {
     "body-parser": "^1.13.2",
-    "babel-cli": "^6.24.1",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-stage-2": "^6.24.1",
-    "express": "^4.13.1",
+    "express": "^4.17.1",
     "mongoose": "~4.13.12",
     "async": "^2.1.5",
     "connect-mongo": "^1.3.2",
@@ -23,7 +19,6 @@
     "glob": "~4.0.5"
   },
   "dependencies": {
-    "babel-core": "^6.4.0",
     "bluebird": "^3.5.0",
     "del": "^1.1.1",
     "gt3-sdk": "^2.0.0",
@@ -38,7 +33,6 @@
     "gulp-inject": "^4.3.0",
     "gulp-load-plugins": "^0.10.0",
     "gulp-plumber": "^1.0.1",
-    "gulp-sass": "^2.0.0",
     "gulp-size": "^1.2.1",
     "gulp-uglify": "^1.1.0",
     "gulp-uglify-es": "^0.1.3",
@@ -62,7 +56,6 @@
     "wiredep": "^2.2.2"
   },
   "scripts": {
-    "preinstall": "npx npm-force-resolutions",
     "start": "node server.js",
     "server": "pm2-docker pm2_server.json",
     "socket": "node socket.js",
@@ -70,8 +63,5 @@
     "dev_server": "SET NODE_ENV=qa&& node server.js",
     "dev_socket": "SET NODE_ENV=qa&& node socket.js",
     "dev_import": "SET NODE_ENV=qa&& node importserver.js"
-  },
-  "resolutions": {
-    "graceful-fs": "4.2.4"
   }
 }