Move js-beautify to build/js/modules to avoid build err

canonical · Jul 29, 2024 · 2231dd1 · 2231dd1
1 parent 5033cdf
commit 2231dd1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -62,5 +62,4 @@ env[23]/
 
 # Project-specific ignores
 js/app.js.map
-static/js/modules
-templates/static/js/beautify*.js
+static/js/modules
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "build": "yarn build-scss && yarn build-js && yarn build-class-references",
     "build-scss": "sass --load-path=node_modules --embed-sources --style=compressed scss:build/css && postcss --use autoprefixer --replace 'build/css/**/*.css' --map",
     "build:essential": "yarn run build-js && sass --load-path=node_modules --embed-sources --style=compressed scss/build.scss:build/css/build.css scss/docs:build/css/docs && postcss --use autoprefixer --replace 'build/css/**/*.css' --map",
-    "build-js": "mkdir -p build/js/modules && cp node_modules/@canonical/cookie-policy/build/js/cookie-policy.js build/js/modules && cp node_modules/@canonical/latest-news/dist/latest-news.js build/js/modules && cp node_modules/js-beautify/js/lib/beautify.js node_modules/js-beautify/js/lib/beautify-html.js node_modules/js-beautify/js/lib/beautify-css.js templates/static/js",
+    "build-js": "mkdir -p build/js/modules && cp node_modules/@canonical/cookie-policy/build/js/cookie-policy.js build/js/modules && cp node_modules/@canonical/latest-news/dist/latest-news.js build/js/modules && cp node_modules/js-beautify/js/lib/beautify.js node_modules/js-beautify/js/lib/beautify-html.js node_modules/js-beautify/js/lib/beautify-css.js build/js/modules",
     "build-class-references": "node scripts/create-class-references.js",
     "cypress:open": "cypress open",
     "cypress:run": "cypress run",

diff --git a/templates/_layouts/docs.html b/templates/_layouts/docs.html
@@ -126,9 +126,9 @@ <h4 class="p-table-of-contents__header">On this page:</h4>
       window.Prism = window.Prism || {};
       Prism.manual = true;
     </script>
-    <script defer src="{{ versioned_static('js/beautify.js') }}"></script>
-    <script defer src="{{ versioned_static('js/beautify-html.js') }}"></script>
-    <script defer src="{{ versioned_static('js/beautify-css.js') }}"></script>
+    <script defer src="{{ versioned_static('build/js/modules/beautify.js') }}"></script>
+    <script defer src="{{ versioned_static('build/js/modules/beautify-html.js') }}"></script>
+    <script defer src="{{ versioned_static('build/js/modules/beautify-css.js') }}"></script>
     <script defer src="{{ versioned_static('js/prism.min.js') }}"></script>
     <script defer src="{{ versioned_static('js/example.js') }}"></script>
 {% endblock %}