Sync from development

eea · Feb 12, 2020 · 9cf992d · 9cf992d
1 parent 52f501a
commit 9cf992d
Show file tree

Hide file tree

Showing 14 changed files with 9,600 additions and 32,754 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -17,37 +17,49 @@
                         "@package", 
                         "./src"
                     ], 
+                    [
+                        "volto-corsproxy", 
+                        "./src/addons/volto-corsproxy/src"
+                    ], 
                     [
                         "volto-mosaic", 
-                        "./src/addons/volto-mosaic/src"
+                        "./src/develop/volto-mosaic/src"
                     ], 
                     [
                         "volto-datablocks", 
-                        "./src/addons/volto-datablocks/src"
+                        "./src/develop/volto-datablocks/src"
                     ], 
                     [
                         "volto-addons", 
-                        "./src/addons/volto-addons/src"
+                        "./src/develop/volto-addons/src"
                     ], 
                     [
                         "volto-ckeditor", 
-                        "./src/addons/volto-ckeditor/src"
+                        "./src/develop/volto-ckeditor/src"
                     ], 
                     [
                         "volto-blocks", 
-                        "./src/addons/volto-blocks/src"
+                        "./src/develop/volto-blocks/src"
                     ], 
                     [
-                        "volto-corsproxy", 
-                        "./src/addons/volto-corsproxy/src"
+                        "volto-drafteditor", 
+                        "./src/develop/volto-drafteditor/src"
                     ], 
                     [
-                        "volto-drafteditor", 
-                        "./src/addons/volto-drafteditor/src"
+                        "volto-base", 
+                        "./src/develop/volto-base/src"
                     ], 
                     [
                         "volto-plotlycharts", 
-                        "./src/addons/volto-plotlycharts/src"
+                        "./src/develop/volto-plotlycharts/src"
+                    ], 
+                    [
+                        "volto-embed", 
+                        "./src/develop/volto-embed/src"
+                    ], 
+                    [
+                        "volto-sidebar", 
+                        "./src/develop/volto-sidebar/src"
                     ]
                 ]
             }, 

diff --git a/.gitignore b/.gitignore
@@ -72,4 +72,5 @@ data
 omelette
 *.old
 *~
-src/addons
+src/develop
+npm-cache
diff --git a/Dockerfile b/Dockerfile
@@ -1,33 +1,76 @@
 # Based on https://github.com/plone/volto/blob/master/entrypoint.sh
 
-FROM node:10-jessie
+FROM node:10-jessie as build
+
+ARG NPM_CONFIG_REGISTRY
+ARG MAX_OLD_SPACE_SIZE=8192
+
+ENV NODE_OPTIONS=--max_old_space_size=$MAX_OLD_SPACE_SIZE
 
-RUN apt-get update -y
-RUN apt-get install -y git bsdmainutils
+RUN apt-get update -y \
+ && apt-get install -y git bsdmainutils vim-nox mc \
+ && rm -rf /var/lib/apt/lists/*
 
-ENV NODE_OPTIONS=--max_old_space_size=4096
+RUN npm i -g mrs-developer
 
 WORKDIR /opt/frontend/
 
 COPY docker-image.txt /
 COPY . .
+# RUN chmod +x optimize_node_modules.sh
+
+RUN mkdir -p /opt/frontend/src/develop
+
+RUN chown -R node /opt/frontend
 
-RUN rm -rf node_modules
+USER node
 
-RUN npm install mr-developer
+RUN echo "prefix = \"/home/node\"\n" > /home/node/.npmrc
+RUN rm -rf node_modules .git package-lock.json
 
-RUN node_modules/.bin/mrdeveloper --config=jsconfig.json --no-config --output=addons
+# RUN npm install mr-developer
 
-RUN NPM_CONFIG_REGISTRY=http://127.0.0.1:4873 npm install
+#RUN node_modules/.bin/mrdeveloper --config=jsconfig.json --no-config --output=addons
+RUN missdev
 
-RUN make clean-addons
-RUN rm -f package.json.lock
+RUN make activate-all
+
+# RUN NPM_CONFIG_REGISTRY=$NPM_CONFIG_REGISTRY npm ci
+RUN NPM_CONFIG_REGISTRY=$NPM_CONFIG_REGISTRY npm install
+
+# RUN ./optimize_node_modules.sh
+# RUN make clean-addons
+# RUN rm -f package-lock.json
 
 RUN RAZZLE_API_PATH=VOLTO_API_PATH RAZZLE_INTERNAL_API_PATH=VOLTO_INTERNAL_API_PATH yarn build
 
-COPY entrypoint-prod.sh entrypoint.sh
+# Second stage build
+FROM node:10-jessie
+
+RUN apt-get update -y \
+ && apt-get install -y git bsdmainutils vim-nox mc \
+ && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /opt/frontend/
+
+COPY entrypoint-prod.sh /opt/frontend/entrypoint.sh
 RUN chmod +x entrypoint.sh
 
+COPY package.json .
+COPY package-lock.json .
+
+COPY --from=build /opt/frontend/public ./public
+COPY --from=build /opt/frontend/build ./build
+
+RUN chown -R node /opt/frontend
+
+USER node
+
+RUN rm -rf package-lock.json
+RUN NPM_CONFIG_REGISTRY=$NPM_CONFIG_REGISTRY npm install --production
+
 ENTRYPOINT ["/opt/frontend/entrypoint.sh"]
+
 EXPOSE 3000 3001 4000 4001
+
 CMD yarn start:prod
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ DOCKERIMAGE_FILE="docker-image.txt"
 NAME := $(call image-name-split,$(shell cat $(DOCKERIMAGE_FILE)), 1)
 IMAGE=$(shell cat $(DOCKERIMAGE_FILE))
 
-# VOLTO_ADDONS=$(shell ./pkg_helper.py list)
+# VOLTO_ADDONS=$(shell ./scripts/pkg_helper.py list)
 
 .DEFAULT_GOAL := help
 
@@ -16,11 +16,13 @@ activate:		## Activate an addon package for development
 			echo "You need to specify package name in make command";\
 			echo "Ex: make activate pkg=volto-datablocks";\
 		else \
-			./pkg_helper.py --target=${pkg} activate;\
-			echo "Running npm install src/addons/${pkg}";\
-			npm install "src/addons/$${pkg}";\
+			./scripts/pkg_helper.py --target=${pkg} activate;\
+			echo "Running npm install in src/develop/${pkg}";\
+			cd "src/addons/$${pkg}";\
+			npm install;\
+			cd ../..;\
 			echo "Cleaning up after npm install";\
-			export VOLTO_ADDONS=`./pkg_helper.py list`;\
+			export VOLTO_ADDONS=`./scripts/pkg_helper.py list`;\
 			read -ra ADDR <<< "$${VOLTO_ADDONS}"; \
 			for pkg in "$${ADDR[@]}"; do \
 				echo "removing node_modules/$${pkg}"; \
@@ -33,7 +35,7 @@ PHONY: clean-addons
 clean-addons:
 	set -e; \
 		echo "Cleaning up after npm install";\
-		export VOLTO_ADDONS=`./pkg_helper.py list`;\
+		export VOLTO_ADDONS=`./scripts/pkg_helper.py list`;\
 		read -ra ADDR <<< "$${VOLTO_ADDONS}"; \
 		for pkg in "$${ADDR[@]}"; do \
 			echo "removing node_modules/$${pkg}"; \
@@ -43,15 +45,15 @@ clean-addons:
 .PHONY: activate-all
 activate-all:		## Automatically activates all addons from mr.developer.json
 	@echo "Activating all addon packages"
-	./pkg_helper.py activate-all
+	./scripts/pkg_helper.py activate-all
 
 .PHONY: deactivate
 deactivate:		## Deactivate an addon package for development
 	@if [[ -z "${pkg}" ]]; then\
 		echo "You need to specify package name in make command";\
 		echo "Ex: make deactivate pkg=volto-datablocks";\
 	else \
-		exec ./pkg_helper.py --target=${pkg} deactivate;\
+		exec ./scripts/pkg_helper.py --target=${pkg} deactivate;\
 		rm -rf node_modules/${pkg};\
 		echo "Deactivated ${pkg}";\
 	fi
@@ -100,7 +102,7 @@ bump:
 .PHONY: build-image
 build-image:
 	@echo "Building new docker image: $(IMAGE)";
-	docker build . --network=host -t "$(IMAGE)";
+	docker build . --network=host --build-arg MAX_OLD_SPACE_SIZE=4096 --build-arg NPM_CONFIG_REGISTRY=http://127.0.0.1:4873 -t "$(IMAGE)";
 	@echo "Image built."
 
 .PHONY: push
@@ -115,8 +117,18 @@ init-submodules:		## Initialize the git submodules
 
 .PHONY: develop
 develop:		## Runs "git pull" in all addons
-	./pkg_helper.py develop
+	./scripts/pkg_helper.py develop
 
 .PHONY: help
 help:		## Show this help.
 	@echo -e "$$(grep -hE '^\S+:.*##' $(MAKEFILE_LIST) | sed -e 's/:.*##\s*/:/' -e 's/^\(.\+\):\(.*\)/\\x1b[36m\1\\x1b[m:\2/' | column -c2 -t -s :)"
+
+.PHONY: build-production
+try-production:		## Build production bundle
+	NODE_OPTIONS=--max_old_space_size=4096 \
+		BUNDLE_ANALYZE=true \
+		RAZZLE_API_PATH=VOLTO_API_PATH \
+		RAZZLE_INTERNAL_API_PATH=VOLTO_INTERNAL_API_PATH \
+		yarn build
+	./entrypoint-dev.sh
+	echo "Now run: node build/server.js"
diff --git a/jsconfig.json b/jsconfig.json
@@ -1,30 +1,47 @@
 {
+    "addons": [
+        "volto-addons", 
+        "volto-blocks", 
+        "volto-ckeditor", 
+        "volto-corsproxy", 
+        "volto-datablocks", 
+        "volto-drafteditor", 
+        "volto-mosaic", 
+        "volto-plotlycharts", 
+        "volto-sidebar"
+    ], 
     "compilerOptions": {
         "baseUrl": "src", 
         "paths": {
             "volto-addons": [
-                "addons/volto-addons/src"
+                "develop/volto-addons/src"
+            ], 
+            "volto-base": [
+                "develop/volto-base/src"
             ], 
             "volto-blocks": [
-                "addons/volto-blocks/src"
+                "develop/volto-blocks/src"
             ], 
             "volto-ckeditor": [
-                "addons/volto-ckeditor/src"
-            ], 
-            "volto-corsproxy": [
-                "addons/volto-corsproxy/src"
+                "develop/volto-ckeditor/src"
             ], 
             "volto-datablocks": [
-                "addons/volto-datablocks/src"
+                "develop/volto-datablocks/src"
             ], 
             "volto-drafteditor": [
-                "addons/volto-drafteditor/src"
+                "develop/volto-drafteditor/src"
+            ], 
+            "volto-embed": [
+                "develop/volto-embed/src"
             ], 
             "volto-mosaic": [
-                "addons/volto-mosaic/src"
+                "develop/volto-mosaic/src"
             ], 
             "volto-plotlycharts": [
-                "addons/volto-plotlycharts/src"
+                "develop/volto-plotlycharts/src"
+            ], 
+            "volto-sidebar": [
+                "develop/volto-sidebar/src"
             ]
         }
     }

diff --git a/mr.developer.json b/mr.developer.json
diff --git a/mrs.developer.json b/mrs.developer.json
@@ -0,0 +1,42 @@
+{
+    "volto-mosaic": {
+        "url": "https://github.com/eea/volto-mosaic.git",
+        "path": "src"
+    },
+    "volto-datablocks": {
+        "url": "https://github.com/eea/volto-datablocks.git",
+        "path": "src"
+    },
+    "volto-blocks": {
+      "url": "https://github.com/eea/volto-blocks.git",
+      "path": "src"
+    },
+    "volto-addons": {
+      "url": "https://github.com/eea/volto-addons.git",
+      "path": "src"
+    },
+    "volto-ckeditor": {
+      "url": "https://github.com/eea/volto-ckeditor.git",
+      "path": "src"
+    },
+    "volto-drafteditor": {
+      "url": "https://github.com/eea/volto-drafteditor.git",
+      "path": "src"
+    },
+    "volto-plotlycharts": {
+      "url": "https://github.com/eea/volto-plotlycharts.git",
+      "path": "src"
+    },
+    "volto-sidebar": {
+      "url": "https://github.com/eea/volto-sidebar.git",
+      "path": "src"
+    },
+    "volto-base": {
+      "url": "https://github.com/eea/volto-base.git",
+      "path": "src"
+    },
+    "volto-embed": {
+      "url": "https://github.com/eea/volto-embed.git",
+      "path": "src"
+    }
+}