21 Commits

Author SHA1 Message Date
Feanil Patel
9a02c73936 fix: Use the default merge for webpack config.
The smart merge feature has been dropped from the webpack-merge library
that we were using. Use the basic merge feature instead since we're not
actually doing anything too complicated.

Also don't return null from the WorkerConfig as it can't be correctly
merged.
2025-09-19 12:52:33 -04:00
Jorg Are
10c74e1082 feat: update captions content (#36732) 2025-05-21 08:45:10 -04:00
Brian Smith
05baf4c1fe revert: revert: "chore: upgrade to node 18" (#34496)
This reverts commit eb26333ca6.
2024-04-19 14:03:42 -04:00
Feanil Patel
eb26333ca6 Revert "chore: upgrade to node 18" (#34496)
* Revert "chore: upgrade to node 18"

* Revert "fix: bump npm from 10.2.x to 10.5.x"

This reverts commit b6662d4ee0.

* Revert "fix: replace outdated webpack plugins"

This reverts commit b204f1b572.

* Revert "build: Remove the `npm bin` calls from package.json"

This reverts commit 4e3dd161ff.

* fix: fix bad conflict resolution.

---------

Co-authored-by: Diana Huang <dkh@edx.org>
2024-04-10 09:58:42 -04:00
Brian Smith
8fb63bb0cf chore(deps): update deps to support node 18 2024-04-09 10:32:54 -04:00
Syed Ali Abbas Zaidi
8480dbc228 chore: apply amnesty on existing not fixable issues (#32215)
* fix: eslint operator-linebreak issue

* fix: eslint quotes issue

* fix: react jsx indent and props issues

* fix: eslint trailing spaces issues

* fix: eslint line around directives issue

* fix: eslint semi rule

* fix: eslint newline per chain rule

* fix: eslint space infix ops rule

* fix: eslint space-in-parens issue

* fix: eslint space before function paren issue

* fix: eslint space before blocks issue

* fix: eslint arrow body style issue

* fix: eslint dot-location issue

* fix: eslint quotes issue

* fix: eslint quote props issue

* fix: eslint operator assignment issue

* fix: eslint new line after import issue

* fix: indent issues

* fix: operator assignment issue

* fix: all autofixable eslint issues

* fix: all react related fixable issues

* fix: autofixable eslint issues

* chore: remove all template literals

* fix: remaining autofixable issues

* chore: apply amnesty on all existing issues

* fix: failing xss-lint issues

* refactor: apply amnesty on remaining issues

* refactor: apply amnesty on new issues

* fix: remove file level suppressions

* refactor: apply amnesty on new issues
2023-08-07 19:13:19 +05:00
Kyle McCormick
3e67719a24 build: npm run build (experimental) (#32823)
This PR implements much of the static assets rework ADR [1], including:

* `npm run build[-dev]`, and its subcommands,
* `npm run webpack[-dev]` and
* `npm run compile-sass[-dev]`.

This is backwards-compatible. `paver update_assets` should not be affected.
The new command warns that it is "experimental" for a few reasons:

* `npm run build` will fail in the webpack phase unless you first
run  `xmodule_assets`. This will be changed soon [2].

* We have tested the new build, but not quite so thoroughly that we'd
recommend it as the production default yet. Once the xmodule_assets
work lands, we'll share this on the forums so early adopters can try it
out.

* The commands lack some top-level documentation. Once they stabilize more,
we'll add a section to the README that explains how and when to use `npm run
build` and its subcommands and its env vars.

* `npm run watch` is not yet implemented.

References:
1. https://github.com/openedx/edx-platform/blob/master/docs/decisions/0017-reimplement-asset-processing.rst
2. https://github.com/openedx/edx-platform/pull/32685

Part of: https://github.com/openedx/edx-platform/issues/31604
2023-07-26 08:04:45 -04:00
Nizar
1e872d4e10 Adds support for enabling custom tinymce plugins in Studio's HTML editor (#25695) 2021-01-11 11:28:20 -05:00
Sid Verma
09c24be35e Add UI for "library sourced block" letting users browse and select xblocks (#24816) 2020-10-14 13:29:52 -04:00
Adam Stankiewicz
6d942bc94d revert learner portal links blocking juniper release 2020-05-04 14:55:06 -04:00
Brittney Exline
6e2887f851 Add enterprise portal links to user dropdown menu and dashboard alerts. (#21833) 2019-10-09 16:01:41 -04:00
Dave St.Germain
b3a85aeb38 Webpack config will pull in available workers dynamically from edx-proctoring 2018-12-21 11:16:27 -05:00
Matt Hughes
72a2e191fd Set up new proctoring service JS
also move mockprock (dev only proctoring service)'s JS to
devDependencies
2018-12-21 11:14:37 -05:00
Matt Hughes
6264d75f49 Fix some eslint errors on touched files
Also package lock was tricky in how specifically it wanted to be
updated
2018-12-21 11:07:58 -05:00
Matt Hughes
658fd6c139 Consolidate worker-targetting webpack config in common
This changes the production config. Spooky scary!
2018-12-21 10:54:51 -05:00
Matt Hughes
edd15f1bdb WIP: currently dev-only approach to proctoring webworker JS API 2018-12-21 10:54:51 -05:00
Tyler Hallada
73cffad5ce Dev in sfe container & prod use /dist of sfe 2018-02-15 13:20:18 -05:00
Tyler Hallada
4f8febff6d Remove hash & path on dev webpack css module names
This will make bok-choy testing easier.
2017-12-14 16:15:42 -05:00
Calen Pennington
f4b62b066c Don't have webpack watch node_modules or .git for changes 2017-12-01 13:06:20 -05:00
Eric Fischer
83b3867794 Use style-loader 2017-11-01 10:39:44 -04:00
Eric Fischer
3fc342e6e8 Webpack config prod/dev split
EDUCATOR-1448

Modifies paver webpack task to use production configuration in all
non-devstack environments, and a development config in devstack.
2017-10-26 14:03:53 -04:00