Fixes to frontend

eea · Mar 3, 2020 · 5723640 · 5723640
1 parent 8e94b63
commit 5723640
Show file tree

Hide file tree

Showing 6 changed files with 30,294 additions and 4,587 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,77 +1,77 @@
 {
-  "extends": "./node_modules/@plone/volto/.eslintrc",
-  "rules": {
-    "linebreak-style": [
-      "error", 
-      "unix"
-    ]
-  },
-  "settings": {
-    "import/resolver": {
-      "alias": {
-        "extensions": [
-                        ".js",
-                        ".jsx",
-                        ".json"
-                      ],
-        "map": [
-          [
-            "@package",
-            "./src"
-          ],
-          [
-            "@plone/volto",
-            "./node_modules/@plone/volto/src"
-          ],
-          [
-            "@plone/volto",
-            "./src/addons/@plone/volto/src"
-          ],
-          [
-            "volto-mosaic",
-            "./src/develop/volto-mosaic/src"
-          ],
-          [
-            "volto-datablocks",
-            "./src/develop/volto-datablocks/src"
-          ],
-          [
-            "volto-addons",
-            "./src/develop/volto-addons/src"
-          ],
-          [
-            "volto-ckeditor",
-            "./src/develop/volto-ckeditor/src"
-          ],
-          [
-            "volto-blocks",
-            "./src/develop/volto-blocks/src"
-          ],
-          [
-            "volto-drafteditor",
-            "./src/develop/volto-drafteditor/src"
-          ],
-          [
-            "volto-base",
-            "./src/develop/volto-base/src"
-          ],
-          [
-            "volto-plotlycharts",
-            "./src/develop/volto-plotlycharts/src"
-          ],
-          [
-            "volto-embed",
-            "./src/develop/volto-embed/src"
-          ],
-          [
-            "volto-sidebar",
-            "./src/develop/volto-sidebar/src"
-          ]
+    "extends": "./node_modules/@plone/volto/.eslintrc", 
+    "rules": {
+        "linebreak-style": [
+            "error", 
+            "unix"
         ]
-      },
-      "babel-plugin-root-import": {
-        "rootPathSuffix": "src"
-      }
+    }, 
+    "settings": {
+        "import/resolver": {
+            "alias": {
+                "extensions": [
+                    ".js", 
+                    ".jsx", 
+                    ".json"
+                ], 
+                "map": [
+                    [
+                        "@package", 
+                        "./src"
+                    ], 
+                    [
+                        "@plone/volto", 
+                        "./node_modules/@plone/volto/src"
+                    ], 
+                    [
+                        "@plone/volto", 
+                        "./src/addons/@plone/volto/src"
+                    ], 
+                    [
+                        "volto-mosaic", 
+                        "./src/develop/volto-mosaic/src"
+                    ], 
+                    [
+                        "volto-datablocks", 
+                        "./src/develop/volto-datablocks/src"
+                    ], 
+                    [
+                        "volto-addons", 
+                        "./src/develop/volto-addons/src"
+                    ], 
+                    [
+                        "volto-ckeditor", 
+                        "./src/develop/volto-ckeditor/src"
+                    ], 
+                    [
+                        "volto-blocks", 
+                        "./src/develop/volto-blocks/src"
+                    ], 
+                    [
+                        "volto-drafteditor", 
+                        "./src/develop/volto-drafteditor/src"
+                    ], 
+                    [
+                        "volto-base", 
+                        "./src/develop/volto-base/src"
+                    ], 
+                    [
+                        "volto-plotlycharts", 
+                        "./src/develop/volto-plotlycharts/src"
+                    ], 
+                    [
+                        "volto-embed", 
+                        "./src/develop/volto-embed/src"
+                    ], 
+                    [
+                        "volto-sidebar", 
+                        "./src/develop/volto-sidebar/src"
+                    ]
+                ]
+            }, 
+            "babel-plugin-root-import": {
+                "rootPathSuffix": "src"
+            }
+        }
     }
-  }
-}
+}
diff --git a/Makefile b/Makefile
@@ -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}"; \
@@ -42,25 +44,16 @@ clean-addons:
 
 .PHONY: activate-all
 activate-all:		## Automatically activates all addons from mr.developer.json
-	echo "Activating all addon packages"; \
-	export VOLTO_ADDONS=`./pkg_helper.py list`;\
-	read -ra ADDR <<< "$${VOLTO_ADDONS}"; \
-	for pkg in "$${ADDR[@]}"; do \
-		echo "Running npm install src/addons/${pkg}";\
-		npm install "src/addons/$${pkg}";\
-	done; \
-	for pkg in "$${ADDR[@]}"; do \
-		echo "removing node_modules/$${pkg}"; \
-		rm -rf "./node_modules/$${pkg}";\
-	done;
+	@echo "Activating all addon packages"
+	./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
@@ -129,3 +122,17 @@ develop:		## Runs "git pull" in all addons
 .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"
+
+.PHONY: sync
+sync: ## Sync repo with eea/volto-starter-kit Github template
+	npx git-upstream-template https://github.com/eea/volto-starter-kit.git