Skip to content

Commit

Permalink
build: Use .cjs file extension with CJS webpack configs (microsoft#19112
Browse files Browse the repository at this point in the history
)
  • Loading branch information
tylerbutler committed Feb 3, 2024
1 parent 40127df commit 7328d03
Show file tree
Hide file tree
Showing 196 changed files with 282 additions and 282 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ module.exports = (env) => {
},
resolve: {
extensionAlias: {
".js": [".ts", ".tsx", ".js"],
".js": [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
extensions: [".ts", ".tsx", ".js"],
extensions: [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
module: {
rules: [
Expand Down Expand Up @@ -48,6 +48,6 @@ module.exports = (env) => {
}),
],
},
isProduction ? require("./webpack.prod") : require("./webpack.dev"),
isProduction ? require("./webpack.prod.cjs") : require("./webpack.dev.cjs"),
);
};
4 changes: 2 additions & 2 deletions examples/apps/collaborative-textarea/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"prepack": "npm run webpack",
"prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
"prettier:fix": "prettier --write . --cache --ignore-path ../../../.prettierignore",
"start": "webpack serve --config webpack.config.js",
"start:test": "webpack serve --config webpack.test.js",
"start": "webpack serve --config webpack.config.cjs",
"start:test": "webpack serve --config webpack.test.cjs",
"test": "npm run test:jest",
"test:jest": "jest",
"test:jest:verbose": "cross-env FLUID_TEST_VERBOSE=1 jest",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ module.exports = (env) => {
},
resolve: {
extensionAlias: {
".js": [".ts", ".tsx", ".js"],
".js": [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
extensions: [".ts", ".tsx", ".js"],
extensions: [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
module: {
rules: [
Expand Down Expand Up @@ -48,6 +48,6 @@ module.exports = (env) => {
}),
],
},
isProduction ? require("./webpack.prod") : require("./webpack.dev"),
isProduction ? require("./webpack.prod.cjs") : require("./webpack.dev.cjs"),
);
};
2 changes: 1 addition & 1 deletion examples/apps/contact-collection/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
"prettier:fix": "prettier --write . --cache --ignore-path ../../../.prettierignore",
"start": "webpack serve",
"start:test": "webpack serve --config webpack.test.js",
"start:test": "webpack serve --config webpack.test.cjs",
"test": "npm run test:jest",
"test:jest": "jest",
"test:jest:verbose": "cross-env FLUID_TEST_VERBOSE=1 jest",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ module.exports = (env) => {
},
resolve: {
extensionAlias: {
".js": [".ts", ".tsx", ".js"],
".js": [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
extensions: [".ts", ".tsx", ".js"],
extensions: [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
module: {
rules: [
Expand Down Expand Up @@ -50,6 +50,6 @@ module.exports = (env) => {
// new CleanWebpackPlugin(),
],
},
isProduction ? require("./webpack.prod") : require("./webpack.dev"),
isProduction ? require("./webpack.prod.cjs") : require("./webpack.dev.cjs"),
);
};
2 changes: 1 addition & 1 deletion examples/apps/data-object-grid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"prettier:fix": "prettier --write . --cache --ignore-path ../../../.prettierignore",
"start": "webpack serve",
"start:server": "tinylicious",
"start:test": "webpack serve --config webpack.test.js",
"start:test": "webpack serve --config webpack.test.cjs",
"test": "npm run test:jest",
"test:jest": "jest",
"test:jest:verbose": "cross-env FLUID_TEST_VERBOSE=1 jest",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ module.exports = (env) => {
},
resolve: {
extensionAlias: {
".js": [".ts", ".tsx", ".js"],
".js": [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
extensions: [".ts", ".tsx", ".js"],
extensions: [".ts", ".tsx", ".js", ".cjs", ".mjs"],
fallback: {
dgram: false,
fs: false,
Expand Down Expand Up @@ -70,6 +70,6 @@ module.exports = (env) => {
}),
],
},
isProduction ? require("./webpack.prod") : require("./webpack.dev"),
isProduction ? require("./webpack.prod.cjs") : require("./webpack.dev.cjs"),
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const path = require("path");
const HtmlWebpackPlugin = require("html-webpack-plugin");

module.exports = (env) => {
const config = require("./webpack.config")(env);
const config = require("./webpack.config.cjs")(env);
return {
...config,
entry: {
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/presence-tracker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
"prettier:fix": "prettier --write . --cache --ignore-path ../../../.prettierignore",
"start": "webpack serve",
"start:client:test": "webpack serve --config webpack.test.js",
"start:client:test": "webpack serve --config webpack.test.cjs",
"test": "npm run test:jest",
"test:jest": "jest",
"test:jest:verbose": "cross-env FLUID_TEST_VERBOSE=1 jest --passWithNoTests",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ module.exports = (env) => {
},
resolve: {
extensionAlias: {
".js": [".ts", ".tsx", ".js"],
".js": [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
extensions: [".ts", ".tsx", ".js"],
extensions: [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
module: {
rules: [
Expand Down Expand Up @@ -48,6 +48,6 @@ module.exports = (env) => {
}),
],
},
isProduction ? require("./webpack.prod") : require("./webpack.dev"),
isProduction ? require("./webpack.prod.cjs") : require("./webpack.dev.cjs"),
);
};
2 changes: 1 addition & 1 deletion examples/apps/task-selection/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
"prettier:fix": "prettier --write . --cache --ignore-path ../../../.prettierignore",
"start": "webpack serve",
"start:test": "webpack serve --config webpack.test.js",
"start:test": "webpack serve --config webpack.test.cjs",
"test": "npm run test:jest",
"test:jest": "jest",
"test:jest:verbose": "cross-env FLUID_TEST_VERBOSE=1 jest",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ module.exports = (env) => {
},
resolve: {
extensionAlias: {
".js": [".ts", ".tsx", ".js"],
".js": [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
extensions: [".ts", ".tsx", ".js"],
extensions: [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
module: {
rules: [
Expand Down Expand Up @@ -50,6 +50,6 @@ module.exports = (env) => {
// new CleanWebpackPlugin(),
],
},
isProduction ? require("./webpack.prod") : require("./webpack.dev"),
isProduction ? require("./webpack.prod.cjs") : require("./webpack.dev.cjs"),
);
};
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/apps/tree-comparison/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
"prettier:fix": "prettier --write . --cache --ignore-path ../../../.prettierignore",
"start": "webpack serve",
"start:test": "webpack serve --config webpack.test.js",
"start:test": "webpack serve --config webpack.test.cjs",
"test": "npm run test:jest",
"test:jest": "jest",
"test:jest:verbose": "cross-env FLUID_TEST_VERBOSE=1 jest",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ module.exports = (env) => {
},
resolve: {
extensionAlias: {
".js": [".ts", ".tsx", ".js"],
".js": [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
extensions: [".ts", ".tsx", ".js"],
extensions: [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
module: {
rules: [
Expand Down Expand Up @@ -50,6 +50,6 @@ module.exports = (env) => {
// new CleanWebpackPlugin(),
],
},
isProduction ? require("./webpack.prod") : require("./webpack.dev"),
isProduction ? require("./webpack.prod.cjs") : require("./webpack.dev.cjs"),
);
};
12 changes: 6 additions & 6 deletions examples/benchmarks/bubblebench/baseline/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
"prepack": "npm run webpack",
"prettier": "prettier --check . --cache --ignore-path ../../../../.prettierignore",
"prettier:fix": "prettier --write . --cache --ignore-path ../../../../.prettierignore",
"start": "webpack serve --config webpack.config.js --env mode=local",
"start:docker": "webpack serve --config webpack.config.js --env mode=docker",
"start:r11s": "webpack serve --config webpack.config.js --env mode=r11s",
"start:spo": "webpack serve --config webpack.config.js --env mode=spo",
"start:spo-df": "webpack serve --config webpack.config.js --env mode=spo-df",
"start:tinylicious": "webpack serve --config webpack.config.js --env mode=tinylicious",
"start": "webpack serve --config webpack.config.cjs --env mode=local",
"start:docker": "webpack serve --config webpack.config.cjs --env mode=docker",
"start:r11s": "webpack serve --config webpack.config.cjs --env mode=r11s",
"start:spo": "webpack serve --config webpack.config.cjs --env mode=spo",
"start:spo-df": "webpack serve --config webpack.config.cjs --env mode=spo-df",
"start:tinylicious": "webpack serve --config webpack.config.cjs --env mode=tinylicious",
"test": "npm run test:jest",
"test:jest": "jest",
"test:jest:verbose": "cross-env FLUID_TEST_VERBOSE=1 jest",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ module.exports = (env) => {
},
resolve: {
extensionAlias: {
".js": [".ts", ".tsx", ".js"],
".js": [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
extensions: [".ts", ".tsx", ".js"],
extensions: [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
module: {
rules: [
Expand All @@ -46,7 +46,7 @@ module.exports = (env) => {
ignored: "**/node_modules/**",
},
},
isProduction ? require("./webpack.prod") : require("./webpack.dev"),
isProduction ? require("./webpack.prod.cjs") : require("./webpack.dev.cjs"),
fluidRoute.devServerConfig(__dirname, env),
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
"prepack": "npm run webpack",
"prettier": "prettier --check . --cache --ignore-path ../../../../.prettierignore",
"prettier:fix": "prettier --write . --cache --ignore-path ../../../../.prettierignore",
"start": "webpack serve --config webpack.config.js --env mode=local",
"start:docker": "webpack serve --config webpack.config.js --env mode=docker",
"start:r11s": "webpack serve --config webpack.config.js --env mode=r11s",
"start:spo": "webpack serve --config webpack.config.js --env mode=spo",
"start:spo-df": "webpack serve --config webpack.config.js --env mode=spo-df",
"start:tinylicious": "webpack serve --config webpack.config.js --env mode=tinylicious",
"start": "webpack serve --config webpack.config.cjs --env mode=local",
"start:docker": "webpack serve --config webpack.config.cjs --env mode=docker",
"start:r11s": "webpack serve --config webpack.config.cjs --env mode=r11s",
"start:spo": "webpack serve --config webpack.config.cjs --env mode=spo",
"start:spo-df": "webpack serve --config webpack.config.cjs --env mode=spo-df",
"start:tinylicious": "webpack serve --config webpack.config.cjs --env mode=tinylicious",
"test": "npm run test:jest",
"test:jest": "jest",
"test:jest:verbose": "cross-env FLUID_TEST_VERBOSE=1 jest",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ module.exports = (env) => {
},
resolve: {
extensionAlias: {
".js": [".ts", ".tsx", ".js"],
".js": [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
extensions: [".ts", ".tsx", ".js"],
extensions: [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
module: {
rules: [
Expand All @@ -47,7 +47,7 @@ module.exports = (env) => {
ignored: "**/node_modules/**",
},
},
isProduction ? require("./webpack.prod") : require("./webpack.dev"),
isProduction ? require("./webpack.prod.cjs") : require("./webpack.dev.cjs"),
fluidRoute.devServerConfig(__dirname, env),
);
};
12 changes: 6 additions & 6 deletions examples/benchmarks/bubblebench/ot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
"prepack": "npm run webpack",
"prettier": "prettier --check . --cache --ignore-path ../../../../.prettierignore",
"prettier:fix": "prettier --write . --cache --ignore-path ../../../../.prettierignore",
"start": "webpack serve --config webpack.config.js --env mode=local",
"start:docker": "webpack serve --config webpack.config.js --env mode=docker",
"start:r11s": "webpack serve --config webpack.config.js --env mode=r11s",
"start:spo": "webpack serve --config webpack.config.js --env mode=spo",
"start:spo-df": "webpack serve --config webpack.config.js --env mode=spo-df",
"start:tinylicious": "webpack serve --config webpack.config.js --env mode=tinylicious",
"start": "webpack serve --config webpack.config.cjs --env mode=local",
"start:docker": "webpack serve --config webpack.config.cjs --env mode=docker",
"start:r11s": "webpack serve --config webpack.config.cjs --env mode=r11s",
"start:spo": "webpack serve --config webpack.config.cjs --env mode=spo",
"start:spo-df": "webpack serve --config webpack.config.cjs --env mode=spo-df",
"start:tinylicious": "webpack serve --config webpack.config.cjs --env mode=tinylicious",
"test": "npm run test:jest",
"test:jest": "jest",
"test:jest:verbose": "cross-env FLUID_TEST_VERBOSE=1 jest",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ module.exports = (env) => {
},
resolve: {
extensionAlias: {
".js": [".ts", ".tsx", ".js"],
".js": [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
extensions: [".ts", ".tsx", ".js"],
extensions: [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
module: {
rules: [
Expand All @@ -46,7 +46,7 @@ module.exports = (env) => {
ignored: "**/node_modules/**",
},
},
isProduction ? require("./webpack.prod") : require("./webpack.dev"),
isProduction ? require("./webpack.prod.cjs") : require("./webpack.dev.cjs"),
fluidRoute.devServerConfig(__dirname, env),
);
};
12 changes: 6 additions & 6 deletions examples/benchmarks/bubblebench/sharedtree/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
"prepack": "npm run webpack",
"prettier": "prettier --check . --cache --ignore-path ../../../../.prettierignore",
"prettier:fix": "prettier --write . --cache --ignore-path ../../../../.prettierignore",
"start": "webpack serve --config webpack.config.js --env mode=local",
"start:docker": "webpack serve --config webpack.config.js --env mode=docker",
"start:r11s": "webpack serve --config webpack.config.js --env mode=r11s",
"start:spo": "webpack serve --config webpack.config.js --env mode=spo",
"start:spo-df": "webpack serve --config webpack.config.js --env mode=spo-df",
"start:tinylicious": "webpack serve --config webpack.config.js --env mode=tinylicious",
"start": "webpack serve --config webpack.config.cjs --env mode=local",
"start:docker": "webpack serve --config webpack.config.cjs --env mode=docker",
"start:r11s": "webpack serve --config webpack.config.cjs --env mode=r11s",
"start:spo": "webpack serve --config webpack.config.cjs --env mode=spo",
"start:spo-df": "webpack serve --config webpack.config.cjs --env mode=spo-df",
"start:tinylicious": "webpack serve --config webpack.config.cjs --env mode=tinylicious",
"test": "npm run test:jest",
"test:jest": "jest",
"test:jest:verbose": "cross-env FLUID_TEST_VERBOSE=1 jest",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ module.exports = (env) => {
},
resolve: {
extensionAlias: {
".js": [".ts", ".tsx", ".js"],
".js": [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
extensions: [".ts", ".tsx", ".js"],
extensions: [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
module: {
rules: [
Expand All @@ -46,7 +46,7 @@ module.exports = (env) => {
ignored: "**/node_modules/**",
},
},
isProduction ? require("./webpack.prod") : require("./webpack.dev"),
isProduction ? require("./webpack.prod.cjs") : require("./webpack.dev.cjs"),
fluidRoute.devServerConfig(__dirname, env),
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
} from "@fluidframework/tool-utils";
import { getServer, IOdspTokens } from "@fluidframework/odsp-doclib-utils/internal";
import { assert } from "@fluidframework/core-utils";
import config from "../webpack.config.js";
import config from "../webpack.config.cjs";

const getThisOrigin = (port: number): string => `http://localhost:${port}`;
let odspAuthStage = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module.exports = {
node: false,
resolve: {
extensionAlias: {
".js": [".ts", ".tsx", ".js"],
".js": [".ts", ".tsx", ".js", ".cjs", ".mjs"],
},
extensions: [".tsx", ".ts", ".js"],
},
Expand Down
2 changes: 1 addition & 1 deletion examples/benchmarks/tablebench/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"prettier:fix": "prettier --write . --cache --ignore-path ../../../.prettierignore",
"start": "start-server-and-test tinylicious 7070 start:webpack",
"start:t9s": "tinylicious",
"start:webpack": "webpack serve --config webpack.config.js --env mode=tinylicious",
"start:webpack": "webpack serve --config webpack.config.cjs --env mode=tinylicious",
"test": "npm run test:mocha",
"test:benchmark:report": "mocha --exit --perfMode --parentProcess --fgrep @Benchmark --reporter @fluid-tools/benchmark/dist/MochaReporter.js --timeout 60000",
"test:mocha": "mocha",
Expand Down
Loading

0 comments on commit 7328d03

Please sign in to comment.