Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Revert RSPack HTML literals loader (#2442)

Martin Peeters0a831741c89a
diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
index f7eac330a..2ba18c89d 100644
--- a/.github/workflows/ci_cd.yml
+++ b/.github/workflows/ci_cd.yml
@@ -817,6 +817,11 @@ jobs:
INPUTS_AND_SECRETS: ${{ toJSON(steps.inputs-and-secrets.outputs) }}
timeout-minutes: 20
+ - name: Run NPM publish dry run
+ if: steps.is_main_repo.outputs.value == 'true' && github.ref != 'refs/heads/master'
+ run: yarn workspaces foreach --all --no-private --topological npm publish --dry-run
+ timeout-minutes: 20
+
- name: Run install playwright browser(s)
if: (steps.test-ui-components-command.outputs.value != '' || steps.test-ui-apps-command.outputs.value != '') && steps.is_main_repo.outputs.value == 'true'
run: npx playwright install --with-deps chromium
diff --git a/ui/app/manager/.npmignore b/ui/app/manager/.npmignore
index abed2c8ed..ca6beaad0 100644
--- a/ui/app/manager/.npmignore
+++ b/ui/app/manager/.npmignore
@@ -1,6 +1,8 @@
build/
build.gradle
test/
+app-test-report/
+test-results/
src/
webpack.config.js
rspack.config.js
diff --git a/ui/component/or-dashboard-builder/.npmignore b/ui/component/or-dashboard-builder/.npmignore
new file mode 100644
index 000000000..be24359ba
--- /dev/null
+++ b/ui/component/or-dashboard-builder/.npmignore
@@ -0,0 +1,11 @@
+build/
+build.gradle
+test/
+src/
+stories/
+webpack.config.js
+rspack.config.js
+playwright.config.ts
+tsconfig.json
+dist/*.map
+*.tsbuildinfo
diff --git a/ui/component/or-translate/.npmignore b/ui/component/or-translate/.npmignore
index abed2c8ed..be24359ba 100644
--- a/ui/component/or-translate/.npmignore
+++ b/ui/component/or-translate/.npmignore
@@ -2,6 +2,7 @@ build/
build.gradle
test/
src/
+stories/
webpack.config.js
rspack.config.js
playwright.config.ts
diff --git a/ui/util/package.json b/ui/util/package.json
index 1e79c477f..00bc085c7 100644
--- a/ui/util/package.json
+++ b/ui/util/package.json
@@ -27,7 +27,6 @@
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^6.0.0",
"html-webpack-plugin": "^5.6.3",
- "minify-html-literals-loader": "1.1.1",
"moment-locales-webpack-plugin": "^1.2.0",
"prettier": "^2.5.1",
"querystring-es3": "^0.2.1",
diff --git a/ui/util/webpack.util.js b/ui/util/webpack.util.js
index 7c2b9eb36..06bd957b2 100644
--- a/ui/util/webpack.util.js
+++ b/ui/util/webpack.util.js
@@ -28,16 +28,13 @@ function getStandardModuleRules() {
{
test: /\.tsx?$/,
exclude: /node_modules/,
- use: [{
+ use: {
// TODO: Switch to builtin:swc-loader, and remove ts-loader / webpack dependency
loader: "ts-loader",
options: {
projectReferences: true
}
- }, {
- // Minifies Lit HTML and CSS templates and removes unnecessary whitespace in them
- loader: "minify-html-literals-loader",
- }]
+ }
}
]
};
diff --git a/yarn.lock b/yarn.lock
index 1fd179c8c..0508f8141 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2354,7 +2354,6 @@ __metadata:
eslint-plugin-node: "npm:^11.1.0"
eslint-plugin-promise: "npm:^6.0.0"
html-webpack-plugin: "npm:^5.6.3"
- minify-html-literals-loader: "npm:1.1.1"
moment-locales-webpack-plugin: "npm:^1.2.0"
prettier: "npm:^2.5.1"
querystring-es3: "npm:^0.2.1"
@@ -3219,16 +3218,6 @@ __metadata:
languageName: node
linkType: hard
-"@types/clean-css@npm:*":
- version: 4.2.11
- resolution: "@types/clean-css@npm:4.2.11"
- dependencies:
- "@types/node": "npm:*"
- source-map: "npm:^0.6.0"
- checksum: 10c0/bd9848821982500854fed36e672981d9ff286a4cf37b8a7d15a51bbb3f3a3e90676ec18e29e0e753a4c1785c108ca0c30939209cc7dd72712a32fa9d727ea601
- languageName: node
- linkType: hard
-
"@types/connect-history-api-fallback@npm:^1.5.4":
version: 1.5.4
resolution: "@types/connect-history-api-fallback@npm:1.5.4"
@@ -3390,17 +3379,6 @@ __metadata:
languageName: node
linkType: hard
-"@types/html-minifier@npm:^3.5.3":
- version: 3.5.3
- resolution: "@types/html-minifier@npm:3.5.3"
- dependencies:
- "@types/clean-css": "npm:*"
- "@types/relateurl": "npm:*"
- "@types/uglify-js": "npm:*"
- checksum: 10c0/094574ca1e0818d35b5c494f30dbb94c8b9962011058ac54417f3544a21e6290d65890a3cec28d9bdb85ad8a4799de44a8ac4f864b3b78e72cfe67d5e75e25aa
- languageName: node
- linkType: hard
-
"@types/http-errors@npm:*":
version: 2.0.4
resolution: "@types/http-errors@npm:2.0.4"
@@ -3561,13 +3539,6 @@ __metadata:
languageName: node
linkType: hard
-"@types/relateurl@npm:*":
- version: 0.2.33
- resolution: "@types/relateurl@npm:0.2.33"
- checksum: 10c0/6b6aafe9ed59bf674703555d9fbd3d54c4f27eab3b2abed8faa750ca8b93d883727e111948d3537e6429b43c0990a734525a1aed1baf4c51aebc4f69e3f3fb9f
- languageName: node
- linkType: hard
-
"@types/retry@npm:0.12.2":
version: 0.12.2
resolution: "@types/retry@npm:0.12.2"
@@ -3664,15 +3635,6 @@ __metadata:
languageName: node
linkType: hard
-"@types/uglify-js@npm:*":
- version: 3.17.5
- resolution: "@types/uglify-js@npm:3.17.5"
- dependencies:
- source-map: "npm:^0.6.1"
- checksum: 10c0/e225d7da26a7a8b71e71f584ab2b4e14f9bd61e2ae4c72fa14d3d862ebfb8f3c1c24414048f23ea485e93618d3370e6c9d5e5af51b6a836d48ec453a26e419f4
- languageName: node
- linkType: hard
-
"@types/ws@npm:^8.5.10":
version: 8.18.1
resolution: "@types/ws@npm:8.18.1"
@@ -4997,16 +4959,6 @@ __metadata:
languageName: node
linkType: hard
-"camel-case@npm:^3.0.0":
- version: 3.0.0
- resolution: "camel-case@npm:3.0.0"
- dependencies:
- no-case: "npm:^2.2.0"
- upper-case: "npm:^1.1.1"
- checksum: 10c0/491c6bbf986b9d8355e12cca6beb719b44c2fe96e8526c09958a1b4e0dbb081a82ea59c13b5a6ccf9158ce5979cbe56a8a10d7322bfeed2d84725c6b89d8f934
- languageName: node
- linkType: hard
-
"camel-case@npm:^4.1.2":
version: 4.1.2
resolution: "camel-case@npm:4.1.2"
@@ -5151,15 +5103,6 @@ __metadata:
languageName: node
linkType: hard
-"clean-css@npm:^4.2.1":
- version: 4.2.4
- resolution: "clean-css@npm:4.2.4"
- dependencies:
- source-map: "npm:~0.6.0"
- checksum: 10c0/0e41795fdc9d65e5e17a3b0016d90bf2a653e3a680829b5bcebdbab48604cfe36d96d8af6346338d2c2aca8aa9af024ac4fb752ac3eb5b71bef68a34a129b58a
- languageName: node
- linkType: hard
-
"clean-css@npm:^5.2.2, clean-css@npm:~5.3.2":
version: 5.3.3
resolution: "clean-css@npm:5.3.3"
@@ -5227,7 +5170,7 @@ __metadata:
languageName: node
linkType: hard
-"commander@npm:^2.19.0, commander@npm:^2.20.0":
+"commander@npm:^2.20.0":
version: 2.20.3
resolution: "commander@npm:2.20.3"
checksum: 10c0/74c781a5248c2402a0a3e966a0a2bba3c054aad144f5c023364be83265e796b20565aa9feff624132ff629aa64e16999fa40a743c10c12f7c61e96a794b99288
@@ -7508,23 +7451,6 @@ __metadata:
languageName: node
linkType: hard
-"html-minifier@npm:^4.0.0":
- version: 4.0.0
- resolution: "html-minifier@npm:4.0.0"
- dependencies:
- camel-case: "npm:^3.0.0"
- clean-css: "npm:^4.2.1"
- commander: "npm:^2.19.0"
- he: "npm:^1.2.0"
- param-case: "npm:^2.1.1"
- relateurl: "npm:^0.2.7"
- uglify-js: "npm:^3.5.1"
- bin:
- html-minifier: ./cli.js
- checksum: 10c0/38c2d1cab49593671b104e3bc120b1c5fdf00c75930fcb32e257322219c9d31515af6b39af76e8ecd71fdf3a77d168f8b7b7ce02beba0b72eb5631599b5561bc
- languageName: node
- linkType: hard
-
"html-webpack-plugin@npm:^5.6.3":
version: 5.6.3
resolution: "html-webpack-plugin@npm:5.6.3"
@@ -8481,13 +8407,6 @@ __metadata:
languageName: node
linkType: hard
-"lower-case@npm:^1.1.1":
- version: 1.1.4
- resolution: "lower-case@npm:1.1.4"
- checksum: 10c0/2153ae5490d655a63addc8e7d2f848c6c94803b342ed2d177f75e8073e9fbb50a733d1432c82e1cb8425fa6eae14b2877bf5bbdcb93ab93bb982fb5c3962c57b
- languageName: node
- linkType: hard
-
"lower-case@npm:^2.0.2":
version: 2.0.2
resolution: "lower-case@npm:2.0.2"
@@ -8513,15 +8432,6 @@ __metadata:
languageName: node
linkType: hard
-"magic-string@npm:^0.25.0":
- version: 0.25.9
- resolution: "magic-string@npm:0.25.9"
- dependencies:
- sourcemap-codec: "npm:^1.4.8"
- checksum: 10c0/37f5e01a7e8b19a072091f0b45ff127cda676232d373ce2c551a162dd4053c575ec048b9cbb4587a1f03adb6c5d0fd0dd49e8ab070cd2c83a4992b2182d9cb56
- languageName: node
- linkType: hard
-
"magic-string@npm:^0.30.17, magic-string@npm:^0.30.21":
version: 0.30.21
resolution: "magic-string@npm:0.30.21"
@@ -8713,28 +8623,6 @@ __metadata:
languageName: node
linkType: hard
-"minify-html-literals-loader@npm:1.1.1":
- version: 1.1.1
- resolution: "minify-html-literals-loader@npm:1.1.1"
- dependencies:
- minify-html-literals: "npm:^1.3.5"
- checksum: 10c0/fb6e9c5169d683080a63009f11e346c9c96dbcd4066f61d28f2fd0b4c145c527c8532e397392fb4a92ef0a52635dcef6aaae63d52e8d58f3882c5f31d54985d5
- languageName: node
- linkType: hard
-
-"minify-html-literals@npm:^1.3.5":
- version: 1.3.5
- resolution: "minify-html-literals@npm:1.3.5"
- dependencies:
- "@types/html-minifier": "npm:^3.5.3"
- clean-css: "npm:^4.2.1"
- html-minifier: "npm:^4.0.0"
- magic-string: "npm:^0.25.0"
- parse-literals: "npm:^1.2.1"
- checksum: 10c0/9cf41cfd5307c6a9eceffdb417a83021bb788fb51cac82d58abb67d85c289706d9bd0b70d49381ad22598612b16df02c42ae7e31f34be021951ac80bf4228930
- languageName: node
- linkType: hard
-
"minimalistic-assert@npm:^1.0.0":
version: 1.0.1
resolution: "minimalistic-assert@npm:1.0.1"
@@ -9018,15 +8906,6 @@ __metadata:
languageName: node
linkType: hard
-"no-case@npm:^2.2.0":
- version: 2.3.2
- resolution: "no-case@npm:2.3.2"
- dependencies:
- lower-case: "npm:^1.1.1"
- checksum: 10c0/63f306e83c18efa0bb37f1c23a25baf4ccf5ebaec70b482fa04d4c5bf8bbb8bcc9a8fbcd818af828ab69f2b602153daf81ec26e448b2bda2d704b8d0c7eec8fa
- languageName: node
- linkType: hard
-
"no-case@npm:^3.0.4":
version: 3.0.4
resolution: "no-case@npm:3.0.4"
@@ -9321,15 +9200,6 @@ __metadata:
languageName: node
linkType: hard
-"param-case@npm:^2.1.1":
- version: 2.1.1
- resolution: "param-case@npm:2.1.1"
- dependencies:
- no-case: "npm:^2.2.0"
- checksum: 10c0/8ea1b8472fd51d5f50b28d1d754899713805d05f2241e9b8c4acafa2c500b3f47457a3b4932ab75220f14d2c69180bb7338b78a45576e2b4d90da1e6f0285833
- languageName: node
- linkType: hard
-
"param-case@npm:^3.0.4":
version: 3.0.4
resolution: "param-case@npm:3.0.4"
@@ -9349,15 +9219,6 @@ __metadata:
languageName: node
linkType: hard
-"parse-literals@npm:^1.2.1":
- version: 1.2.1
- resolution: "parse-literals@npm:1.2.1"
- dependencies:
- typescript: "npm:^2.9.2 || ^3.0.0 || ^4.0.0"
- checksum: 10c0/afbd59fb359880a86f1be906c045c220153405bd772388ab8f0432a8fbff1b98542ab3ace19061909583cca8a9b123b1f9e979ca8c61089d5ef6774e2d8f957f
- languageName: node
- linkType: hard
-
"parseurl@npm:~1.3.2, parseurl@npm:~1.3.3":
version: 1.3.3
resolution: "parseurl@npm:1.3.3"
@@ -10789,7 +10650,7 @@ __metadata:
languageName: node
linkType: hard
-"source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.0, source-map@npm:~0.6.1":
+"source-map@npm:^0.6.0, source-map@npm:~0.6.0, source-map@npm:~0.6.1":
version: 0.6.1
resolution: "source-map@npm:0.6.1"
checksum: 10c0/ab55398007c5e5532957cb0beee2368529618ac0ab372d789806f5718123cc4367d57de3904b4e6a4170eb5a0b0f41373066d02ca0735a0c4d75c7d328d3e011
@@ -10810,13 +10671,6 @@ __metadata:
languageName: node
linkType: hard
-"sourcemap-codec@npm:^1.4.8":
- version: 1.4.8
- resolution: "sourcemap-codec@npm:1.4.8"
- checksum: 10c0/f099279fdaae070ff156df7414bbe39aad69cdd615454947ed3e19136bfdfcb4544952685ee73f56e17038f4578091e12b17b283ed8ac013882916594d95b9e6
- languageName: node
- linkType: hard
-
"spdy-transport@npm:^3.0.0":
version: 3.0.0
resolution: "spdy-transport@npm:3.0.0"
@@ -11513,16 +11367,6 @@ __metadata:
languageName: node
linkType: hard
-"typescript@npm:^2.9.2 || ^3.0.0 || ^4.0.0":
- version: 4.9.5
- resolution: "typescript@npm:4.9.5"
- bin:
- tsc: bin/tsc
- tsserver: bin/tsserver
- checksum: 10c0/5f6cad2e728a8a063521328e612d7876e12f0d8a8390d3b3aaa452a6a65e24e9ac8ea22beb72a924fd96ea0a49ea63bb4e251fb922b12eedfb7f7a26475e5c56
- languageName: node
- linkType: hard
-
"typescript@npm:~5.4.2":
version: 5.4.5
resolution: "typescript@npm:5.4.5"
@@ -11553,16 +11397,6 @@ __metadata:
languageName: node
linkType: hard
-"typescript@patch:typescript@npm%3A^2.9.2 || ^3.0.0 || ^4.0.0#optional!builtin<compat/typescript>":
- version: 4.9.5
- resolution: "typescript@patch:typescript@npm%3A4.9.5#optional!builtin<compat/typescript>::version=4.9.5&hash=289587"
- bin:
- tsc: bin/tsc
- tsserver: bin/tsserver
- checksum: 10c0/e3333f887c6829dfe0ab6c1dbe0dd1e3e2aeb56c66460cb85c5440c566f900c833d370ca34eb47558c0c69e78ced4bfe09b8f4f98b6de7afed9b84b8d1dd06a1
- languageName: node
- linkType: hard
-
"typescript@patch:typescript@npm%3A~5.4.2#optional!builtin<compat/typescript>":
version: 5.4.5
resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>::version=5.4.5&hash=5adc0c"
@@ -11590,15 +11424,6 @@ __metadata:
languageName: node
linkType: hard
-"uglify-js@npm:^3.5.1":
- version: 3.19.3
- resolution: "uglify-js@npm:3.19.3"
- bin:
- uglifyjs: bin/uglifyjs
- checksum: 10c0/83b0a90eca35f778e07cad9622b80c448b6aad457c9ff8e568afed978212b42930a95f9e1be943a1ffa4258a3340fbb899f41461131c05bb1d0a9c303aed8479
- languageName: node
- linkType: hard
-
"unbox-primitive@npm:^1.0.2":
version: 1.0.2
resolution: "unbox-primitive@npm:1.0.2"
@@ -11697,13 +11522,6 @@ __metadata:
languageName: node
linkType: hard
-"upper-case@npm:^1.1.1":
- version: 1.1.3
- resolution: "upper-case@npm:1.1.3"
- checksum: 10c0/3e4d3a90519915bb591db84d72610392518806d8287b8f7541d87642d30388f42b2def1ed2f687e5792ee025e8f7e17d3a0dcbd5b3b59e306ceb1f3b8121ef54
- languageName: node
- linkType: hard
-
"uri-js@npm:^4.2.2":
version: 4.4.1
resolution: "uri-js@npm:4.4.1"