From 424384c3f88b4ed4ada473922d7f9d6aef94a69a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Mar 2022 11:48:41 +0100 Subject: [PATCH] Removed dependency to auto-ngtemplate-loader --- CHANGELOG.md | 1 + config/webpack/modules/js.js | 14 ------------- config/webpack/modules/js_erb.js | 8 -------- config/webpack/webpack.config.js | 2 -- package.json | 1 - yarn.lock | 35 +++----------------------------- 6 files changed, 4 insertions(+), 57 deletions(-) delete mode 100644 config/webpack/modules/js.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e1c0bbb9..44578762b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Updated bootstrap-sass to 3.4.3 - Removed unmaintained gem sidekiq-cron and replaced it with sidekiq-scheduler - Removed unmaintained @rails/webpacker and replaced it with shakapacker +- Removed dependency to auto-ngtemplate-loader - Updated deprecated division operators in sass - Fix a bug: a sentence was not linked to a translation key - Fix a bug: the version check may be scheduled at an invalid time diff --git a/config/webpack/modules/js.js b/config/webpack/modules/js.js deleted file mode 100644 index de5ed5438..000000000 --- a/config/webpack/modules/js.js +++ /dev/null @@ -1,14 +0,0 @@ -const path = require('path'); - -module.exports = { - test: /\.js$/, - exclude: /node_modules/, - use: [ - { - loader: 'auto-ngtemplate-loader', - options: { - pathResolver: (templatePath) => path.join(__dirname, `../../../app/frontend/templates${templatePath}`) - } - } - ] -}; diff --git a/config/webpack/modules/js_erb.js b/config/webpack/modules/js_erb.js index d55ac02ad..29b37db1e 100644 --- a/config/webpack/modules/js_erb.js +++ b/config/webpack/modules/js_erb.js @@ -1,16 +1,8 @@ -const path = require('path'); - module.exports = { test: /\.js\.erb$/, enforce: 'pre', exclude: /node_modules/, use: [ - { - loader: 'auto-ngtemplate-loader', - options: { - pathResolver: (templatePath) => path.join(__dirname, `../../../app/frontend/templates${templatePath}`) - } - }, { loader: 'rails-erb-loader', options: { diff --git a/config/webpack/webpack.config.js b/config/webpack/webpack.config.js index 08e5726a9..c01dd51bb 100644 --- a/config/webpack/webpack.config.js +++ b/config/webpack/webpack.config.js @@ -5,7 +5,6 @@ const path = require('path'); const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin'); const htmlErb = require('./modules/html_erb'); -// const js = require('./modules/js'); const jsErb = require('./modules/js_erb'); const sass = require('./modules/sass'); const sassErb = require('./modules/sass_erb'); @@ -40,7 +39,6 @@ const customConfig = { jsErb, htmlErb, sassErb, - // js, html, sass, uiTour, diff --git a/package.json b/package.json index 877c63616..31bed768a 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,6 @@ "angular-unsavedchanges": "0.2", "angular-xeditable": "0.10", "assert": "^2.0.0", - "auto-ngtemplate-loader": "^3.1.0", "axios": "^0.21.2", "babel-loader": "^8.2.3", "babel-plugin-macros": "^3.1.0", diff --git a/yarn.lock b/yarn.lock index 55d71260b..f7bb45a21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2241,17 +2241,6 @@ async@^2.6.2: dependencies: lodash "^4.17.14" -auto-ngtemplate-loader@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/auto-ngtemplate-loader/-/auto-ngtemplate-loader-3.1.1.tgz#6873149359ce19536e8fd0758f50faea365f95ae" - integrity sha512-z3H/DNCTF730FMxvL4fGURR3R5vCzXqpC3bQdZUKAhHZdHteAabEFjNPOhFzkJXsbf4+d31hh9BchtxXXm8MJA== - dependencies: - html-loader "~2.1.2" - loader-utils "~2.0.0" - lodash "~4.17.20" - ngtemplate-loader "~2.1.0" - var-validator "0.0.3" - available-typed-arrays@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" @@ -3954,14 +3943,6 @@ html-loader@^1.3.0: loader-utils "^2.0.0" schema-utils "^3.0.0" -html-loader@~2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/html-loader/-/html-loader-2.1.2.tgz#17eb111441e863a9308071ed876b4ba861f143df" - integrity sha512-XB4O1+6mpLp4qy/3qg5+1QPZ/uXvWtO64hNAX87sKHwcHkp1LJGU7V3sJ9iVmRACElAZXQ4YOO/Lbkx5kYfl9A== - dependencies: - html-minifier-terser "^5.1.1" - parse5 "^6.0.1" - html-minifier-terser@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054" @@ -4601,7 +4582,7 @@ loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.4.0: emojis-list "^3.0.0" json5 "^1.0.1" -loader-utils@^2.0.0, loader-utils@~2.0.0: +loader-utils@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A== @@ -4674,7 +4655,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.4, lodash@~4.17.20: +lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.4: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -4943,7 +4924,7 @@ ngcomponent@^4.1.0: angular ">=1.5.0" lodash "^4.17.4" -ngtemplate-loader@^2.1.0, ngtemplate-loader@~2.1.0: +ngtemplate-loader@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ngtemplate-loader/-/ngtemplate-loader-2.1.0.tgz#fb71c614c509b114b3bb28a828cb608757531e96" integrity sha512-8t1a2YOb1vk1A4C74o1ru+T7UeyKDdABWXtGDkjBupmOaV/RPCXjLLF4UZMI45Lfpebkr2p4NlVSROXRshkIhg== @@ -5254,11 +5235,6 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse5@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" - integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== - parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -6862,11 +6838,6 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -var-validator@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/var-validator/-/var-validator-0.0.3.tgz#8c20155a350373233a542d3e5aed046c90891d70" - integrity sha1-jCAVWjUDcyM6VC0+Wu0EbJCJHXA= - vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"