fix non-react javascript for Vite #11355
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit contains all vite work as of today: - vite generally serving the entire app without error - all jests passing - reversion to using process.env instead of import.meta.env The unsquashed git history may be accessed via the vite3-june14-bak branch. Latest commit in this squash: ba9fd re-introduce vite shim, which was clobbered during a recent rebase Vite3 prod build (#10896) * update lockfiles temporarily deleting entrypoints for debugging Revert "temporarily deleting entrypoints for debugging" This reverts commit d26e9a17aa82b9fd83f557e063cd376716cc5b7c. removing comments include airbyte script from develop branch * our build doesn't support brackets in react components, so re-syntaxing the code * move from cjs to esm syntax in particular file to fix build * this config has a working build * remove console log * parameterize env vars --------- Co-authored-by: Peter Kong <[email protected]> remove webpack/ and webpacker.yml comment out initializers/react_on_rails.rb - removed webpacker gem \n - removed webpacker binstubs \n - removed webpack specific scripts in package.json import vairables in cms_table.scss Revert "import vairables in cms_table.scss" This reverts commit 80ea53b. remove cms.css from config.assets.precompile removing obsolete Procfiles and webpack configs Procfile config change; react_on_rails initializer config change remove print statements pin vcr gem; remove commented statements in erb file CMS_URL -> QUILL_CMS whitespace freshen package.json update package-locks update Gemfiles fix single spec regression remove referenced to deleted files edit-assigned-students, final_score_page fix SegmentAnalytics syntax issue, remove old css file reference, to get prod build working again update snapshots update snap revert bin/bundle changes lint relocking Gemfile after bundle lock --add-platform x86_64-linux silence system spec that depends on webpacker environment add modified bundler binstub so that local env starts Gemfile.lock updates bundle lock --add-platform x86_64-linux removing require statements from js files check in new package lockfiles
add evidence scss entrypoint removing linux platform from lockfile adding mini_racer gem delete unused webpacker-dependent specfile; linting add ulimit to avoid too many files error during local serving update moment import syntax to avoid 'moment is not a function' errors update setupTets, tsconfig so that momentjs plays nice with jest fix failing node specs, part 1 fix failing node specs, part 2 removing jest mock from setupTests more jest fixes concert C = require( statements to import statements convert more require statements to import Pin webmock (#11300) fix test (#11302) fix activity assignment flow null value bug fix mock- and snapshot- related jest failures fix eslint update snapshots, remove one-off issue in conceptResults.test.ts update jest snapshots fix more jests fix Pusher import statement
* remove home import from teacher bundle * add scoring updates card to scss index * import home file in the right place in application.scss * fix bug where activity counts aren't showing up * add back header margins to style guide * fix grade level filters file * add update-assigned-student scss to pages/index * move locker into staff bundle so it can get the right css * fix evidence css * add proofreader scss entrypoint * fix tests * one more test * remove require in favor of regular import * fix merge conflict
happythenewsad
approved these changes
Dec 15, 2023
happythenewsad
pushed a commit
that referenced
this pull request
Dec 18, 2023
This commit contains all vite work as of today: - vite generally serving the entire app without error - all jests passing - reversion to using process.env instead of import.meta.env The unsquashed git history may be accessed via the vite3-june14-bak branch. Latest commit in this squash: ba9fd re-introduce vite shim, which was clobbered during a recent rebase Vite3 prod build (#10896) * update lockfiles temporarily deleting entrypoints for debugging Revert "temporarily deleting entrypoints for debugging" This reverts commit d26e9a17aa82b9fd83f557e063cd376716cc5b7c. removing comments include airbyte script from develop branch * our build doesn't support brackets in react components, so re-syntaxing the code * move from cjs to esm syntax in particular file to fix build * this config has a working build * remove console log * parameterize env vars --------- Co-authored-by: Peter Kong <[email protected]> remove webpack/ and webpacker.yml comment out initializers/react_on_rails.rb - removed webpacker gem \n - removed webpacker binstubs \n - removed webpack specific scripts in package.json import vairables in cms_table.scss Revert "import vairables in cms_table.scss" This reverts commit 80ea53b. remove cms.css from config.assets.precompile removing obsolete Procfiles and webpack configs Procfile config change; react_on_rails initializer config change remove print statements pin vcr gem; remove commented statements in erb file CMS_URL -> QUILL_CMS whitespace freshen package.json update package-locks update Gemfiles fix single spec regression remove referenced to deleted files edit-assigned-students, final_score_page fix SegmentAnalytics syntax issue, remove old css file reference, to get prod build working again update snapshots update snap revert bin/bundle changes lint relocking Gemfile after bundle lock --add-platform x86_64-linux silence system spec that depends on webpacker environment add modified bundler binstub so that local env starts Gemfile.lock updates bundle lock --add-platform x86_64-linux removing require statements from js files check in new package lockfiles regressions add evidence scss entrypoint removing linux platform from lockfile adding mini_racer gem delete unused webpacker-dependent specfile; linting add ulimit to avoid too many files error during local serving update moment import syntax to avoid 'moment is not a function' errors update setupTets, tsconfig so that momentjs plays nice with jest fix failing node specs, part 1 fix failing node specs, part 2 removing jest mock from setupTests more jest fixes concert C = require( statements to import statements convert more require statements to import Pin webmock (#11300) fix test (#11302) fix activity assignment flow null value bug fix mock- and snapshot- related jest failures fix eslint update snapshots, remove one-off issue in conceptResults.test.ts update jest snapshots fix more jests fix Pusher import statement resolve merge conflicts fix view diagn report topic_filters bugfix debug const moment = require('moment'); -> import moment from 'moment'; introduce new stylehseets to premium_hub/index.scss add entrypoints.session.ts for signup flow import underscore lib in various places; add empty shared.ts endpoint add contacts.scss to scss index file import lodash wherever '_' is referenced specify correct entrypoint bundle for /premium vite frontend bug fixes (#11349) * remove home import from teacher bundle * add scoring updates card to scss index * import home file in the right place in application.scss * fix bug where activity counts aren't showing up * add back header margins to style guide * fix grade level filters file * add update-assigned-student scss to pages/index * move locker into staff bundle so it can get the right css * fix evidence css * add proofreader scss entrypoint * fix tests * one more test * remove require in favor of regular import * fix merge conflict change env var back (#11352) rebuilding package-lock.json after rebase fix non-react javascript for Vite (#11355) * freshening vite3 via merge --squash strategy This commit contains all vite work as of today: - vite generally serving the entire app without error - all jests passing - reversion to using process.env instead of import.meta.env The unsquashed git history may be accessed via the vite3-june14-bak branch. Latest commit in this squash: ba9fd re-introduce vite shim, which was clobbered during a recent rebase Vite3 prod build (#10896) * update lockfiles temporarily deleting entrypoints for debugging Revert "temporarily deleting entrypoints for debugging" This reverts commit d26e9a17aa82b9fd83f557e063cd376716cc5b7c. removing comments include airbyte script from develop branch * our build doesn't support brackets in react components, so re-syntaxing the code * move from cjs to esm syntax in particular file to fix build * this config has a working build * remove console log * parameterize env vars --------- Co-authored-by: Peter Kong <[email protected]> remove webpack/ and webpacker.yml comment out initializers/react_on_rails.rb - removed webpacker gem \n - removed webpacker binstubs \n - removed webpack specific scripts in package.json import vairables in cms_table.scss Revert "import vairables in cms_table.scss" This reverts commit 80ea53b. remove cms.css from config.assets.precompile removing obsolete Procfiles and webpack configs Procfile config change; react_on_rails initializer config change remove print statements pin vcr gem; remove commented statements in erb file CMS_URL -> QUILL_CMS whitespace freshen package.json update package-locks update Gemfiles fix single spec regression remove referenced to deleted files edit-assigned-students, final_score_page fix SegmentAnalytics syntax issue, remove old css file reference, to get prod build working again update snapshots update snap revert bin/bundle changes lint relocking Gemfile after bundle lock --add-platform x86_64-linux silence system spec that depends on webpacker environment add modified bundler binstub so that local env starts Gemfile.lock updates bundle lock --add-platform x86_64-linux removing require statements from js files check in new package lockfiles * regressions add evidence scss entrypoint removing linux platform from lockfile adding mini_racer gem delete unused webpacker-dependent specfile; linting add ulimit to avoid too many files error during local serving update moment import syntax to avoid 'moment is not a function' errors update setupTets, tsconfig so that momentjs plays nice with jest fix failing node specs, part 1 fix failing node specs, part 2 removing jest mock from setupTests more jest fixes concert C = require( statements to import statements convert more require statements to import Pin webmock (#11300) fix test (#11302) fix activity assignment flow null value bug fix mock- and snapshot- related jest failures fix eslint update snapshots, remove one-off issue in conceptResults.test.ts update jest snapshots fix more jests fix Pusher import statement * resolve merge conflicts * fix view diagn report * topic_filters bugfix * debug * const moment = require('moment'); -> import moment from 'moment'; * introduce new stylehseets to premium_hub/index.scss * add entrypoints.session.ts for signup flow * import underscore lib in various places; add empty shared.ts endpoint * add contacts.scss to scss index file * import lodash wherever '_' is referenced * specify correct entrypoint bundle for /premium * vite frontend bug fixes (#11349) * remove home import from teacher bundle * add scoring updates card to scss index * import home file in the right place in application.scss * fix bug where activity counts aren't showing up * add back header margins to style guide * fix grade level filters file * add update-assigned-student scss to pages/index * move locker into staff bundle so it can get the right css * fix evidence css * add proofreader scss entrypoint * fix tests * one more test * remove require in favor of regular import * fix merge conflict * wip * fix spinners * remove unnecessary javascript addition from application file * fix package locks * undo changes to database.yml and puma.rb file * remove whitespace * remove whitespace from database.yml * fix whitespace in puma.rb * one more time --------- Co-authored-by: Peter Kong <[email protected]> add media:all directive to stylesheet tag so print media works
happythenewsad
added a commit
that referenced
this pull request
Dec 18, 2023
* freshening vite3 via merge --squash strategy This commit contains all vite work as of today: - vite generally serving the entire app without error - all jests passing - reversion to using process.env instead of import.meta.env The unsquashed git history may be accessed via the vite3-june14-bak branch. Latest commit in this squash: ba9fd re-introduce vite shim, which was clobbered during a recent rebase Vite3 prod build (#10896) * update lockfiles temporarily deleting entrypoints for debugging Revert "temporarily deleting entrypoints for debugging" This reverts commit d26e9a17aa82b9fd83f557e063cd376716cc5b7c. removing comments include airbyte script from develop branch * our build doesn't support brackets in react components, so re-syntaxing the code * move from cjs to esm syntax in particular file to fix build * this config has a working build * remove console log * parameterize env vars --------- Co-authored-by: Peter Kong <[email protected]> remove webpack/ and webpacker.yml comment out initializers/react_on_rails.rb - removed webpacker gem \n - removed webpacker binstubs \n - removed webpack specific scripts in package.json import vairables in cms_table.scss Revert "import vairables in cms_table.scss" This reverts commit 80ea53b. remove cms.css from config.assets.precompile removing obsolete Procfiles and webpack configs Procfile config change; react_on_rails initializer config change remove print statements pin vcr gem; remove commented statements in erb file CMS_URL -> QUILL_CMS whitespace freshen package.json update package-locks update Gemfiles fix single spec regression remove referenced to deleted files edit-assigned-students, final_score_page fix SegmentAnalytics syntax issue, remove old css file reference, to get prod build working again update snapshots update snap revert bin/bundle changes lint relocking Gemfile after bundle lock --add-platform x86_64-linux silence system spec that depends on webpacker environment add modified bundler binstub so that local env starts Gemfile.lock updates bundle lock --add-platform x86_64-linux removing require statements from js files check in new package lockfiles regressions add evidence scss entrypoint removing linux platform from lockfile adding mini_racer gem delete unused webpacker-dependent specfile; linting add ulimit to avoid too many files error during local serving update moment import syntax to avoid 'moment is not a function' errors update setupTets, tsconfig so that momentjs plays nice with jest fix failing node specs, part 1 fix failing node specs, part 2 removing jest mock from setupTests more jest fixes concert C = require( statements to import statements convert more require statements to import Pin webmock (#11300) fix test (#11302) fix activity assignment flow null value bug fix mock- and snapshot- related jest failures fix eslint update snapshots, remove one-off issue in conceptResults.test.ts update jest snapshots fix more jests fix Pusher import statement resolve merge conflicts fix view diagn report topic_filters bugfix debug const moment = require('moment'); -> import moment from 'moment'; introduce new stylehseets to premium_hub/index.scss add entrypoints.session.ts for signup flow import underscore lib in various places; add empty shared.ts endpoint add contacts.scss to scss index file import lodash wherever '_' is referenced specify correct entrypoint bundle for /premium vite frontend bug fixes (#11349) * remove home import from teacher bundle * add scoring updates card to scss index * import home file in the right place in application.scss * fix bug where activity counts aren't showing up * add back header margins to style guide * fix grade level filters file * add update-assigned-student scss to pages/index * move locker into staff bundle so it can get the right css * fix evidence css * add proofreader scss entrypoint * fix tests * one more test * remove require in favor of regular import * fix merge conflict change env var back (#11352) rebuilding package-lock.json after rebase fix non-react javascript for Vite (#11355) * freshening vite3 via merge --squash strategy This commit contains all vite work as of today: - vite generally serving the entire app without error - all jests passing - reversion to using process.env instead of import.meta.env The unsquashed git history may be accessed via the vite3-june14-bak branch. Latest commit in this squash: ba9fd re-introduce vite shim, which was clobbered during a recent rebase Vite3 prod build (#10896) * update lockfiles temporarily deleting entrypoints for debugging Revert "temporarily deleting entrypoints for debugging" This reverts commit d26e9a17aa82b9fd83f557e063cd376716cc5b7c. removing comments include airbyte script from develop branch * our build doesn't support brackets in react components, so re-syntaxing the code * move from cjs to esm syntax in particular file to fix build * this config has a working build * remove console log * parameterize env vars --------- Co-authored-by: Peter Kong <[email protected]> remove webpack/ and webpacker.yml comment out initializers/react_on_rails.rb - removed webpacker gem \n - removed webpacker binstubs \n - removed webpack specific scripts in package.json import vairables in cms_table.scss Revert "import vairables in cms_table.scss" This reverts commit 80ea53b. remove cms.css from config.assets.precompile removing obsolete Procfiles and webpack configs Procfile config change; react_on_rails initializer config change remove print statements pin vcr gem; remove commented statements in erb file CMS_URL -> QUILL_CMS whitespace freshen package.json update package-locks update Gemfiles fix single spec regression remove referenced to deleted files edit-assigned-students, final_score_page fix SegmentAnalytics syntax issue, remove old css file reference, to get prod build working again update snapshots update snap revert bin/bundle changes lint relocking Gemfile after bundle lock --add-platform x86_64-linux silence system spec that depends on webpacker environment add modified bundler binstub so that local env starts Gemfile.lock updates bundle lock --add-platform x86_64-linux removing require statements from js files check in new package lockfiles * regressions add evidence scss entrypoint removing linux platform from lockfile adding mini_racer gem delete unused webpacker-dependent specfile; linting add ulimit to avoid too many files error during local serving update moment import syntax to avoid 'moment is not a function' errors update setupTets, tsconfig so that momentjs plays nice with jest fix failing node specs, part 1 fix failing node specs, part 2 removing jest mock from setupTests more jest fixes concert C = require( statements to import statements convert more require statements to import Pin webmock (#11300) fix test (#11302) fix activity assignment flow null value bug fix mock- and snapshot- related jest failures fix eslint update snapshots, remove one-off issue in conceptResults.test.ts update jest snapshots fix more jests fix Pusher import statement * resolve merge conflicts * fix view diagn report * topic_filters bugfix * debug * const moment = require('moment'); -> import moment from 'moment'; * introduce new stylehseets to premium_hub/index.scss * add entrypoints.session.ts for signup flow * import underscore lib in various places; add empty shared.ts endpoint * add contacts.scss to scss index file * import lodash wherever '_' is referenced * specify correct entrypoint bundle for /premium * vite frontend bug fixes (#11349) * remove home import from teacher bundle * add scoring updates card to scss index * import home file in the right place in application.scss * fix bug where activity counts aren't showing up * add back header margins to style guide * fix grade level filters file * add update-assigned-student scss to pages/index * move locker into staff bundle so it can get the right css * fix evidence css * add proofreader scss entrypoint * fix tests * one more test * remove require in favor of regular import * fix merge conflict * wip * fix spinners * remove unnecessary javascript addition from application file * fix package locks * undo changes to database.yml and puma.rb file * remove whitespace * remove whitespace from database.yml * fix whitespace in puma.rb * one more time --------- Co-authored-by: Peter Kong <[email protected]> add media:all directive to stylesheet tag so print media works * resolving merge conflicts in lock files * update jest snapshot * Add correct lessons websockets url; remove comments --------- Co-authored-by: Peter Kong <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
WHAT
Fix: lazyloads on Evidence tool page, dropdown on Standards page; loading spinner sitewide.
WHY
We want all of these things to work.
HOW
Include the requisite Javascript where necessary and add non-webkit CSS rules for the loading spinner. That last bit makes me wonder if Vite isn't supporting our
-webkitCSS rules at all, but I think for the most part we also write the standard version and most of those are deprecated on newer browsers anyway.Screenshots
(If applicable. Also, please censor any sensitive data)
Notion Card Links
(Please provide links to any relevant Notion card(s) relevant to this PR.)