CLEANUP: Modernise yarn dependency setup.

JanWielemaker · Jan Wielemaker · commit dc16ea533a94 · 2019-12-16T16:36:10.000+01:00
diff --git a/.bowerrc b/.bowerrc
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 node_modules
-bower_components
+node_modules
 swish-bower-components.zip
 .bower-senitel
 passwd
diff --git a/.yarnrc b/.yarnrc
@@ -0,0 +1,2 @@
+# install modules here
+--modules-folder web/node_modules
diff --git a/Makefile b/Makefile
@@ -60,7 +60,7 @@ $(YARN_ARCHIVE)::
 
 upload::
 	rm -f $(YARN_ARCHIVE)
-	zip -r $(YARN_ARCHIVE) web/bower_components
+	zip -r $(YARN_ARCHIVE) web/node_modules
 	rsync $(YARN_ARCHIVE) ops:/home/swipl/web/download/swish/$(YARN_ARCHIVE)
 
 
diff --git a/README.md b/README.md
@@ -78,7 +78,7 @@ As installing node and yarn is not a pleasure on all operating systems,
 you can also download  the  dependencies  as   a  single  zip  file from
 http://www.swi-prolog.org/download/swish/swish-bower-components.zip.
 Unpack the zip file, maintaining the directory structure, from the swish
-root directory to create the directory web/bower_components. If you have
+root directory to create the directory web/node_modules. If you have
 `make` installed you can install the above `.zip` file using
 
     make yarn-zip
diff --git a/lib/page.pl b/lib/page.pl
@@ -331,7 +331,7 @@
 resource_prefix('form/').
 resource_prefix('icons/').
 resource_prefix('js/').
-resource_prefix('bower_components/').
+resource_prefix('node_modules/').
 
 %%	swish_page(+Options)//
 %
@@ -781,7 +781,7 @@
 alt(css, 'swish.css',     swish_web('css/swish.css')).
 alt(rjs, 'js/require.js', swish_web('js/require.js')) :-
 	\+ debugging(nominified).
-alt(rjs, 'bower_components/requirejs/require.js', -).
+alt(rjs, 'node_modules/requirejs/require.js', -).
 
 
 		 /*******************************
diff --git a/package.json b/package.json
@@ -1,23 +1,21 @@
 {
   "dependencies": {
-    "@bower_components/bootstrap": "twbs/bootstrap#3",
-    "@bower_components/c3": "masayuki0812/c3#*",
-    "@bower_components/codemirror": "components/codemirror#*",
-    "@bower_components/d3": "mbostock-bower/d3-bower#^5.0.0",
-    "@bower_components/jquery": "jquery/jquery-dist#>= 1.0.0",
-    "@bower_components/jquery.splitter": "jcubic/jquery.splitter#0.15",
-    "@bower_components/js-sha1": "emn178/js-sha1#*",
-    "@bower_components/laconic": "joestelmach/laconic#*",
-    "@bower_components/requirejs": "jrburke/requirejs-bower#*",
-    "@bower_components/sparkline": "gwatts/jquery.sparkline#*",
-    "@bower_components/svg-pan-zoom": "ariutta/svg-pan-zoom#*",
-    "@bower_components/tagmanager": "max-favilli/tagmanager#*",
-    "@bower_components/typeahead.js": "git://github.com/twitter/typeahead.js.git#master"
+    "bootstrap": "twbs/bootstrap#3",
+    "c3": "masayuki0812/c3#*",
+    "codemirror": "components/codemirror#*",
+    "d3": "mbostock-bower/d3-bower#^5.0.0",
+    "jquery": "jquery/jquery-dist#>= 1.0.0",
+    "jquery.splitter": "jcubic/jquery.splitter#0.15",
+    "js-sha1": "emn178/js-sha1#*",
+    "laconic": "joestelmach/laconic#*",
+    "requirejs": "jrburke/requirejs-bower#*",
+    "sparkline": "gwatts/jquery.sparkline#*",
+    "svg-pan-zoom": "ariutta/svg-pan-zoom#*",
+    "tagmanager": "max-favilli/tagmanager#*",
+    "typeahead.js": "git://github.com/twitter/typeahead.js.git#master",
+    "printthis": "git://github.com/jasonday/printThis.git#master"
   },
   "engines": {
     "yarn": ">= 1.0.0"
-  },
-  "scripts": {
-    "postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), 'web/bower_components', 'junction') } catch (e) { }\""
   }
 }
diff --git a/web/Makefile b/web/Makefile
@@ -1,7 +1,7 @@
 HOVER=text-hover.css text-hover.js
 HINT=show-hint-eclipse.css templates-hint.css templates-hint.js
 RENDER_SVGTREE=svg-tree-drawer.js
-SPLITTERD=bower_components/jquery.splitter/js
+SPLITTERD=node_modules/jquery.splitter/js
 
 all:	hover hint svgtree
 
diff --git a/web/css/css-inline.pl b/web/css/css-inline.pl
@@ -50,7 +50,7 @@
 	file_name_extension(_, Ext, S),
 	image_ext(Ext),
 	size_file(S, Size),
-	(   sub_string(S, _, _, _, '/bower_components/')
+	(   sub_string(S, _, _, _, '/node_modules/')
 	->  true
 	;   Size < 2000
 	), !,
diff --git a/web/css/editor.css b/web/css/editor.css
@@ -1,6 +1,6 @@
-@import url("../bower_components/codemirror/lib/codemirror.css");
-@import url("../bower_components/codemirror/addon/hint/show-hint.css");
-@import url("../bower_components/codemirror/addon/dialog/dialog.css");
+@import url("../node_modules/codemirror/lib/codemirror.css");
+@import url("../node_modules/codemirror/addon/hint/show-hint.css");
+@import url("../node_modules/codemirror/addon/dialog/dialog.css");
 @import url("../js/codemirror/theme/prolog.css");
 @import url("../js/codemirror/addon/hover/prolog-hover.css");
 @import url("../js/codemirror/addon/hint/templates-hint.css");
diff --git a/web/css/swish.css b/web/css/swish.css
@@ -7,10 +7,10 @@
 @import url("answer.css");
 @import url("term.css");
 @import url("gitty.css");
-@import url("../bower_components/jquery.splitter/css/jquery.splitter.css");
-@import url("../bower_components/bootstrap/dist/css/bootstrap.css");
-@import url("../bower_components/tagmanager/tagmanager.css");
-@import url("../bower_components/c3/c3.css");
+@import url("../node_modules/jquery.splitter/css/jquery.splitter.css");
+@import url("../node_modules/bootstrap/dist/css/bootstrap.css");
+@import url("../node_modules/tagmanager/tagmanager.css");
+@import url("../node_modules/c3/c3.css");
 @import url("typeaheadjs.css");
 @import url("diffview.css");
 @import url("notebook.css");
diff --git a/web/js/Makefile b/web/js/Makefile
@@ -12,7 +12,7 @@ RJS=r.js
 all:	src min require.js
 
 src::
-	$(MAKE) -C ../bower_components/sparkline jqs
+	$(MAKE) -C ../node_modules/sparkline jqs
 
 doc::	$(CONF) $(JQ) $(JS)
 	-jsdoc -p -c $(CONF) $(JQ) $(JS)
@@ -34,7 +34,7 @@ swish-min.js.gz: swish-min.js
 build.js: $(MAIN) build.js.in
 	swipl mkjsbuild.pl $(MAIN) build.js.in
 
-require.js: ../bower_components/requirejs/require.js
+require.js: ../node_modules/requirejs/require.js
 	cp -p $< $@
 
 clean:
diff --git a/web/js/swish.js b/web/js/swish.js
@@ -47,19 +47,19 @@ require.config({
   urlArgs: "ts="+new Date().getTime(),	/* prevent caching during development */
   waitSeconds: 60,			/* swish-min.js is big */
   paths:
-  { jquery:      "../bower_components/jquery/dist/jquery.min",
-    "jquery-ui": "../bower_components/jquery-ui/jquery-ui.min",
-    laconic:     "../bower_components/laconic/laconic",
-    bootstrap:   "../bower_components/bootstrap/dist/js/bootstrap.min",
-    bloodhound:  "../bower_components/typeahead.js/dist/bloodhound",
-    typeahead:   "../bower_components/typeahead.js/dist/typeahead.jquery",
-    splitter:    "../bower_components/jquery.splitter/js/jquery.splitter-0.15.0",
-    tagmanager:  "../bower_components/tagmanager/tagmanager",
-    sha1:        "../bower_components/js-sha1/src/sha1",
-    c3:          "../bower_components/c3/c3",
-    d3:          "../bower_components/d3/d3",
-    "svg-pan-zoom": "../bower_components/svg-pan-zoom/dist/svg-pan-zoom.min",
-    sparkline:	 "../bower_components/sparkline/dist/jquery.sparkline",
+  { jquery:      "../node_modules/jquery/dist/jquery.min",
+    "jquery-ui": "../node_modules/jquery-ui/jquery-ui.min",
+    laconic:     "../node_modules/laconic/laconic",
+    bootstrap:   "../node_modules/bootstrap/dist/js/bootstrap.min",
+    bloodhound:  "../node_modules/typeahead.js/dist/bloodhound",
+    typeahead:   "../node_modules/typeahead.js/dist/typeahead.jquery",
+    splitter:    "../node_modules/jquery.splitter/js/jquery.splitter-0.15.0",
+    tagmanager:  "../node_modules/tagmanager/tagmanager",
+    sha1:        "../node_modules/js-sha1/src/sha1",
+    c3:          "../node_modules/c3/c3",
+    d3:          "../node_modules/d3/d3",
+    "svg-pan-zoom": "../node_modules/svg-pan-zoom/dist/svg-pan-zoom.min",
+    sparkline:	 "../node_modules/sparkline/dist/jquery.sparkline",
 
 					/* CodeMirror extensions */
     "cm/mode/prolog": "codemirror/mode/prolog",
@@ -69,7 +69,7 @@ require.config({
     "cm/addon/hint/show-context-info": "codemirror/addon/hint/show-context-info",
 
 					/* Standard CodeMirror */
-    "cm" : "../bower_components/codemirror"
+    "cm" : "../node_modules/codemirror"
   },
   shim:
   { bootstrap:
diff --git a/web/split.html b/web/split.html
diff --git a/web/swish.html b/web/swish.html
@@ -7,7 +7,7 @@
   <head>
     <title>SWISH 2.0 page</title>
     <link rel="stylesheet" href="css/swish.css">
-    <script data-main="js/swish" src="bower_components/requirejs/require.js"></script>
+    <script data-main="js/swish" src="node_modules/requirejs/require.js"></script>
   </head>
   <body>
         <header class="navbar navbar-default">

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# install modules here`
	`2`	`+--modules-folder web/node_modules`