From 044d6bd7761fde1b67b547580cce6142bb9681b0 Mon Sep 17 00:00:00 2001
From: David Evans <davidje13@users.noreply.github.com>
Date: Tue, 1 May 2018 19:31:52 +0100
Subject: [PATCH] Restructure web resources to be within one folder

---
 .../contents.xcworkspacedata                  |  3 -
 bin/server.js                                 |  6 +-
 docs/CONTRIBUTING.md                          |  7 +--
 index.html                                    |  6 +-
 library.htm                                   |  2 +-
 package.json                                  |  2 +-
 spec/support/eslintignore                     |  2 +-
 spec/support/karma.conf.js                    |  4 +-
 styles/readmeImages.css                       | 60 -------------------
 {weblib => web/lib}/editor.js                 |  0
 {weblib => web/lib}/editor.min.js             |  0
 web/{ => scripts}/editor.mjs                  |  2 +-
 .../interface/ComponentsLibrary.mjs           |  0
 .../interface/ComponentsLibrary_spec.mjs      |  9 ++-
 web/{ => scripts}/interface/Interface.mjs     |  2 +-
 .../interface/Interface_spec.mjs              |  4 +-
 web/{ => scripts}/requireCDN.mjs              |  0
 web/{ => scripts}/rollup.config.js            |  4 +-
 {styles => web/styles}/editor.css             |  0
 {styles => web/styles}/library.css            |  0
 20 files changed, 26 insertions(+), 87 deletions(-)
 delete mode 100644 styles/readmeImages.css
 rename {weblib => web/lib}/editor.js (100%)
 rename {weblib => web/lib}/editor.min.js (100%)
 rename web/{ => scripts}/editor.mjs (94%)
 rename web/{ => scripts}/interface/ComponentsLibrary.mjs (100%)
 rename web/{ => scripts}/interface/ComponentsLibrary_spec.mjs (76%)
 rename web/{ => scripts}/interface/Interface.mjs (99%)
 rename web/{ => scripts}/interface/Interface_spec.mjs (93%)
 rename web/{ => scripts}/requireCDN.mjs (100%)
 rename web/{ => scripts}/rollup.config.js (83%)
 rename {styles => web/styles}/editor.css (100%)
 rename {styles => web/styles}/library.css (100%)

diff --git a/SequenceDiagram.xcworkspace/contents.xcworkspacedata b/SequenceDiagram.xcworkspace/contents.xcworkspacedata
index e000973..313cd59 100644
--- a/SequenceDiagram.xcworkspace/contents.xcworkspacedata
+++ b/SequenceDiagram.xcworkspace/contents.xcworkspacedata
@@ -10,9 +10,6 @@
    <FileRef
       location = "container:spec">
    </FileRef>
-   <FileRef
-      location = "container:styles">
-   </FileRef>
    <FileRef
       location = "container:web">
    </FileRef>
diff --git a/bin/server.js b/bin/server.js
index 36a28f0..5666f01 100755
--- a/bin/server.js
+++ b/bin/server.js
@@ -46,9 +46,9 @@ statics
 	.addResources('/', BASEDIR, [
 		'index.html',
 		'library.htm',
-		'styles',
 		'lib',
-		'weblib',
+		'web/lib',
+		'web/styles',
 		'favicon.png',
 		'apple-touch-icon.png',
 	], devMapper);
@@ -57,7 +57,7 @@ if(DEV) {
 	statics.addResources('/', BASEDIR, [
 		'node_modules/requirejs/require.js',
 		'scripts',
-		'web',
+		'web/scripts',
 	]);
 	statics.setFileWatch(true);
 }
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index d04bf39..81f7794 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -68,7 +68,7 @@ The available commands are:
 * `npm run lint`: runs the linter against all source and test files
 * `npm run minify`: runs the `minify-lib` and `minify-web` commands
 * `npm run minify-lib`: minifies the library code in `/lib`
-* `npm run minify-web`: minifies the web code in `/weblib`
+* `npm run minify-web`: minifies the web code in `/web/lib`
 
 ## Project Structure
 
@@ -93,8 +93,7 @@ The high-level structure is:
 Useful helpers can also be found in `/scripts/core/*` and
 `/scripts/svg/*`.
 
-The live editor (index.htm) uses the source in `/web/editor.mjs` and
-`/web/interface/*`.
+The live editor (index.htm) uses the sources in `/web/scripts/`.
 
 ## Testing
 
@@ -157,7 +156,7 @@ minified library (this is preferred but not required):
 npm run minify;
 ```
 
-This will update the files in `/lib` and `/weblib`. The minified code
+This will update the files in `/lib` and `/web/lib`. The minified code
 is a self-contained copy of the `/scripts/sequence/SequenceDiagram.mjs`
 script, with some boiler-plate added to allow loading into a page in a
 variety of ways.
diff --git a/index.html b/index.html
index 35956ef..52c1ce0 100644
--- a/index.html
+++ b/index.html
@@ -31,7 +31,7 @@
 	crossorigin="anonymous"
 >
 
-<link rel="stylesheet" href="styles/editor.css">
+<link rel="stylesheet" href="web/styles/editor.css">
 
 <meta
 	name="cdn-split"
@@ -68,7 +68,7 @@
 	src="node_modules/requirejs/require.js"
 	crossorigin="anonymous"
 ></script>
-<script src="web/editor.mjs" type="module"></script>
+<script src="web/scripts/editor.mjs" type="module"></script>
 /DEV -->
 
 <!-- LIVE -->
@@ -78,7 +78,7 @@
 	integrity="sha256-0SGl1PJNDyJwcV5T+weg2zpEMrh7xvlwO4oXgvZCeZk="
 	crossorigin="anonymous"
 ></script>
-<script src="weblib/editor.min.js"></script>
+<script src="web/lib/editor.min.js"></script>
 <!-- /LIVE -->
 
 </head>
diff --git a/library.htm b/library.htm
index 71da1cc..5932d5f 100644
--- a/library.htm
+++ b/library.htm
@@ -25,7 +25,7 @@
 	integrity="sha256-I8NyGs4wjbMuBSUE40o55W6k6P7tu/7G28/JGUUYCIs="
 	crossorigin="anonymous"
 >
-<link rel="stylesheet" href="styles/library.css">
+<link rel="stylesheet" href="web/styles/library.css">
 
 <script
 	src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.37.0/codemirror.min.js"
diff --git a/package.json b/package.json
index e0a52fe..c961cba 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "lint": "eslint . --config spec/support/eslintrc.js --ignore-path spec/support/eslintignore --ext .js --ext .mjs",
     "generate-screenshots": "bin/generate-screenshots.js README.md",
     "minify-lib": "rollup --config scripts/rollup.config.js && uglifyjs --compress --mangle --warn --output lib/sequence-diagram-web.min.js -- lib/sequence-diagram-web.js",
-    "minify-web": "rollup --config web/rollup.config.js && uglifyjs --compress --mangle --warn --output weblib/editor.min.js -- weblib/editor.js",
+    "minify-web": "rollup --config web/scripts/rollup.config.js && uglifyjs --compress --mangle --warn --output web/lib/editor.min.js -- web/lib/editor.js",
     "minify": "npm run minify-lib && npm run minify-web",
     "prepublishOnly": "npm run minify-lib && npm run generate-screenshots && npm test",
     "start": "bin/server.js",
diff --git a/spec/support/eslintignore b/spec/support/eslintignore
index bc6dbb4..1bf79b8 100644
--- a/spec/support/eslintignore
+++ b/spec/support/eslintignore
@@ -1,6 +1,6 @@
 node_modules
 lib
-weblib
+web/lib
 ephemeral
 
 *FontData.mjs
diff --git a/spec/support/karma.conf.js b/spec/support/karma.conf.js
index 875177a..87ba757 100644
--- a/spec/support/karma.conf.js
+++ b/spec/support/karma.conf.js
@@ -37,7 +37,7 @@ module.exports = (config) => {
 			usePhantomJS: false,
 		},
 
-		exclude: ['node_modules/**/*_spec.*', 'lib/**', 'weblib/**'],
+		exclude: ['node_modules/**/*_spec.*', 'lib/**', 'web/lib/**'],
 		files: [
 			'node_modules/codemirror/lib/codemirror.js',
 			{
@@ -51,7 +51,7 @@ module.exports = (config) => {
 			{included: false, pattern: 'screenshots/**/*'},
 			{included: false, pattern: 'scripts/**/*'},
 			{included: false, pattern: 'spec/**/*'},
-			{included: false, pattern: 'web/**/*'},
+			{included: false, pattern: 'web/scripts/**/*'},
 			{included: false, pattern: 'bin/**/*'},
 			{included: false, pattern: 'README.md'},
 		],
diff --git a/styles/readmeImages.css b/styles/readmeImages.css
deleted file mode 100644
index 0eda0ff..0000000
--- a/styles/readmeImages.css
+++ /dev/null
@@ -1,60 +0,0 @@
-html, body {
-	margin: 0;
-	padding: 0;
-}
-
-body {
-	margin-bottom: 50px;
-	background: #EEEEEE;
-}
-
-.status {
-	text-align: center;
-	font-size: 2em;
-	margin: 10px;
-}
-
-.hold {
-	display: block;
-	width: 920px;
-	background: #FFFFFF;
-	box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
-	padding: 5px;
-	margin: 10px auto;
-	border-radius: 3px;
-	overflow: hidden;
-}
-
-.hold > svg {
-	width: 300px;
-	height: auto;
-	margin-right: 10px;
-}
-
-.hold > .raster {
-	width: 300px;
-	margin-right: 10px;
-}
-
-.hold > .original {
-	width: 300px;
-	background: #F8F8F8;
-}
-
-.hold a {
-	display: block;
-	text-align: center;
-	font-family: sans-serif;
-	padding: 15px;
-	margin: 5px -5px -5px;
-}
-
-.hold a:link, .hold a:visited {
-	color: #666699;
-	text-decoration: none;
-	cursor: pointer;
-}
-.hold a:active, .hold a:hover {
-	background: #EEEEEE;
-	color: #6666CC;
-}
diff --git a/weblib/editor.js b/web/lib/editor.js
similarity index 100%
rename from weblib/editor.js
rename to web/lib/editor.js
diff --git a/weblib/editor.min.js b/web/lib/editor.min.js
similarity index 100%
rename from weblib/editor.min.js
rename to web/lib/editor.min.js
diff --git a/web/editor.mjs b/web/scripts/editor.mjs
similarity index 94%
rename from web/editor.mjs
rename to web/scripts/editor.mjs
index 80b3ff1..d2c2fdd 100644
--- a/web/editor.mjs
+++ b/web/scripts/editor.mjs
@@ -1,6 +1,6 @@
 import ComponentsLibrary from './interface/ComponentsLibrary.mjs';
 import Interface from './interface/Interface.mjs';
-import SequenceDiagram from '../scripts/sequence/SequenceDiagram.mjs';
+import SequenceDiagram from '../../scripts/sequence/SequenceDiagram.mjs';
 import {require} from './requireCDN.mjs';
 
 const defaultCode = (
diff --git a/web/interface/ComponentsLibrary.mjs b/web/scripts/interface/ComponentsLibrary.mjs
similarity index 100%
rename from web/interface/ComponentsLibrary.mjs
rename to web/scripts/interface/ComponentsLibrary.mjs
diff --git a/web/interface/ComponentsLibrary_spec.mjs b/web/scripts/interface/ComponentsLibrary_spec.mjs
similarity index 76%
rename from web/interface/ComponentsLibrary_spec.mjs
rename to web/scripts/interface/ComponentsLibrary_spec.mjs
index 9ce3eb2..f925fba 100644
--- a/web/interface/ComponentsLibrary_spec.mjs
+++ b/web/scripts/interface/ComponentsLibrary_spec.mjs
@@ -1,7 +1,10 @@
-import {VirtualDocument, textSizerFactory} from '../../spec/stubs/TestDOM.mjs';
+import {
+	VirtualDocument,
+	textSizerFactory,
+} from '../../../spec/stubs/TestDOM.mjs';
 import ComponentsLibrary from './ComponentsLibrary.mjs';
-import SequenceDiagram from '../../scripts/sequence/SequenceDiagram.mjs';
-import {nodejs} from '../../scripts/core/browser.mjs';
+import SequenceDiagram from '../../../scripts/sequence/SequenceDiagram.mjs';
+import {nodejs} from '../../../scripts/core/browser.mjs';
 
 const themes = SequenceDiagram.getDefaultThemeNames().slice(1);
 
diff --git a/web/interface/Interface.mjs b/web/scripts/interface/Interface.mjs
similarity index 99%
rename from web/interface/Interface.mjs
rename to web/scripts/interface/Interface.mjs
index 403166b..9138f77 100644
--- a/web/interface/Interface.mjs
+++ b/web/scripts/interface/Interface.mjs
@@ -1,6 +1,6 @@
 /* eslint-disable max-lines */
 
-import DOMWrapper from '../../scripts/core/DOMWrapper.mjs';
+import DOMWrapper from '../../../scripts/core/DOMWrapper.mjs';
 
 const DELAY_AGENTCHANGE = 500;
 const DELAY_STAGECHANGE = 250;
diff --git a/web/interface/Interface_spec.mjs b/web/scripts/interface/Interface_spec.mjs
similarity index 93%
rename from web/interface/Interface_spec.mjs
rename to web/scripts/interface/Interface_spec.mjs
index fe1ee5f..7fdc99a 100644
--- a/web/interface/Interface_spec.mjs
+++ b/web/scripts/interface/Interface_spec.mjs
@@ -1,6 +1,6 @@
-import {Event, VirtualDocument} from '../../spec/stubs/TestDOM.mjs';
+import {Event, VirtualDocument} from '../../../spec/stubs/TestDOM.mjs';
 import Interface from './Interface.mjs';
-import stubRequire from '../../spec/stubs/require.mjs';
+import stubRequire from '../../../spec/stubs/require.mjs';
 
 describe('Interface', () => {
 	const defaultCode = 'my default code';
diff --git a/web/requireCDN.mjs b/web/scripts/requireCDN.mjs
similarity index 100%
rename from web/requireCDN.mjs
rename to web/scripts/requireCDN.mjs
diff --git a/web/rollup.config.js b/web/scripts/rollup.config.js
similarity index 83%
rename from web/rollup.config.js
rename to web/scripts/rollup.config.js
index 64abbb9..322e8fc 100644
--- a/web/rollup.config.js
+++ b/web/scripts/rollup.config.js
@@ -2,9 +2,9 @@ import hypothetical from 'rollup-plugin-hypothetical';
 
 export default [
 	{
-		input: 'web/editor.mjs',
+		input: 'web/scripts/editor.mjs',
 		output: {
-			file: 'weblib/editor.js',
+			file: 'web/lib/editor.js',
 			format: 'iife',
 			name: 'SequenceDiagramEditor',
 		},
diff --git a/styles/editor.css b/web/styles/editor.css
similarity index 100%
rename from styles/editor.css
rename to web/styles/editor.css
diff --git a/styles/library.css b/web/styles/library.css
similarity index 100%
rename from styles/library.css
rename to web/styles/library.css