Skip to content
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

Refactor webpack configuration to improve library exports #1565

Merged
merged 8 commits into from
Sep 6, 2024
Merged

Refactor webpack configuration to improve library exports #1565

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
deee615
Refactor webpack configuration to improve library exports
May 22, 2024
4bb8daf
Revert default export of UpgradeClient and removed library name to ge…
May 23, 2024
c4bd47e
Made default export for UpgradeClient
KD1712 Jun 6, 2024
bbac2b8
Refactored webpack configs into a single function for all
KD1712 Jun 19, 2024
23d7b75
Merge branch 'dev' into code-improvement/import-client-without-webpac…
ppratikcr7 Jun 25, 2024
c68e9e4
Merge branch 'dev' into code-improvement/import-client-without-webpac…
danoswaltCL Jul 22, 2024
f742342
Merge branch 'CarnegieLearningWeb:dev' into code-improvement/import-c…
KD1712 Sep 5, 2024
f9a779f
Updated file import
KD1712 Sep 6, 2024
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
12 changes: 4 additions & 8 deletions clientlibs/js/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@ import UpgradeClient from './UpGradeClient/UpgradeClient';
import Assignment from './Assignment/Assignment';
import { UpGradeClientEnums, UpGradeClientInterfaces, UpGradeClientRequests } from './types';
import { MARKED_DECISION_POINT_STATUS } from 'upgrade_types';
export {
UpgradeClient,
Assignment,
UpGradeClientEnums,
UpGradeClientInterfaces,
UpGradeClientRequests,
MARKED_DECISION_POINT_STATUS,
};

export default UpgradeClient;

export { Assignment, UpGradeClientEnums, UpGradeClientInterfaces, UpGradeClientRequests, MARKED_DECISION_POINT_STATUS };
94 changes: 25 additions & 69 deletions clientlibs/js/webpack.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import path = require('path');
import webpack = require('webpack');
import packageJson = require('./package.json');
const path = require('path');
const webpack = require('webpack');
const packageJson = require('./package.json');

KD1712 marked this conversation as resolved.
Show resolved Hide resolved
const version = packageJson.version.split('.')[0];

Expand Down Expand Up @@ -29,80 +29,36 @@ const generalConfiguration = {
],
};

const browser = {
const createConfig = (
target: string,
outputPath: string,
useCustomHttpClient: boolean,
isBrowser: boolean,
externals = {}
) => ({
...generalConfiguration,
target,
output: {
filename: 'index.js',
path: path.resolve(__dirname, 'dist/browser'),
library: 'UpgradeClient',
globalObject: 'this',
libraryTarget: 'umd',
library: 'upgrade-client-lib',
},
plugins: [
new webpack.DefinePlugin({
API_VERSION: version,
USE_CUSTOM_HTTP_CLIENT: JSON.stringify(false),
IS_BROWSER: JSON.stringify(true),
}),
],
};

const node = {
...generalConfiguration,
target: 'node',
output: {
libraryExport: 'default',
filename: 'index.js',
path: path.resolve(__dirname, 'dist/node'),
libraryTarget: 'umd',
library: 'upgrade-client-lib',
path: path.resolve(__dirname, outputPath),
},
externals,
plugins: [
new webpack.DefinePlugin({
API_VERSION: version,
USE_CUSTOM_HTTP_CLIENT: JSON.stringify(false),
IS_BROWSER: JSON.stringify(false),
USE_CUSTOM_HTTP_CLIENT: JSON.stringify(useCustomHttpClient),
IS_BROWSER: JSON.stringify(isBrowser),
}),
],
};

const browserLite = {
...generalConfiguration,
output: {
filename: 'index.js',
path: path.resolve(__dirname, 'dist/browser-lite'),
libraryTarget: 'umd',
library: 'upgrade-client-lib',
},
externals: {
axios: 'axios',
},
plugins: [
new webpack.DefinePlugin({
API_VERSION: version,
USE_CUSTOM_HTTP_CLIENT: JSON.stringify(true),
IS_BROWSER: JSON.stringify(true),
}),
],
};

const nodeLite = {
...generalConfiguration,
target: 'node',
output: {
filename: 'index.js',
path: path.resolve(__dirname, 'dist/node-lite'),
libraryTarget: 'umd',
library: 'upgrade-client-lib',
},
externals: {
axios: 'axios',
},
plugins: [
new webpack.DefinePlugin({
API_VERSION: version,
USE_CUSTOM_HTTP_CLIENT: JSON.stringify(true),
IS_BROWSER: JSON.stringify(false),
}),
],
};
});

module.exports = [browser, node, browserLite, nodeLite];
module.exports = [
createConfig(undefined, 'dist/browser', false, true),
createConfig('node', 'dist/node', false, false),
createConfig(undefined, 'dist/browser-lite', true, true, { axios: 'axios' }),
createConfig('node', 'dist/node-lite', true, false, { axios: 'axios' }),
];
Loading