wip #1817 jquery problems

ComLock · alansemenov · commit 7faad91c1225 · 2023-10-16T13:44:05.000+02:00
diff --git a/package.json b/package.json
@@ -27,6 +27,7 @@
   },
   "devDependencies": {
     "@enonic/eslint-config": "^1.2.0",
+    "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
     "@swc/core": "^1.3.93",
     "@types/hasher": "^0.0.33",
     "@types/nanoid": "^3.0.0",
@@ -42,6 +43,8 @@
     "cssnano": "^6.0.1",
     "enonic-admin-artifacts": "^1.8.5",
     "eslint": "^8.51.0",
+    "esbuild-plugin-external-global": "^1.0.1",
+    "esbuild-plugin-globals": "^0.2.0",
     "less": "^4.2.0",
     "less-loader": "^11.1.3",
     "mini-css-extract-plugin": "^2.7.6",
diff --git a/postcss.config.js b/postcss.config.js
@@ -10,9 +10,7 @@ const plugins = Object.assign(
         'postcss-url': {
             basePath: path.resolve('src/main/resources/assets/icons'),
             assetsPath: '../icons/',
-            url: 'copy' // Remember to skip woff and woff2 files in build.gradle
-            // url: 'inline' // base64 data url inlines the fonts?
-            // url: 'rebase' // only manipulates the urls?
+            url: 'copy'
         },
     },
     isProd ? {cssnano: {}} : {}
diff --git a/src/main/resources/admin/tools/main/main.html b/src/main/resources/admin/tools/main/main.html
@@ -38,11 +38,11 @@
 </head>
 <body>
 
-<!-- App javascript -->
-<script type="text/javascript" src="{{assetsUri}}/js/bundle.js" data-config-service-url="{{configServiceUrl}}"></script>
-
 <!-- Append the launcher -->
 <script type="text/javascript" src="{{launcherPath}}" data-config-theme="dark" async></script>
 
+<!-- App javascript -->
+<script defer type="text/javascript" src="{{assetsUri}}/js/app-users-bundle.js" data-config-service-url="{{configServiceUrl}}"></script>
+
 </body>
 </html>
diff --git a/tsup.config.ts b/tsup.config.ts
@@ -1,21 +1,58 @@
+import { globalExternals } from "@fal-works/esbuild-plugin-global-externals";
+// import GlobalsPlugin from "esbuild-plugin-globals";
 import { defineConfig } from 'tsup';
+// import externalGlobalPlugin from 'esbuild-plugin-external-global';
 
 export default defineConfig(() => {
     return {
+        bundle: true,
         dts: false, // d.ts files are use useless at runtime
         entry: {
-            'js/bundle': 'src/main/resources/assets/js/main.ts',
+            'js/app-users-bundle': 'src/main/resources/assets/js/main.ts',
             'js/crypto-worker': 'src/main/resources/assets/js/worker/RSAKeysWorker.ts',
         },
+        // esbuildOptions(options, context) {
+        //     options.external = [
+        //         'jquery'
+        //     ]
+        // },
+        esbuildPlugins: [
+            // GlobalsPlugin({
+            //     // 'jquery': 'jQuery',
+            //     'jquery': '$'
+            // }),
+            globalExternals({
+                'jquery': '$'
+                // 'jquery': 'jQuery'
+            })
+            // externalGlobalPlugin({
+            //     // 'react': 'window.React',
+            //     // 'react-dom': 'window.ReactDOM',
+            //     'jQuery': '$' // It seems jquery is available as $ in the global scope
+            //   })
+        ],
+        // external: [
+        //     // This will leave require('jquery') as is in the bundle
+        //     // causes: Uncaught ReferenceError: require is not defined
+        //     'jquery'
+        // ],
         format: [
             'cjs'
         ],
-        minify: process.env.NODE_ENV === 'development' ? false : true,
+        minify: process.env.NODE_ENV !== 'development',
+        noExternal: [ // Same as dependencies in package.json
+            /@enonic\/lib-admin-ui/,
+            'hasher',
+            'jquery', // This will bundle jQuery into the bundle
+            'nanoid',
+            'owasp-password-strength-test',
+            'q'
+        ],
         outDir: 'build/resources/main/assets',
         platform: 'browser',
-		silent: ['QUIET', 'WARN'].includes(process.env.LOG_LEVEL_FROM_GRADLE||''),
+        silent: ['QUIET', 'WARN'].includes(process.env.LOG_LEVEL_FROM_GRADLE||''),
         // splitting: false,
-        sourcemap: process.env.NODE_ENV === 'development' ? true : false,
+        sourcemap: process.env.NODE_ENV === 'development',
         tsconfig: 'src/main/resources/assets/tsconfig.json',
     };
 });
