Merge pull request #49 from euphorie/scrum-1568--jquiupd

Update NuPlone JavaScript infrastructure
euphorie · Sep 26, 2023 · fbfe744 · fbfe744
2 parents d584ae5 + dd817ca
commit fbfe744
Show file tree

Hide file tree

Showing 180 changed files with 7,035 additions and 46,045 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,14 +1,14 @@
 [*]
-indent_style = space
+charset = utf-8
 end_of_line = lf
+indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
-charset = utf-8
 
-[{*.js,*.json}]
+[*{js,jsx,vue,ts}]
 indent_size = 4
 
-[{*.css,*.scss}]
+[*.{css,scss,xml,html,yml}]
 indent_size = 2
 
 [Makefile]

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require("@patternslib/dev/.eslintrc.js");
diff --git a/Makefile b/Makefile
@@ -40,6 +40,7 @@ bundle: stamp-yarn
 	-$(YARN) unlink @patternslib/patternslib
 	$(YARN) install --force
 	$(YARN) build
+	cp -R ./plonetheme/nuplone/static/bundle ./Prototype
 
 
 .PHONY: bundledev

diff --git a/Prototype/Templates/Base.dwt b/Prototype/Templates/Base.dwt
@@ -9,7 +9,7 @@
     <link rel="stylesheet" type="text/css" media="screen" href="../style/main/base.css" />
     <link rel="stylesheet" type="text/css" media="screen" href="../style/euphorie/base.css" />
     <link rel="icon" type="image/png" href="../media/favicon.png" />
-    <script type="text/javascript" src="oira.cms.js"> </script>
+    <script type="text/javascript" src="bundle/oira.cms.min.js"> </script>
     <!-- TemplateBeginEditable name="head" --><!-- TemplateEndEditable -->
   </head>
   <body>

diff --git a/Prototype/Templates/Survey.dwt b/Prototype/Templates/Survey.dwt
@@ -8,7 +8,7 @@
     <link rel="stylesheet" type="text/css" media="screen" href="../style/main/base.css" />
     <link rel="stylesheet" type="text/css" media="screen" href="../style/euphorie/base.css" />
     <link rel="icon" type="image/png" href="../media/favicon.png" />
-    <script type="text/javascript" src="oira.cms.js"> </script>
+    <script type="text/javascript" src="bundle/oira.cms.min.js"> </script>
     <!-- InstanceBeginEditable name="head" --><!-- TemplateBeginEditable name="head" --><!-- TemplateEndEditable --><!-- InstanceEndEditable -->
   </head>
   <body>

diff --git a/...ne/static/bundle/10a90e5b4dae60a0543c.png → Prototype/bundle/16fec672acf4e60b212d.png b/...ne/static/bundle/10a90e5b4dae60a0543c.png → Prototype/bundle/16fec672acf4e60b212d.png
diff --git a/...ne/static/bundle/70aafb8ff880c9e56337.png → Prototype/bundle/2487f1f6cffd2524ad3c.png b/...ne/static/bundle/70aafb8ff880c9e56337.png → Prototype/bundle/2487f1f6cffd2524ad3c.png
diff --git a/...ne/static/bundle/179bd5aaea5c09a81ce7.png → Prototype/bundle/ae9b3e279d547e10151b.png b/...ne/static/bundle/179bd5aaea5c09a81ce7.png → Prototype/bundle/ae9b3e279d547e10151b.png
diff --git a/...ne/static/bundle/cafe1bc324140ea6562e.png → Prototype/bundle/af253b1b82b79498bced.png b/...ne/static/bundle/cafe1bc324140ea6562e.png → Prototype/bundle/af253b1b82b79498bced.png
diff --git a/Prototype/bundle/chunks/0.a3d23778453ad969ef87.min.js b/Prototype/bundle/chunks/0.a3d23778453ad969ef87.min.js
diff --git a/Prototype/bundle/chunks/0.a3d23778453ad969ef87.min.js.map b/Prototype/bundle/chunks/0.a3d23778453ad969ef87.min.js.map
diff --git a/Prototype/bundle/chunks/10.3c6c25a5bee078945390.min.js b/Prototype/bundle/chunks/10.3c6c25a5bee078945390.min.js
diff --git a/Prototype/bundle/chunks/10.3c6c25a5bee078945390.min.js.map b/Prototype/bundle/chunks/10.3c6c25a5bee078945390.min.js.map
diff --git a/Prototype/bundle/chunks/105.1b49c3ee71d08bc44a99.min.js b/Prototype/bundle/chunks/105.1b49c3ee71d08bc44a99.min.js
diff --git a/Prototype/bundle/chunks/105.1b49c3ee71d08bc44a99.min.js.map b/Prototype/bundle/chunks/105.1b49c3ee71d08bc44a99.min.js.map