Skip to content

refactor: remove webpack from codebase #1649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paustint merged 1 commit into from
Apr 11, 2026
Merged

refactor: remove webpack from codebase #1649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
!/seed-salesforce-api.ts
!/seed.sh
!/tsconfig.base.json
!/webpack-server.config.js

# Ignore unnecessary files inside allowed directories
*#
Expand Down
62 changes: 22 additions & 40 deletions apps/cron-tasks/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,55 +6,37 @@
"tags": ["scope:server"],
"targets": {
"build": {
"executor": "@nx/webpack:webpack",
"executor": "@nx/esbuild:esbuild",
"outputs": ["{options.outputPath}"],
"defaultConfiguration": "production",
"options": {
"platform": "node",
"outputPath": "dist/apps/cron-tasks",
"main": "apps/cron-tasks/main.ts",
"format": ["cjs"],
"bundle": true,
"main": "apps/cron-tasks/src/main.ts",
"additionalEntryPoints": [
{
"entryName": "clean-up-user-sync-history",
"entryPath": "apps/cron-tasks/src/clean-up-user-sync-history.ts"
},
{
"entryName": "save-analytics-summary",
"entryPath": "apps/cron-tasks/src/save-analytics-summary.ts"
},
{
"entryName": "geo-ip-api-updater",
"entryPath": "apps/cron-tasks/src/geo-ip-api-updater.ts"
},
{
"entryName": "geo-ip-db-updater",
"entryPath": "apps/cron-tasks/src/geo-ip-db-updater.ts"
},
{
"entryName": "salesforce-org-expiration",
"entryPath": "apps/cron-tasks/src/salesforce-org-expiration.ts"
},
{
"entryName": "stats-summary",
"entryPath": "apps/cron-tasks/src/stats-summary.ts"
}
"apps/cron-tasks/src/clean-up-user-sync-history.ts",
"apps/cron-tasks/src/save-analytics-summary.ts",
"apps/cron-tasks/src/geo-ip-api-updater.ts",
"apps/cron-tasks/src/geo-ip-db-updater.ts",
"apps/cron-tasks/src/salesforce-org-expiration.ts",
"apps/cron-tasks/src/stats-summary.ts"
],
"tsConfig": "apps/cron-tasks/tsconfig.app.json",
"assets": [],
"target": "node",
"compiler": "tsc",
"webpackConfig": "apps/cron-tasks/webpack.config.js"
"generatePackageJson": true,
"sourcemap": true,
"esbuildOptions": {
"sourcemap": true,
"outExtension": {
".js": ".js"
}
}
},
"configurations": {
"production": {
"optimization": false,
"extractLicenses": false,
"inspect": false,
"fileReplacements": [
{
"replace": "apps/cron-tasks/src/environments/environment.ts",
"with": "apps/cron-tasks/src/environments/environment.prod.ts"
}
]
}
"development": {},
"production": {}
}
},
"serve": {
Expand Down
3 changes: 0 additions & 3 deletions apps/cron-tasks/src/environments/environment.prod.ts
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions apps/cron-tasks/src/environments/environment.ts
View file
Open in desktop

This file was deleted.

0 apps/cron-tasks/main.ts → apps/cron-tasks/src/main.ts
View file
Open in desktop
File renamed without changes.
8 changes: 0 additions & 8 deletions apps/cron-tasks/webpack.config.js
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions apps/jetstream-web-extension/.babelrc
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ...itional-settings/additional-settings.html → ...am-web-extension/additional-settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
<div id="root"></div>
<div id="modal-root"></div>
<div id="app-container"></div>
<script type="module" src="./src/pages/additional-settings/AdditionalSettings.tsx"></script>
</body>
</html>
1 change: 1 addition & 0 deletions ...ream-web-extension/src/pages/app/app.html → apps/jetstream-web-extension/app.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
<div id="root"></div>
<div id="modal-root"></div>
<div id="app-container"></div>
<script type="module" src="./src/pages/app/App.tsx"></script>
</body>
</html>
1 change: 1 addition & 0 deletions ...-web-extension/src/pages/popup/popup.html → apps/jetstream-web-extension/popup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@
</head>
<body>
<div id="app-container"></div>
<script type="module" src="./src/pages/popup/Popup.tsx"></script>
</body>
</html>
56 changes: 7 additions & 49 deletions apps/jetstream-web-extension/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,79 +6,37 @@
"tags": ["scope:browser"],
"targets": {
"build": {
"executor": "@nx/webpack:webpack",
"executor": "@nx/vite:build",
"outputs": ["{options.outputPath}"],
"defaultConfiguration": "production",
"options": {
"compiler": "babel",
"outputPath": "dist/apps/jetstream-web-extension",
"baseHref": "/",
"tsConfig": "apps/jetstream-web-extension/tsconfig.app.json",
"assets": ["apps/jetstream-web-extension/src/assets"],
"styles": [],
"scripts": [],
"webpackConfig": "apps/jetstream-web-extension/webpack.config.js"
"outputPath": "dist/apps/jetstream-web-extension"
},
"configurations": {
"development": {
"fileReplacements": [],
"optimization": true,
"outputHashing": "none",
"sourceMap": true,
"namedChunks": false,
"extractLicenses": false,
"vendorChunk": false
"mode": "development"
},
"staging": {
"mode": "staging",
"fileReplacements": [
{
"replace": "apps/jetstream-web-extension/src/environments/environment.ts",
"with": "apps/jetstream-web-extension/src/environments/environment.staging.ts"
}
],
"optimization": true,
"outputHashing": "none",
"sourceMap": true,
"namedChunks": false,
"extractLicenses": false,
"vendorChunk": false
]
},
"production": {
"fileReplacements": [
{
"replace": "apps/jetstream-web-extension/src/environments/environment.ts",
"with": "apps/jetstream-web-extension/src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "none",
"sourceMap": true,
"namedChunks": false,
"extractLicenses": false,
"vendorChunk": false
]
}
}
},
"serve": {
"executor": "@nx/webpack:dev-server",
"defaultConfiguration": "development",
"options": {
"buildTarget": "jetstream-web-extension:build",
"hmr": true
},
"configurations": {
"development": {
"buildTarget": "jetstream-web-extension:build:development"
},
"production": {
"buildTarget": "jetstream-web-extension:build:production",
"hmr": false
},
"staging": {
"buildTarget": "jetstream-web-extension:build:staging",
"hmr": false
}
}
"command": "nx build jetstream-web-extension --configuration=development --watch"
},
"test": {
"executor": "@nx/vitest:test",
Expand Down
0 ...ream-web-extension/src/assets/favicon.ico → ...m-web-extension/public/assets/favicon.ico
View file
Open in desktop
File renamed without changes.
0 ...n/src/assets/icons/jetstream-icon-128.png → ...ublic/assets/icons/jetstream-icon-128.png
View file
Open in desktop
File renamed without changes
0 ...on/src/assets/icons/jetstream-icon-16.png → ...public/assets/icons/jetstream-icon-16.png
View file
Open in desktop
File renamed without changes
0 ...on/src/assets/icons/jetstream-icon-32.png → ...public/assets/icons/jetstream-icon-32.png
View file
Open in desktop
File renamed without changes
0 ...on/src/assets/icons/jetstream-icon-48.png → ...public/assets/icons/jetstream-icon-48.png
View file
Open in desktop
File renamed without changes
0 ...sets/icons/jetstream-icon-inverse-128.png → ...sets/icons/jetstream-icon-inverse-128.png
View file
Open in desktop
File renamed without changes
0 ...ssets/icons/jetstream-icon-inverse-16.png → ...ssets/icons/jetstream-icon-inverse-16.png
View file
Open in desktop
File renamed without changes
0 ...ssets/icons/jetstream-icon-inverse-24.png → ...ssets/icons/jetstream-icon-inverse-24.png
View file
Open in desktop
File renamed without changes
0 ...ssets/icons/jetstream-icon-inverse-32.png → ...ssets/icons/jetstream-icon-inverse-32.png
View file
Open in desktop
File renamed without changes
0 ...ssets/icons/jetstream-icon-inverse-48.png → ...ssets/icons/jetstream-icon-inverse-48.png
View file
Open in desktop
File renamed without changes
0 ...c/assets/icons/jetstream-icon-pro-128.png → ...c/assets/icons/jetstream-icon-pro-128.png
View file
Open in desktop
File renamed without changes
0 ...rc/assets/icons/jetstream-icon-pro-16.png → ...ic/assets/icons/jetstream-icon-pro-16.png
View file
Open in desktop
File renamed without changes
0 ...rc/assets/icons/jetstream-icon-pro-24.png → ...ic/assets/icons/jetstream-icon-pro-24.png
View file
Open in desktop
File renamed without changes
0 ...rc/assets/icons/jetstream-icon-pro-32.png → ...ic/assets/icons/jetstream-icon-pro-32.png
View file
Open in desktop
File renamed without changes
0 ...rc/assets/icons/jetstream-icon-pro-48.png → ...ic/assets/icons/jetstream-icon-pro-48.png
View file
Open in desktop
File renamed without changes
0 ...n/src/assets/icons/jetstream-icon-pro.svg → ...ublic/assets/icons/jetstream-icon-pro.svg
View file
Open in desktop
File renamed without changes
0 ...ts/icons/jetstream-icon-sfdc-blue-128.png → ...ts/icons/jetstream-icon-sfdc-blue-128.png
View file
Open in desktop
File renamed without changes
0 ...ets/icons/jetstream-icon-sfdc-blue-16.png → ...ets/icons/jetstream-icon-sfdc-blue-16.png
View file
Open in desktop
File renamed without changes
0 ...ets/icons/jetstream-icon-sfdc-blue-24.png → ...ets/icons/jetstream-icon-sfdc-blue-24.png
View file
Open in desktop
File renamed without changes
0 ...ets/icons/jetstream-icon-sfdc-blue-32.png → ...ets/icons/jetstream-icon-sfdc-blue-32.png
View file
Open in desktop
File renamed without changes
0 ...ets/icons/jetstream-icon-sfdc-blue-48.png → ...ets/icons/jetstream-icon-sfdc-blue-48.png
View file
Open in desktop
File renamed without changes
0 ...c/assets/images/split-grip-horizontal.png → ...c/assets/images/split-grip-horizontal.png
View file
Open in desktop
File renamed without changes
0 ...src/assets/images/split-grip-vertical.png → ...lic/assets/images/split-grip-vertical.png
View file
Open in desktop
File renamed without changes
0 ...extension/src/assets/js/monaco/.gitignore → ...ension/public/assets/js/monaco/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...b-extension/src/assets/js/monaco/.gitkeep → ...xtension/public/assets/js/monaco/.gitkeep
View file
Open in desktop
File renamed without changes.
0 ...-extension/src/redirect-utils/redirect.js → ...etstream-web-extension/public/redirect.js
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions apps/jetstream-web-extension/src/environments/environment.prod.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export const environment = {
production: true,
serverUrl: 'https://getjetstream.app',
rollbarClientAccessToken: process.env.NX_PUBLIC_ROLLBAR_KEY,
amplitudeToken: process.env.NX_PUBLIC_AMPLITUDE_KEY,
rollbarClientAccessToken: import.meta.env.NX_PUBLIC_ROLLBAR_KEY,
amplitudeToken: import.meta.env.NX_PUBLIC_AMPLITUDE_KEY,
isWebExtension: true,
};
4 changes: 2 additions & 2 deletions apps/jetstream-web-extension/src/environments/environment.staging.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export const environment = {
production: true,
serverUrl: 'https://staging.jetstream-app.com',
rollbarClientAccessToken: process.env.NX_PUBLIC_ROLLBAR_KEY,
amplitudeToken: process.env.NX_PUBLIC_AMPLITUDE_KEY,
rollbarClientAccessToken: import.meta.env.NX_PUBLIC_ROLLBAR_KEY,
amplitudeToken: import.meta.env.NX_PUBLIC_AMPLITUDE_KEY,
isWebExtension: true,
};
4 changes: 2 additions & 2 deletions apps/jetstream-web-extension/src/environments/environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
export const environment = {
production: false,
serverUrl: 'http://localhost:3333',
rollbarClientAccessToken: process.env.NX_PUBLIC_ROLLBAR_KEY,
amplitudeToken: process.env.NX_PUBLIC_AMPLITUDE_KEY,
rollbarClientAccessToken: import.meta.env.NX_PUBLIC_ROLLBAR_KEY,
amplitudeToken: import.meta.env.NX_PUBLIC_AMPLITUDE_KEY,
isWebExtension: true,
};
2 changes: 0 additions & 2 deletions apps/jetstream-web-extension/src/pages/app/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
/* eslint-disable no-restricted-globals */
import '../../utils/extension-public-path';

import { AnonymousApex } from '@jetstream/feature/anon-apex';
import { AutomationControl, AutomationControlEditor, AutomationControlSelection } from '@jetstream/feature/automation-control';
import { CreateFields, CreateFieldsSelection, CreateObjectAndFields } from '@jetstream/feature/create-object-and-fields';
Expand Down
2 changes: 0 additions & 2 deletions apps/jetstream-web-extension/src/pages/popup/Popup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import '../../utils/extension-public-path';

import { css } from '@emotion/react';
import { CheckboxToggle, FeedbackLink, Grid, ScopedNotification } from '@jetstream/ui';
import browser from 'webextension-polyfill';
Expand Down
7 changes: 0 additions & 7 deletions apps/jetstream-web-extension/src/redirect-utils/placeholder-redirect.html
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions apps/jetstream-web-extension/src/utils/extension-public-path.ts
View file
Open in desktop

This file was deleted.

46 changes: 44 additions & 2 deletions apps/jetstream-web-extension/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,54 @@
/// <reference types='vitest' />
import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
import react from '@vitejs/plugin-react';
import { resolve } from 'path';
import { defineConfig } from 'vite';
import { extensionScriptsBuildPlugin, manifestTransformPlugin, placeholderHtmlPlugin } from './vite.plugins';

export default defineConfig(() => ({
export default defineConfig(({ mode }) => ({
root: __dirname,
cacheDir: '../../node_modules/.vite/apps/jetstream-web-extension',
plugins: [react(), nxViteTsPaths()],
envPrefix: 'NX',
base: '',

plugins: [
react({
jsxImportSource: '@emotion/react',
babel: {
plugins: ['@emotion/babel-plugin'],
},
}),
nxViteTsPaths(),
manifestTransformPlugin(mode),
placeholderHtmlPlugin(),
extensionScriptsBuildPlugin(mode),
],

define: {
'globalThis.__IS_BROWSER_EXTENSION__': 'true',
'import.meta.env.NX_PUBLIC_AMPLITUDE_KEY': JSON.stringify(process.env.NX_PUBLIC_AMPLITUDE_KEY || ''),
'process.env.NODE_ENV': JSON.stringify(mode === 'development' ? 'development' : 'production'),
},
Comment thread
paustint marked this conversation as resolved.

build: {
outDir: '../../dist/apps/jetstream-web-extension',
emptyOutDir: true,
sourcemap: mode === 'development' ? 'inline' : false,
minify: mode === 'development' ? false : 'esbuild',
rollupOptions: {
input: {
app: resolve(__dirname, 'app.html'),
popup: resolve(__dirname, 'popup.html'),
'additional-settings': resolve(__dirname, 'additional-settings.html'),
},
output: {
entryFileNames: '[name].js',
chunkFileNames: '[name]-[hash].js',
assetFileNames: '[name].[ext]',
},
},
},

test: {
name: 'jetstream-web-extension',
watch: false,
Expand Down
Loading
Loading