Skip to content

Commit e7a5551

Browse files
authored
Fix electron webpack samples (#6864)
The electron webpack samples' transforms weren't updated when we changed to .cjs extensions which breaks native module imports (node extensions). This PR addresses by adding .cjs to the list of files to transform
1 parent 4d4516a commit e7a5551

File tree

5 files changed

+66246
-74750
lines changed

5 files changed

+66246
-74750
lines changed

extensions/samples/electron-webpack/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"make": "electron-forge make",
1111
"publish": "electron-forge publish",
1212
"lint": "eslint --ext .ts,.tsx .",
13-
"build:package": "cd ../../lib/msal-common && npm run build && cd ../msal-node && npm run build",
13+
"build:package": "npm run build --workspace=@azure/msal-common --workspace=@azure/msal-node --workspace=@azure/msal-node-extensions",
1414
"start:build": "npm run build:package && npm start"
1515
},
1616
"keywords": [
@@ -53,9 +53,9 @@
5353
"typescript": "~4.5.4"
5454
},
5555
"dependencies": {
56-
"@azure/msal-node": "^2.0.0-beta.0",
57-
"@azure/msal-node-extensions": "^1.0.0-beta.0",
56+
"@azure/msal-node": "^2.6.2",
57+
"@azure/msal-node-extensions": "^1.0.10",
5858
"bootstrap": "^4.6.2",
5959
"electron-squirrel-startup": "^1.0.0"
6060
}
61-
}
61+
}
Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
import type { ModuleOptions } from 'webpack';
1+
import type { ModuleOptions } from "webpack";
22

3-
export const rules: Required<ModuleOptions>['rules'] = [
4-
// Add support for native node modules
5-
{
6-
// We're specifying native_modules in the test because the asset relocator loader generates a
7-
// "fake" .node file which is really a cjs file.
8-
test: /native_modules\/.+\.node$/,
9-
use: 'node-loader',
10-
},
11-
{
12-
test: /\.(m?js|node)$/,
13-
parser: { amd: false },
14-
use: {
15-
loader: '@vercel/webpack-asset-relocator-loader',
16-
options: {
17-
outputAssetBase: 'native_modules',
18-
},
3+
export const rules: Required<ModuleOptions>["rules"] = [
4+
// Add support for native node modules
5+
{
6+
// We're specifying native_modules in the test because the asset relocator loader generates a
7+
// "fake" .node file which is really a cjs file.
8+
test: /native_modules\/.+\.node$/,
9+
use: "node-loader",
1910
},
20-
},
21-
{
22-
test: /\.tsx?$/,
23-
exclude: /(node_modules|\.webpack)/,
24-
use: {
25-
loader: 'ts-loader',
26-
options: {
27-
transpileOnly: true,
28-
},
11+
{
12+
test: /\.([m|c]?js|node)$/,
13+
parser: { amd: false },
14+
use: {
15+
loader: "@vercel/webpack-asset-relocator-loader",
16+
options: {
17+
outputAssetBase: "native_modules",
18+
},
19+
},
20+
},
21+
{
22+
test: /\.tsx?$/,
23+
exclude: /(node_modules|\.webpack)/,
24+
use: {
25+
loader: "ts-loader",
26+
options: {
27+
transpileOnly: true,
28+
},
29+
},
2930
},
30-
},
3131
];

0 commit comments

Comments
 (0)