Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@alansemenov
alansemenov committed Oct 4, 2023
1 parent 59a001b commit 836159d
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 334 deletions.
29 changes: 0 additions & 29 deletions .swcrc
View file

This file was deleted.

25 changes: 0 additions & 25 deletions tsup/assets.ts
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import type { Options } from '.';

// import { globalExternals } from "@fal-works/esbuild-plugin-global-externals";
// import GlobalsPlugin from "esbuild-plugin-globals";
import { defineConfig } from 'tsup';
// const { externalGlobalPlugin } = require("esbuild-plugin-external-global");
import esbuildPluginExternalGlobal from 'esbuild-plugin-external-global';
import { DIR_DST } from './constants';


export default function buildAssetConfig(): Options {
Expand All @@ -20,31 +15,12 @@ export default function buildAssetConfig(): Options {
options.banner = {
js: `const jQuery = $;` // jQuery UI Tabbable requires this
};
// options.external = [
// 'jquery'
// ]
},
esbuildPlugins: [
// GlobalsPlugin({
// // 'jquery': 'jQuery',
// 'jquery': '$'
// }),
// globalExternals({
// 'jquery': 'window.$'
// // 'jquery': 'jQuery'
// })
esbuildPluginExternalGlobal.externalGlobalPlugin({
// 'react': 'window.React',
// 'react-dom': 'window.ReactDOM',
// 'jQuery': 'window.$' // It seems jquery is available as $ in the global scope
'jquery': 'window.$'
})
],
// external: [
// // This will leave require('jquery') as is in the bundle
// // causes: Uncaught ReferenceError: require is not defined
// 'jquery'
// ],
format: [
'cjs'
],
Expand All @@ -60,7 +36,6 @@ export default function buildAssetConfig(): Options {
outDir: 'build/resources/main/assets',
platform: 'browser',
silent: ['QUIET', 'WARN'].includes(process.env.LOG_LEVEL_FROM_GRADLE||''),
// splitting: false,
sourcemap: process.env.NODE_ENV === 'development',
tsconfig: 'src/main/resources/assets/tsconfig.json',
};
Expand Down
106 changes: 2 additions & 104 deletions tsup/server.ts
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
import type { Options } from '.';

// import { polyfillNode } from 'esbuild-plugin-polyfill-node';
import { globSync } from 'glob';
// import { print } from 'q-i';
import {
DIR_SRC,
DIR_SRC_ASSETS,
DIR_SRC_STATIC
} from './constants';
// import {addControllersInFolder} from './addControllersInFolder';
// import {addRecursive} from './addRecursive';


export default function buildServerConfig(): Options {
Expand All @@ -19,93 +15,16 @@ export default function buildServerConfig(): Options {
globSync(`${DIR_SRC_STATIC}/**/*.ts`)
)
});
// const entry: string[] = [];
// addRecursive(`${DIR_SRC}/lib`, entry)
// addControllersInFolder(`${DIR_SRC}/admin/tools`, entry);
// addControllersInFolder(`${DIR_SRC}/services`, entry);
// print(entry);

return {
bundle: true, // Needed for @enonic/lib-admin-ui
dts: false, // d.ts files are use useless at runtime
entry,
// env: {
// BROWSER_SYNC_PORT: '3000',
// },
esbuildOptions(options, context) {
// options.alias = {
// 'alias': './src/main/resources/lib/filename.js'
// };

// Some node modules might need globalThis
// options.banner = {
// js: `const globalThis = (1, eval)('this');` // buffer polyfill needs this
// };

// If you have libs with chunks, use this to avoid collisions
options.chunkNames = '_chunks/[name]-[hash]';

options.mainFields = ['module', 'main'];
},
esbuildPlugins: [
// Some node modules might need parts of Node polyfilled:
// polyfillNode({
// globals: {
// buffer: false,
// process: false
// },
// polyfills: {
// _stream_duplex: false,
// _stream_passthrough: false,
// _stream_readable: false,
// _stream_transform: false,
// _stream_writable: false,
// assert: false,
// 'assert/strict': false,
// async_hooks: false,
// buffer: false,
// child_process: false,
// cluster: false,
// console: false,
// constants: false,
// crypto: false,
// dgram: false,
// diagnostics_channel: false,
// dns: false,
// domain: false,
// events: false,
// fs: false,
// 'fs/promises': false,
// http: false,
// http2: false,
// https: false,
// module: false,
// net: false,
// os: false,
// path: false,
// perf_hooks: false,
// process: false, //"empty",
// punycode: false,
// querystring: false,
// readline: false,
// repl: false,
// stream: false,
// string_decoder: false,
// sys: false,
// timers: false,
// 'timers/promises': false,
// tls: false,
// tty: false,
// url: false,
// util: false, // true,
// v8: false,
// vm: false,
// wasi: false,
// worker_threads: false,
// zlib: false,
// }
// }) // ReferenceError: "navigator" is not defined
],
esbuildPlugins: [],
external: [
'/lib/cache',
'/lib/enonic/static',
Expand All @@ -123,27 +42,7 @@ export default function buildServerConfig(): Options {
/^\/lib\/xp\//,
],
format: 'cjs',
inject: [
// Injects makes it possible to use some functionality in any file :)
// However it also makes every file larger, unless splitting: true
// If for some reason you cannot use code splitting, it is better
// to import a polyfill only in the entries that needs it.
// Code-js polyfills share code, so together they don't add the sum of all the polyfills.
// For example injecting both number/is-finite and is-integer only adds 60K, not 108K

// Here are some things Nashorn doesn't support, comment them in to inject them:
// 'node_modules/core-js/stable/array/flat.js', // 69K (18K) minified
// 'node_modules/core-js/stable/array/includes.js', // 60K (15K)
// 'node_modules/core-js/stable/math/trunc.js', // 53K (14K)
// 'node_modules/core-js/stable/number/is-finite.js', // 54K (14K)
// 'node_modules/core-js/stable/number/is-integer.js', // 54K (14K)
// 'node_modules/core-js/stable/parse-float.js', // 59K (15K)
// 'node_modules/core-js/stable/reflect/index.js', // 88K (22K)
// 'node_modules/core-js/stable/string/pad-start.js',

// TIP: I used this command to find sizes
// npm --silent run clean && npm --silent run build:server; ls -lh build/resources/main/empty.js; npm --silent run clean && npm --silent run build:server -- --minify; ls -lh build/resources/main/empty.js
],
inject: [],
minify: false, // Minifying server files makes debugging harder

// TIP: Command to check if there are any bad requires left behind
Expand All @@ -155,7 +54,6 @@ export default function buildServerConfig(): Options {
shims: false, // https://tsup.egoist.dev/#inject-cjs-and-esm-shims

splitting: false, // In order for tests to work
// splitting: true,

sourcemap: false,
target: 'es5',
Expand Down
97 changes: 1 addition & 96 deletions tsup/test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,128 +1,33 @@
import type { Options } from '.';

// import { polyfillNode } from 'esbuild-plugin-polyfill-node';
// import { print } from 'q-i';
import { DIR_SRC_TEST } from './constants';
import {addRecursive} from './addRecursive';


export default function buildServerConfig(): Options {
const entry: string[] = [];
addRecursive(DIR_SRC_TEST, entry);
// print(entry);

return {
bundle: true,
dts: false, // d.ts files are use useless at runtime
entry,
// env: {
// BROWSER_SYNC_PORT: '3000',
// },
esbuildOptions(options, context) {
// options.alias = {
// 'alias': './src/main/resources/lib/filename.js'
// };

// Some node modules might need globalThis
// options.banner = {
// js: `const globalThis = (1, eval)('this');` // buffer polyfill needs this
// };

// If you have libs with chunks, use this to avoid collisions
options.chunkNames = '_chunks/[name]-[hash]';

options.mainFields = ['module', 'main'];

options.outbase = DIR_SRC_TEST;
},
esbuildPlugins: [
// Some node modules might need parts of Node polyfilled:
// polyfillNode({
// globals: {
// buffer: false,
// process: false
// },
// polyfills: {
// _stream_duplex: false,
// _stream_passthrough: false,
// _stream_readable: false,
// _stream_transform: false,
// _stream_writable: false,
// assert: false,
// 'assert/strict': false,
// async_hooks: false,
// buffer: false,
// child_process: false,
// cluster: false,
// console: false,
// constants: false,
// crypto: false,
// dgram: false,
// diagnostics_channel: false,
// dns: false,
// domain: false,
// events: false,
// fs: false,
// 'fs/promises': false,
// http: false,
// http2: false,
// https: false,
// module: false,
// net: false,
// os: false,
// path: false,
// perf_hooks: false,
// process: false, //"empty",
// punycode: false,
// querystring: false,
// readline: false,
// repl: false,
// stream: false,
// string_decoder: false,
// sys: false,
// timers: false,
// 'timers/promises': false,
// tls: false,
// tty: false,
// url: false,
// util: false, // true,
// v8: false,
// vm: false,
// wasi: false,
// worker_threads: false,
// zlib: false,
// }
// }) // ReferenceError: "navigator" is not defined
],
esbuildPlugins: [],
external: [
/^\//,
],
format: 'cjs',
inject: [
// Injects makes it possible to use some functionality in any file :)
// However it also makes every file larger, unless splitting: true
// If for some reason you cannot use code splitting, it is better
// to import a polyfill only in the entries that needs it.
// Code-js polyfills share code, so together they don't add the sum of all the polyfills.
// For example injecting both number/is-finite and is-integer only adds 60K, not 108K

// Here are some things Nashorn doesn't support, comment them in to inject them:
// 'node_modules/core-js/stable/array/flat.js', // 69K (18K) minified
// 'node_modules/core-js/stable/array/includes.js', // 60K (15K)
// 'node_modules/core-js/stable/math/trunc.js', // 53K (14K)
// 'node_modules/core-js/stable/number/is-finite.js', // 54K (14K)
// 'node_modules/core-js/stable/number/is-integer.js', // 54K (14K)
// 'node_modules/core-js/stable/parse-float.js', // 59K (15K)
// 'node_modules/core-js/stable/reflect/index.js', // 88K (22K)
// 'node_modules/core-js/stable/string/pad-start.js',

// TIP: I used this command to find sizes
// npm --silent run clean && npm --silent run build:server; ls -lh build/resources/main/empty.js; npm --silent run clean && npm --silent run build:server -- --minify; ls -lh build/resources/main/empty.js
],
minify: false, // Minifying server files makes debugging harder

// TIP: Command to check if there are any bad requires left behind
// grep -r 'require("' build/resources/main | grep -v 'require("/'|grep -v chunk
noExternal: [],

platform: 'neutral',
Expand Down
Loading

0 comments on commit 836159d

Please sign in to comment.