Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge package jsons #11419

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
+15,720 −20,292
Draft

Merge package jsons #11419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fc6446
wip
Jan 16, 2024
145a15e
use bable.config.js instead of babelrc; most jests passing
Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions services/QuillLMS/.babelrc
View file
Open in desktop

This file was deleted.

20 changes: 20 additions & 0 deletions services/QuillLMS/.babelrc.bak
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"presets": [

["@babel/preset-env",
{
"targets": {
"esmodules": true,
}
}
],
["@babel/preset-react"]
],
"plugins": [
["module-resolver", {
"root": ["./client/app"],
}],
"@babel/plugin-proposal-class-properties"
]

}
6 changes: 6 additions & 0 deletions services/QuillLMS/babel.config.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

babel.config.cjs is not preferred over .babelrc

Source: jestjs/jest@1818d84#diff-04c6e90faac2675aa89e2176d2eec7d8

presets: [
'@babel/preset-env',
['@babel/preset-react', {runtime: 'automatic'}],
],
};
17,742 changes: 1 addition & 17,741 deletions services/QuillLMS/client/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

222 changes: 3 additions & 219 deletions services/QuillLMS/client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,228 +13,12 @@
},
"type": "module",
"main": "js/app.js",
"dependencies": {
"@babel/core": "^7.4.5",
"@babel/plugin-proposal-class-properties": "^7.4.4",
"@babel/preset-env": "^7.22.10",
"@babel/preset-react": "^7.0.0",
"@draft-js-plugins/editor": "^4.1.0",
"@redux-devtools/core": "^3.11.0",
"@redux-devtools/log-monitor": "^3.1.0",
"@sentry/browser": "^5.20.0",
"@types/react": "^16.0.40",
"@types/react-dom": "^16.9.4",
"@types/react-redux": "^7.1.5",
"@types/react-router": "^5.1.3",
"@types/react-router-config": "^5.0.1",
"@types/react-router-dom": "^5.1.3",
"apollo-cache-inmemory": "^1.6.6",
"apollo-client": "^2.6.10",
"apollo-link": "^1.2.14",
"apollo-link-http": "^1.5.17",
"array-move": "^2.2.1",
"autoprefixer": "^10.2.4",
"babel-loader": "^8.1.0",
"babel-plugin-module-resolver": "^5.0.0",
"babel-polyfill": "^6.7.4",
"bootstrap-loader": "^4.0.4",
"bootstrap-sass": "^3.4.1",
"bulma": "^0.9.4",
"create-react-class": "^15.7.0",
"css-loader": "^3.2.0",
"decorate-component-with-props": "^1.2.1",
"diff": "^5.0.0",
"draft-convert": "^2.1.13",
"draft-js": "^0.11.7",
"draft-js-export-html": "^0.6.0",
"emoji-picker-react": "^3.5.1",
"es5-shim": "^4.5.7",
"expose-loader": "^1.0.0",
"fetch-defaults": "^1.0.0",
"file-loader": "^6.1.0",
"font-awesome": "^4.7.0",
"fuse.js": "^3.2.1",
"fuzzyset.js": "1.0.7",
"graphql": "^15.5.3",
"graphql-tag": "^2.9.2",
"history": "^2.0.1",
"html-entities": "^2.3.3",
"i18next": "^20.4.0",
"immutable": "^3.8.2",
"isomorphic-fetch": "^3.0.0",
"jquery": "^3.5.1",
"jwt-decode": "^2.2.0",
"lazysizes": "^5.2.2",
"levenshtein": "^1.0.5",
"localforage": "^1.8.1",
"lodash": "^4.17.21",
"marked": "^4.1.0",
"match-sorter": "^6.3.0",
"md5": "^2.3.0",
"mini-css-extract-plugin": "^2.3.0",
"mockdate": "^2.0.1",
"moment": "^2.29.4",
"pluralize": "^3.0.0",
"pos": "^0.4.2",
"postcss": "^8.2.6",
"postcss-cssnext": "^3.1.1",
"postcss-loader": "^4.3.0",
"postcss-scss": "^3.0.4",
"postcss-smart-import": "^0.7.6",
"promise-polyfill": "^6.1.0",
"pusher-js": "^5.0.1",
"qs": "^6.11.1",
"query-string": "^6.13.6",
"quill-marking-logic": "^0.15.11",
"quill-string-normalizer": "0.0.9",
"raven-js": "^3.17.0",
"react": "^18.2.0",
"react-addons-css-transition-group": "^15.6.2",
"react-apollo": "^3.1.5",
"react-confetti": "^6.1.0",
"react-contenteditable": "^3.3.4",
"react-copy-to-clipboard": "^5.1.0",
"react-css-transition-replace": "^4.0.5",
"react-csv": "^1.0.8",
"react-dates": "^21.8.0",
"react-datetime": "^3.2.0",
"react-dom": "^18.2.0",
"react-dropzone": "^4.2.8",
"react-html-parser": "^2.0.2",
"react-i18next": "^11.11.4",
"react-joyride": "^2.5.0",
"react-markdown": "^2.5.1",
"react-on-rails": "13.3.3",
"react-query": "^3.39.3",
"react-range": "^1.8.14",
"react-redux": "^8.0.5",
"react-router": "^5.1.2",
"react-router-config": "^5.1.1",
"react-router-dom": "^5.1.2",
"react-router-dom-v5-compat": "^6.10.0",
"react-router-redux": "^4.0.8",
"react-select": "^5.7.2",
"react-select-search": "^4.1.6",
"react-simple-pie-chart": "^0.5.0",
"react-sortable-hoc": "^2.0.0",
"react-table": "^7.8.0",
"react-textarea-autosize": "^8.4.1",
"redux": "^3.3.1",
"redux-devtools-extension": "^2.13.8",
"redux-persist": "^4.10.2",
"redux-thunk": "^2.0.1",
"sass": "^1.56.1",
"sass-loader": "^10.0.2",
"sass-resources-loader": "^2.0.1",
"sbd": "^1.0.19",
"smooth-scroll-into-view-if-needed": "^1.1.32",
"socket.io-client": "^2.4.0",
"string-hash": "^1.1.3",
"string-strip-html": "^8.4.0",
"style-loader": "^1.2.1",
"text-clipper": "^2.2.0",
"thenby": "^1.3.4",
"ts-loader": "^9.2.5",
"ts-node": "^10.2.1",
"typescript": "^4.4.3",
"underscore": "^1.13.1",
"underscore.string": "^3.3.5",
"url": "^0.11.3",
"url-loader": "^4.1.0",
"uuid": "^9.0.0",
"warning": "^3.0.0",
"xlsx": "https://cdn.sheetjs.com/xlsx-0.20.0/xlsx-0.20.0.tgz"
},
"devDependencies": {
"@testing-library/dom": "^9.3.1",
"@testing-library/jest-dom": "^6.1.3",
"@testing-library/react": "^14.0.0",
"@testing-library/react-hooks": "^3.4.2",
"@testing-library/user-event": "^14.4.3",
"@types/jest": "^22.2.0",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.6",
"babel-jest": "^27.0.6",
"enzyme": "^3.11.0",
"enzyme-to-json": "^3.4.4",
"expect": "^1.20.2",
"jest": "^27.5.1",
"jest-localstorage-mock": "^2.4.3",
"react-test-renderer": "^18.2.0",
"redux-mock-store": "^1.5.4",
"redux-test-utils": "^1.0.2",
"resolve-url-loader": "^5.0.0",
"ts-jest": "^27.0.5",
"whatwg-fetch": "^2.0.4"
},
"dependencies": {},
"devDependencies": {},
"browser": {
"fs": false
},
"scripts": {
"lint": "npm run eslint --silent",
"eslint": "eslint --ext .js,.jsx .",
"jscs": "jscs --verbose .",
"jscs:fix": "jscs --verbose -x . --silent",
"test": "npm run build:test && rspec",
"jest": "node --expose-gc ./node_modules/.bin/jest --maxWorkers=1 --logHeapUsage",
"jest:watch": "jest --watch",
"jest:coverage": "jest --coverage",
"jest:silent": "jest --silent"
},
"jest": {
"roots": [
"app"
],
"snapshotSerializers": [
"<rootDir>/node_modules/enzyme-to-json/serializer"
],
"transform": {
"^.+\\.jsx?$": "<rootDir>/node_modules/babel-jest",
"^.+\\.tsx?$": "ts-jest"
},
"moduleFileExtensions": [
"ts",
"tsx",
"js",
"jsx",
"json",
"node"
],
"moduleDirectories": [
"node_modules",
"./app"
],
"globals": {
"window": {},
"import.meta.env.VITE_PROCESS_ENV_CDN_URL": "http://cdn.quill.org",
"ts-jest": {
"diagnostics": false
}
},
"testEnvironment": "jsdom",
"coverageDirectory": "<rootDir>/coverage/",
"collectCoverage": false,
"moduleNameMapper": {
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/fileMock.js",
"\\.(css|less|scss)$": "<rootDir>/__mocks__/styleMock.js"
},
"collectCoverageFrom": [
"app/**/*.{js,jsx}"
],
"coveragePathIgnorePatterns": [
"/node_modules/",
"/test_data/"
],
"testPathIgnorePatterns": [
"test_data.js",
"data.ts"
],
"setupFiles": [
"<rootDir>/setupTests.ts",
"<rootDir>/setEnvVars.js",
"jest-localstorage-mock"
],
"setupFilesAfterEnv": [
"<rootDir>/setupTestFilesAfterEnv.ts"
]

}
}
7 changes: 5 additions & 2 deletions services/QuillLMS/client/setupTests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
import { configure } from 'enzyme';
import 'whatwg-fetch';

import processEnvMock from './__mocks__/processEnvMock';

configure({ adapter: new Adapter() });

Expand Down Expand Up @@ -30,6 +29,10 @@ global.IntersectionObserver = class IntersectionObserver {
}
};

window.process.env = processEnvMock.env
window.process.env = {
env: {
PUSHER_KEY: 'pusher'
}
}

window.scrollTo = jest.fn();
0 services/QuillLMS/client/tsconfig.json → services/QuillLMS/client/tsconfig.json.bak
View file
Open in desktop
File renamed without changes.
Loading
Loading