From b1eea612d203ac078f9f65e71d37a00cd1d6a2eb Mon Sep 17 00:00:00 2001 From: "Folkerth, Jennifer" Date: Mon, 17 Oct 2022 15:07:37 -0400 Subject: [PATCH 1/9] Removing duplicated Plug.Static --- apps/andi/endpoint.ex | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 apps/andi/endpoint.ex diff --git a/apps/andi/endpoint.ex b/apps/andi/endpoint.ex deleted file mode 100644 index 92994975e..000000000 --- a/apps/andi/endpoint.ex +++ /dev/null @@ -1,9 +0,0 @@ -defmodule Andi.Endpoint do - use Phoenix.Endpoint, otp_app: :andi - - plug Plug.Static, - at: "/", - from: :andi, - gzip: false, - only: ~w(css fonts images js favicon.ico) -end From f7fe978553d44b2645221c21095669985e361d99 Mon Sep 17 00:00:00 2001 From: "Folkerth, Jennifer" Date: Mon, 17 Oct 2022 15:10:50 -0400 Subject: [PATCH 2/9] Webpacking additional types of font files --- apps/andi/assets/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/andi/assets/webpack.config.js b/apps/andi/assets/webpack.config.js index b612f3368..641392ad6 100644 --- a/apps/andi/assets/webpack.config.js +++ b/apps/andi/assets/webpack.config.js @@ -35,7 +35,7 @@ module.exports = (env, options) => ({ ] }, { - test: /\.(woff|svg)(\?v=[a-z0-9]\.[a-z0-9]\.[a-z0-9])?$/, + test: /\.(woff(2)?|ttf|eot|svg)(\?v=[a-z0-9]\.[a-z0-9]\.[a-z0-9])?$/, use: [ { loader: 'file-loader', From 3850d9ff712879961cf7b277b30b18b80b983428 Mon Sep 17 00:00:00 2001 From: "Folkerth, Jennifer" Date: Mon, 17 Oct 2022 15:12:02 -0400 Subject: [PATCH 3/9] No longer specifying mime type because we serve multiple options --- apps/andi/assets/webpack.config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/andi/assets/webpack.config.js b/apps/andi/assets/webpack.config.js index 641392ad6..704deab97 100644 --- a/apps/andi/assets/webpack.config.js +++ b/apps/andi/assets/webpack.config.js @@ -42,7 +42,6 @@ module.exports = (env, options) => ({ options: { name: '[name].[ext]', outputPath: '../fonts/', - mimetype: 'font/woff2', encoding: false } } From 2c5f08e91a098718d9c9ee2dd0201a3dfb2cf546 Mon Sep 17 00:00:00 2001 From: "Folkerth, Jennifer" Date: Mon, 17 Oct 2022 15:13:01 -0400 Subject: [PATCH 4/9] Removing encoding because it doesn't seem to affect our current setup --- apps/andi/assets/webpack.config.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/andi/assets/webpack.config.js b/apps/andi/assets/webpack.config.js index 704deab97..251efa2b3 100644 --- a/apps/andi/assets/webpack.config.js +++ b/apps/andi/assets/webpack.config.js @@ -41,8 +41,7 @@ module.exports = (env, options) => ({ loader: 'file-loader', options: { name: '[name].[ext]', - outputPath: '../fonts/', - encoding: false + outputPath: '../fonts/' } } ] From 01f4a08f6cfeaddafb98fe9ed8244ec75c10b2b0 Mon Sep 17 00:00:00 2001 From: "Folkerth, Jennifer" Date: Mon, 17 Oct 2022 15:15:51 -0400 Subject: [PATCH 5/9] Moving all Roboto fonts into Roboto folder --- apps/andi/assets/css/app.scss | 6 +++--- .../roboto-v30-latin-ext_latin-regular.woff | Bin .../roboto-v30-latin-ext_latin-regular.woff2 | Bin 3 files changed, 3 insertions(+), 3 deletions(-) rename apps/andi/assets/static/fonts/{ => Roboto}/roboto-v30-latin-ext_latin-regular.woff (100%) rename apps/andi/assets/static/fonts/{ => Roboto}/roboto-v30-latin-ext_latin-regular.woff2 (100%) diff --git a/apps/andi/assets/css/app.scss b/apps/andi/assets/css/app.scss index 22e8322e2..60d40a6a7 100644 --- a/apps/andi/assets/css/app.scss +++ b/apps/andi/assets/css/app.scss @@ -9,9 +9,9 @@ src: url('../static/fonts/Roboto/Roboto-Regular.ttf') format('truetype'), url('../static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../static/fonts/roboto-v30-latin-ext_latin-regular.woff2') format('woff2'), + url('../static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ - url('../static/fonts/roboto-v30-latin-ext_latin-regular.woff') format('woff'), + url('../static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff') format('woff'), /* Modern Browsers */ url('../static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ @@ -155,4 +155,4 @@ body { @import "./upload_data_dictionary.scss"; @import "./url_form.scss"; @import "./user.scss"; -@import "./users.scss"; \ No newline at end of file +@import "./users.scss"; diff --git a/apps/andi/assets/static/fonts/roboto-v30-latin-ext_latin-regular.woff b/apps/andi/assets/static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff similarity index 100% rename from apps/andi/assets/static/fonts/roboto-v30-latin-ext_latin-regular.woff rename to apps/andi/assets/static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff diff --git a/apps/andi/assets/static/fonts/roboto-v30-latin-ext_latin-regular.woff2 b/apps/andi/assets/static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff2 similarity index 100% rename from apps/andi/assets/static/fonts/roboto-v30-latin-ext_latin-regular.woff2 rename to apps/andi/assets/static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff2 From 3681c3fddfeb05e90657a96346927dd6d9caceed Mon Sep 17 00:00:00 2001 From: "Folkerth, Jennifer" Date: Mon, 17 Oct 2022 15:18:19 -0400 Subject: [PATCH 6/9] Removing url-loader because it's not used --- apps/andi/assets/package-lock.json | 81 ------------------------------ apps/andi/assets/package.json | 1 - 2 files changed, 82 deletions(-) diff --git a/apps/andi/assets/package-lock.json b/apps/andi/assets/package-lock.json index 39cf28e20..e6ca776b5 100644 --- a/apps/andi/assets/package-lock.json +++ b/apps/andi/assets/package-lock.json @@ -31,7 +31,6 @@ "sass-loader": "^12.6.0", "serialize-javascript": ">=3.1.0", "terser-webpack-plugin": "^5.3.1", - "url-loader": "^4.1.1", "webpack": "^5.0.0", "webpack-cli": "^4.0.0", "yargs-parser": ">=18.1.2" @@ -5258,56 +5257,6 @@ "punycode": "^2.1.0" } }, - "node_modules/url-loader": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz", - "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==", - "dev": true, - "dependencies": { - "loader-utils": "^2.0.0", - "mime-types": "^2.1.27", - "schema-utils": "^3.0.0" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "file-loader": "*", - "webpack": "^4.0.0 || ^5.0.0" - }, - "peerDependenciesMeta": { - "file-loader": { - "optional": true - } - } - }, - "node_modules/url-loader/node_modules/emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/url-loader/node_modules/loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", - "dev": true, - "dependencies": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - }, - "engines": { - "node": ">=8.9.0" - } - }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -9423,36 +9372,6 @@ "punycode": "^2.1.0" } }, - "url-loader": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz", - "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==", - "dev": true, - "requires": { - "loader-utils": "^2.0.0", - "mime-types": "^2.1.27", - "schema-utils": "^3.0.0" - }, - "dependencies": { - "emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true - }, - "loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - } - } - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", diff --git a/apps/andi/assets/package.json b/apps/andi/assets/package.json index e8e7e17f5..7e0e6a009 100644 --- a/apps/andi/assets/package.json +++ b/apps/andi/assets/package.json @@ -31,7 +31,6 @@ "sass-loader": "^12.6.0", "serialize-javascript": ">=3.1.0", "terser-webpack-plugin": "^5.3.1", - "url-loader": "^4.1.1", "webpack": "^5.0.0", "webpack-cli": "^4.0.0", "yargs-parser": ">=18.1.2" From 8334b199084ca36875ee843a059c26ced92a43d9 Mon Sep 17 00:00:00 2001 From: "Folkerth, Jennifer" Date: Mon, 17 Oct 2022 15:41:50 -0400 Subject: [PATCH 7/9] Removing unused library, putting all Roboto files in same place, removing unnecessary webpack values --- apps/andi/assets/css/app.scss | 6 +- apps/andi/assets/package-lock.json | 81 ------------------ apps/andi/assets/package.json | 1 - .../roboto-v30-latin-ext_latin-regular.woff | Bin .../roboto-v30-latin-ext_latin-regular.woff2 | Bin apps/andi/assets/webpack.config.js | 4 +- 6 files changed, 4 insertions(+), 88 deletions(-) rename apps/andi/assets/static/fonts/{ => Roboto}/roboto-v30-latin-ext_latin-regular.woff (100%) rename apps/andi/assets/static/fonts/{ => Roboto}/roboto-v30-latin-ext_latin-regular.woff2 (100%) diff --git a/apps/andi/assets/css/app.scss b/apps/andi/assets/css/app.scss index 22e8322e2..60d40a6a7 100644 --- a/apps/andi/assets/css/app.scss +++ b/apps/andi/assets/css/app.scss @@ -9,9 +9,9 @@ src: url('../static/fonts/Roboto/Roboto-Regular.ttf') format('truetype'), url('../static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../static/fonts/roboto-v30-latin-ext_latin-regular.woff2') format('woff2'), + url('../static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ - url('../static/fonts/roboto-v30-latin-ext_latin-regular.woff') format('woff'), + url('../static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff') format('woff'), /* Modern Browsers */ url('../static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ @@ -155,4 +155,4 @@ body { @import "./upload_data_dictionary.scss"; @import "./url_form.scss"; @import "./user.scss"; -@import "./users.scss"; \ No newline at end of file +@import "./users.scss"; diff --git a/apps/andi/assets/package-lock.json b/apps/andi/assets/package-lock.json index 39cf28e20..e6ca776b5 100644 --- a/apps/andi/assets/package-lock.json +++ b/apps/andi/assets/package-lock.json @@ -31,7 +31,6 @@ "sass-loader": "^12.6.0", "serialize-javascript": ">=3.1.0", "terser-webpack-plugin": "^5.3.1", - "url-loader": "^4.1.1", "webpack": "^5.0.0", "webpack-cli": "^4.0.0", "yargs-parser": ">=18.1.2" @@ -5258,56 +5257,6 @@ "punycode": "^2.1.0" } }, - "node_modules/url-loader": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz", - "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==", - "dev": true, - "dependencies": { - "loader-utils": "^2.0.0", - "mime-types": "^2.1.27", - "schema-utils": "^3.0.0" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "file-loader": "*", - "webpack": "^4.0.0 || ^5.0.0" - }, - "peerDependenciesMeta": { - "file-loader": { - "optional": true - } - } - }, - "node_modules/url-loader/node_modules/emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/url-loader/node_modules/loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", - "dev": true, - "dependencies": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - }, - "engines": { - "node": ">=8.9.0" - } - }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -9423,36 +9372,6 @@ "punycode": "^2.1.0" } }, - "url-loader": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz", - "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==", - "dev": true, - "requires": { - "loader-utils": "^2.0.0", - "mime-types": "^2.1.27", - "schema-utils": "^3.0.0" - }, - "dependencies": { - "emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true - }, - "loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - } - } - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", diff --git a/apps/andi/assets/package.json b/apps/andi/assets/package.json index e8e7e17f5..7e0e6a009 100644 --- a/apps/andi/assets/package.json +++ b/apps/andi/assets/package.json @@ -31,7 +31,6 @@ "sass-loader": "^12.6.0", "serialize-javascript": ">=3.1.0", "terser-webpack-plugin": "^5.3.1", - "url-loader": "^4.1.1", "webpack": "^5.0.0", "webpack-cli": "^4.0.0", "yargs-parser": ">=18.1.2" diff --git a/apps/andi/assets/static/fonts/roboto-v30-latin-ext_latin-regular.woff b/apps/andi/assets/static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff similarity index 100% rename from apps/andi/assets/static/fonts/roboto-v30-latin-ext_latin-regular.woff rename to apps/andi/assets/static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff diff --git a/apps/andi/assets/static/fonts/roboto-v30-latin-ext_latin-regular.woff2 b/apps/andi/assets/static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff2 similarity index 100% rename from apps/andi/assets/static/fonts/roboto-v30-latin-ext_latin-regular.woff2 rename to apps/andi/assets/static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff2 diff --git a/apps/andi/assets/webpack.config.js b/apps/andi/assets/webpack.config.js index b612f3368..b57c95a1a 100644 --- a/apps/andi/assets/webpack.config.js +++ b/apps/andi/assets/webpack.config.js @@ -41,9 +41,7 @@ module.exports = (env, options) => ({ loader: 'file-loader', options: { name: '[name].[ext]', - outputPath: '../fonts/', - mimetype: 'font/woff2', - encoding: false + outputPath: '../fonts/' } } ] From 848ae05e2bb8346d0e85a74747170bedea4c7e24 Mon Sep 17 00:00:00 2001 From: "Folkerth, Jennifer" Date: Mon, 17 Oct 2022 15:46:13 -0400 Subject: [PATCH 8/9] Not putting svgs under fonts folder --- apps/andi/assets/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/andi/assets/webpack.config.js b/apps/andi/assets/webpack.config.js index 251efa2b3..867489b9c 100644 --- a/apps/andi/assets/webpack.config.js +++ b/apps/andi/assets/webpack.config.js @@ -35,7 +35,7 @@ module.exports = (env, options) => ({ ] }, { - test: /\.(woff(2)?|ttf|eot|svg)(\?v=[a-z0-9]\.[a-z0-9]\.[a-z0-9])?$/, + test: /\.(woff)(\?v=[a-z0-9]\.[a-z0-9]\.[a-z0-9])?$/, use: [ { loader: 'file-loader', From ecd6615f2f44c10657f6122e04216ddb7e0f209c Mon Sep 17 00:00:00 2001 From: "Folkerth, Jennifer" Date: Mon, 17 Oct 2022 15:53:32 -0400 Subject: [PATCH 9/9] Bumping patch version --- apps/andi/mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/andi/mix.exs b/apps/andi/mix.exs index c8552024e..6a9cd8fa1 100644 --- a/apps/andi/mix.exs +++ b/apps/andi/mix.exs @@ -4,7 +4,7 @@ defmodule Andi.MixProject do def project do [ app: :andi, - version: "2.4.3", + version: "2.4.4", build_path: "../../_build", config_path: "../../config/config.exs", deps_path: "../../deps",