Merge pull request #471 from atlas-bi/alpha

gulpfile.js/scripts.js

@@ -53,15 +53,6 @@ gulp.task('js:hyperspace', function () {
     .pipe(gulp.dest('web/wwwroot/js/'));
 });
 
-gulp.task('js:purify', function () {
-  return gulp
-    .src(['web/wwwroot/lib/dompurify/purify.min.js'])
-    .pipe(rollup(rollupConfig))
-    .pipe(concat('purify.min.js'))
-    .pipe(uglify(uglifyConfig))
-    .pipe(gulp.dest('web/wwwroot/js/'));
-});
-
 gulp.task('js:utility', function () {
   return gulp
     .src([
@@ -189,7 +180,6 @@ gulp.task('scripts', (cb) => {
       'js:profile',
       'js:userSettings',
       'js:hyperspace',
-      'js:purify',
     ],
     cb,
   );

gulpfile.js/watch.js

@@ -100,12 +100,6 @@ gulp.task(
       gulp.series(gulp.parallel('js:highlighter', 'styles'), 'dotnet:run'),
     );
 
-    // Purify
-    gulp.watch(
-      ['web/wwwroot/lib/dompurify/purify.min.js'],
-      gulp.series(gulp.parallel('js:purify', 'styles'), 'dotnet:run'),
-    );
-
     // Shared
     gulp.watch(
       ['web/wwwroot/js/shared.js'],

package.json

@@ -27,7 +27,7 @@
     "commitizen": "^4.3.0",
     "cz-conventional-changelog": "3.3.0",
     "date-fns": "2.30.0",
-    "dompurify": "^3.0.2",
+    "dompurify": "3.0.0",
     "es6-symbol": "3.1.3",
     "eslint": "^8.39.0",
     "fancy-log": "2.0.0",
@@ -158,5 +158,5 @@
       "unicorn/no-typeof-undefined": "off"
     }
   },
-  "version": "3.12.4"
+  "version": "3.12.5-alpha.1"
 }

renovate.json

@@ -9,7 +9,7 @@
     ":npm",
     "npm:unpublishSafe"
   ],
-  "ignoreDeps": ["chart.js", "open"],
+  "ignoreDeps": ["chart.js", "open", "dompurify"],
   "baseBranches": ["dev"],
   "bumpVersion": "patch",
   "commitMessagePrefix": "chore(deps)",

web/Pages/Shared/_Layout.cshtml

@@ -32,6 +32,8 @@
     <script src="/js/shared.min.js"></script>
     <script src="/js/hyperspace.min.js"></script>
 
+    <link rel="preload" href="/js/purify.min.js" as="script" />
+    <link rel="preload" href="/js/polyfill.min.js" as="script" />
     <link rel="preload" href="/js/alive.min.js" as="script" />
     <link rel="preload" href="/js/search.min.js" as="script" />
     <link rel="preload" href="/js/utility.min.js" as="script" />

web/Program.cs

@@ -116,7 +116,7 @@
 
         /************   javascript   *************/
         pipeline.AddJavaScriptBundle("/js/polyfill.min.js", "js/polyfill.min.js");
-        pipeline.AddJavaScriptBundle("/js/purify.min.js", "js/purify.min.js");
+        pipeline.AddJavaScriptBundle("/js/purify.min.js", "lib/dompurify/purify.min.js");
         pipeline.AddJavaScriptBundle("/js/shared.min.js", "js/shared.min.js");
         pipeline.AddJavaScriptBundle("/js/realtime.min.js", "js/realtime.js");
 

web/version

@@ -1 +1 @@
-3.12.4
+3.12.5-alpha.1