Skip to content

Commit fbf4637

Browse files
teesloanercircleci
andauthored
[CIRCLE-37828] Webpackify JS 🕸 (circleci#5723)
* Start: Moving to webpack. * Refactor: remove jquery cookie; webpack js-cookie. - remove window attachment of js cookie; - only import it where it is needed. * Clean: remove commented out lines - introduced in 12991b5 and not used. * Clean: migrate popper to es-6. * Fix: restore gemfile changes. * Clean: remove assets/*.js; create vendor bundle. * Clean: remove heaps of vendor code. - reinstate hljs, which I accidentally deleted. - install jquery as node module and make it a global - migrate site.min.js into vendor * Clean: trash dot files and old main.js * Review: make requested changes: - Fix: reinstate ruby version. - Clean: remove .tool-versions. - Clean: Move highlightjsBadge to experiments/ - Fix: restore git-clobbered main.js - Deps: update babel to handle optional chaining. - Add: tool-versions to gitignore. * Clean: move hljs init to app.js. * Update .gitignore Co-authored-by: Romain Sylvian <[email protected]> * Clean: move hljs to main.js * Fix: pin jquery dep. * Clean: move files around. Co-authored-by: Romain Sylvian <[email protected]>
1 parent 79a35bc commit fbf4637

21 files changed

+1933
-773
lines changed

.babelrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
],
1010
"plugins": [
1111
"@babel/plugin-proposal-nullish-coalescing-operator",
12+
"@babel/plugin-proposal-optional-chaining",
1213
"wildcard"
1314
]
14-
}
15+
}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ src-api/build/
2828
vendor
2929
jekyll/_config_override.yml
3030
markdownlint-results.json
31+
.tool-versions

jekyll/_includes/head.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,13 @@
2222
<link rel="stylesheet" href="{{ "/assets/css/footer.css" | prepend: site.baseurl }}" type="text/css" media="screen" />
2323
<link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
2424
<link rel="stylesheet" href="{{ "/assets/css/asciidoc.css" | prepend: site.baseurl }}">
25-
<!--link rel="stylesheet" href="{{ "/assets/css/asciidoc-pygments.css" | prepend: site.baseurl }}"-->
26-
<!--link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.11.0/styles/default.min.css">
2725
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.11.0/highlight.min.js"></script>
28-
<script>hljs.initHighlightingOnLoad();</script-->
2926
<title>{% if page.title %}{{ page.title | escape }} - CircleCI{% else %}{{ site.title | escape }} - CircleCI{% endif %}</title>
3027
{% include_cached segment.html site=site page=page %}
3128

3229
<!-- Instant Search CDN links /-->
3330
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/themes/reset-min.css" integrity="sha256-t2ATOGCtAIZNnzER679jwcFcKYfLlw01gli6F6oszk8=" crossorigin="anonymous">
3431
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/algoliasearch-lite.umd.js" integrity="sha256-MfeKq2Aw9VAkaE9Caes2NOxQf6vUa8Av0JqcUXUGkd0=" crossorigin="anonymous"></script>
3532
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/instantsearch.production.min.js" integrity="sha256-6S7q0JJs/Kx4kb/fv0oMjS855QTz5Rc2hh9AkIUjUsk=" crossorigin="anonymous"></script>
36-
<script src="https://cdn.jsdelivr.net/npm/[email protected]/src/js.cookie.min.js"></script>
3733
<script src="https://cdn.optimizely.com/datafiles/{{site.optimizely}}.json/tag.js"></script>
3834
</head>

jekyll/_includes/js-assets.html

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
<div>
2-
<script type="text/javascript" src="{{ site.baseurl }}/{% ministamp assets/js/vendor.min.js assets/vendor.min.js %}"></script>
3-
<script type="text/javascript" src="https://unpkg.com/@popperjs/[email protected]/dist/umd/popper.min.js"></script>
2+
<script type="text/javascript" src="{{ site.baseurl }}/{% ministamp assets/js/vendor.bundle.js assets/vendor.bundle.js %}"></script>
43
{% include_cached rollbar.html site=site %}
54
<script type="text/javascript" src="{{ site.baseurl }}/{% ministamp assets/js/app.bundle.js assets/app.bundle.js %}"></script>
6-
<script type="text/javascript" src="{{ site.baseurl }}/{% ministamp assets/js/user.js assets/user.js %}"></script>
7-
<script type="text/javascript" src="{{ site.baseurl }}/{% ministamp assets/js/site.min.js assets/site.min.js %}"></script>
8-
<script type="text/javascript" src="{{ site.baseurl }}/{% ministamp assets/js/jquery.cookie.min.js assets/jquery.cookie.min.js %}"></script>
9-
<script type="text/javascript" src="{{ site.baseurl }}/{% ministamp assets/js/sidebar.js assets/sidebar.js %}"></script>
10-
<script type="text/javascript" src="{{ site.baseurl }}/{% ministamp assets/js/main.js assets/main.js %}"></script>
11-
<script type="text/javascript" src="{{ site.baseurl }}/{% ministamp assets/js/nav.js assets/nav.js %}"></script>
125
<script type="text/javascript" src="{{ site.baseurl }}/{% ministamp assets/js/shared/components/subnav.js assets/shared/components/subnav.js %}"></script>
136
<script type="text/javascript" src="{{ site.baseurl }}/{% ministamp assets/js/shared/analytics-recursive-tracking.js assets/shared/analytics-recursive-tracking.js %}"></script>
147
<script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
15-
<script type="text/javascript" src="{{ site.baseurl }}/{% ministamp assets/js/highlightJSBadge.js assets/highlightJSBadge.js %}"></script>
16-
</div>
8+
</div>

jekyll/assets/js/jquery.cookie.min.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

jekyll/assets/js/site.min.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

jekyll/assets/js/vendor.min.js

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)