Skip to content

Commit c495fdc

Browse files
committed
remove requirejs and some k3d fork workarounds we no longer need
1 parent 9846d72 commit c495fdc

File tree

3 files changed

+46
-39
lines changed

3 files changed

+46
-39
lines changed

src/packages/frontend/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@
150150
"react-redux": "^8.0.5",
151151
"react-timeago": "^7.2.0",
152152
"react-virtuoso": "^4.9.0",
153-
"requirejs": "^2.3.7",
154153
"resize-observer-polyfill": "^1.5.1",
155154
"sha1": "^1.1.1",
156155
"shallowequal": "^1.1.0",

src/packages/pnpm-lock.yaml

Lines changed: 43 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/packages/static/src/webpack.config.ts

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export default function getConfig({ middleware }: Options = {}) {
9797
function registerPlugin(
9898
desc: string,
9999
plugin: WebpackPluginInstance,
100-
disable?: boolean
100+
disable?: boolean,
101101
) {
102102
if (disable) {
103103
console.log("Disabling plugin: ", desc);
@@ -136,7 +136,7 @@ export default function getConfig({ middleware }: Options = {}) {
136136
"define React",
137137
new ProvidePlugin({
138138
React: "react",
139-
})
139+
}),
140140
);
141141

142142
if (MEASURE) {
@@ -220,25 +220,8 @@ export default function getConfig({ middleware }: Options = {}) {
220220
// anywhere in that library:
221221
"@cocalc/frontend": resolve("node_modules", "@cocalc/frontend"),
222222
// This entities/maps alias is needed due to a weird markdown-it import
223-
// that webpack 5 won't resolve:
223+
// that webpack5 won't resolve:
224224
"entities/maps": resolve("node_modules/entities/lib/maps"),
225-
// This is needed due to k3d's snapshot.js making assumptions
226-
// about how npm (and now pnpm!) works, which are violated for us, about where fflate
227-
// ends up getting installed. Due to hoisting they aren't right.
228-
// We don't even actually use snapshot.js, since we disable that
229-
// functionality in k3d. This workaround should be robust due to
230-
// our use of total hoisting via links that pnpm uses (as configured
231-
// in .npmrc).
232-
"../../../../node_modules/requirejs/require": resolve(
233-
"..",
234-
"node_modules",
235-
".pnpm/[email protected]/node_modules/requirejs/require"
236-
),
237-
"../../../../node_modules/fflate/umd/index": resolve(
238-
"..",
239-
"node_modules",
240-
".pnpm/[email protected]/node_modules/fflate/umd/index"
241-
),
242225
},
243226
// So we can "import 'file'" instead of "import 'file.tsx'"
244227
extensions: [

0 commit comments

Comments
 (0)