From 3b5eb8a8dd64d318f5f0dbed24968e077b41aee2 Mon Sep 17 00:00:00 2001 From: tjcouch-sil Date: Mon, 8 Apr 2024 16:01:41 -0500 Subject: [PATCH 1/5] Squashed 'extensions/' changes from 8078ba299..19c296602 19c296602 Fixed dts self-import, used npm workspaces to clear up package issues (#15) d1718c231 Updated package-lock.json 733ea7f55 Fixed dts self-import, used npm workspaces to clear up package issues git-subtree-dir: extensions git-subtree-split: 19c2966024b41a65bee8808e4a9c01b28cdadf26 --- .eslintrc.cjs | 7 ++++ package-lock.json | 95 ++++++++++++++++++++++++----------------------- package.json | 1 + 3 files changed, 57 insertions(+), 46 deletions(-) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index c5020fe5e7..ac3f8cb63b 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -132,6 +132,13 @@ module.exports = { 'no-console': 'off', }, }, + { + files: ['*.d.ts'], + rules: { + // Allow .d.ts files to self import so they can refer to their types in `papi-shared-types` + 'import/no-self-import': 'off', + }, + }, ], parserOptions: { ecmaVersion: 2022, diff --git a/package-lock.json b/package-lock.json index 0248e532ef..fc94bc01c6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,9 @@ "version": "0.0.1", "hasInstallScript": true, "license": "MIT", + "workspaces": [ + "src/*" + ], "dependencies": { "@sillsdev/scripture": "^1.4.3", "platform-bible-utils": "file:../paranext-core/lib/platform-bible-utils" @@ -84,41 +87,41 @@ "dev": true, "license": "MIT", "dependencies": { - "@emotion/react": ">=11.11.3", + "@emotion/react": ">=11.11.4", "@emotion/styled": ">=11.11.0", - "@mui/material": ">=5.15.6", + "@mui/material": ">=5.15.10", "platform-bible-utils": "file:../platform-bible-utils", "react-data-grid": ">=7.0.0-beta.34" }, "devDependencies": { - "@babel/preset-env": "^7.23.9", - "@babel/preset-react": "^7.23.3", - "@babel/preset-typescript": "^7.23.3", - "@mui/icons-material": "^5.15.6", + "@babel/preset-env": "^7.24.3", + "@babel/preset-react": "^7.24.1", + "@babel/preset-typescript": "^7.24.1", + "@mui/icons-material": "^5.15.10", "@senojs/rollup-plugin-style-inject": "^0.2.3", "@testing-library/jest-dom": "^6.4.2", - "@testing-library/react": "^14.2.1", + "@testing-library/react": "^14.2.2", "@testing-library/user-event": "^14.5.2", "@types/jest": "^29.5.12", - "@types/react": "^18.2.48", - "@types/react-dom": "^18.2.18", - "@typescript-eslint/eslint-plugin": "^6.19.1", - "@typescript-eslint/parser": "^6.19.1", + "@types/react": "^18.2.72", + "@types/react-dom": "^18.2.22", + "@typescript-eslint/eslint-plugin": "^6.21.0", + "@typescript-eslint/parser": "^6.21.0", "@vitejs/plugin-react": "^4.2.1", - "dts-bundle-generator": "^9.2.4", - "eslint": "^8.56.0", + "dts-bundle-generator": "^9.3.1", + "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.1.3", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", - "prettier": "^3.2.4", + "prettier": "^3.2.5", "prettier-plugin-jsdoc": "^1.3.0", - "stylelint": "^16.2.0", + "stylelint": "^16.3.1", "stylelint-config-recommended": "^14.0.0", "stylelint-config-sass-guidelines": "^11.0.0", "tslib": "^2.6.2", "typescript": "^5.3.3", - "vite": "^4.5.2" + "vite": "^4.5.3" }, "peerDependencies": { "react": ">=18.2.0", @@ -132,20 +135,20 @@ "async-mutex": "^0.4.1" }, "devDependencies": { - "@types/jest": "^29.5.11", - "@typescript-eslint/eslint-plugin": "^6.19.1", - "@typescript-eslint/parser": "^6.19.1", - "dts-bundle-generator": "^9.2.4", - "eslint": "^8.56.0", + "@types/jest": "^29.5.12", + "@typescript-eslint/eslint-plugin": "^6.21.0", + "@typescript-eslint/parser": "^6.21.0", + "dts-bundle-generator": "^9.3.1", + "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.1.3", "jest": "^29.7.0", - "prettier": "^3.2.4", + "prettier": "^3.2.5", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", "tslib": "^2.6.2", "typescript": "^5.3.3", - "vite": "^4.5.2" + "vite": "^4.5.3" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -18804,59 +18807,59 @@ "platform-bible-react": { "version": "file:../paranext-core/lib/platform-bible-react", "requires": { - "@babel/preset-env": "^7.23.9", - "@babel/preset-react": "^7.23.3", - "@babel/preset-typescript": "^7.23.3", - "@emotion/react": ">=11.11.3", + "@babel/preset-env": "^7.24.3", + "@babel/preset-react": "^7.24.1", + "@babel/preset-typescript": "^7.24.1", + "@emotion/react": ">=11.11.4", "@emotion/styled": ">=11.11.0", - "@mui/icons-material": "^5.15.6", - "@mui/material": ">=5.15.6", + "@mui/icons-material": "^5.15.10", + "@mui/material": ">=5.15.10", "@senojs/rollup-plugin-style-inject": "^0.2.3", "@testing-library/jest-dom": "^6.4.2", - "@testing-library/react": "^14.2.1", + "@testing-library/react": "^14.2.2", "@testing-library/user-event": "^14.5.2", "@types/jest": "^29.5.12", - "@types/react": "^18.2.48", - "@types/react-dom": "^18.2.18", - "@typescript-eslint/eslint-plugin": "^6.19.1", - "@typescript-eslint/parser": "^6.19.1", + "@types/react": "^18.2.72", + "@types/react-dom": "^18.2.22", + "@typescript-eslint/eslint-plugin": "^6.21.0", + "@typescript-eslint/parser": "^6.21.0", "@vitejs/plugin-react": "^4.2.1", - "dts-bundle-generator": "^9.2.4", - "eslint": "^8.56.0", + "dts-bundle-generator": "^9.3.1", + "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.1.3", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "platform-bible-utils": "file:../platform-bible-utils", - "prettier": "^3.2.4", + "prettier": "^3.2.5", "prettier-plugin-jsdoc": "^1.3.0", "react-data-grid": ">=7.0.0-beta.34", - "stylelint": "^16.2.0", + "stylelint": "^16.3.1", "stylelint-config-recommended": "^14.0.0", "stylelint-config-sass-guidelines": "^11.0.0", "tslib": "^2.6.2", "typescript": "^5.3.3", - "vite": "^4.5.2" + "vite": "^4.5.3" } }, "platform-bible-utils": { "version": "file:../paranext-core/lib/platform-bible-utils", "requires": { - "@types/jest": "^29.5.11", - "@typescript-eslint/eslint-plugin": "^6.19.1", - "@typescript-eslint/parser": "^6.19.1", + "@types/jest": "^29.5.12", + "@typescript-eslint/eslint-plugin": "^6.21.0", + "@typescript-eslint/parser": "^6.21.0", "async-mutex": "^0.4.1", - "dts-bundle-generator": "^9.2.4", - "eslint": "^8.56.0", + "dts-bundle-generator": "^9.3.1", + "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.1.3", "jest": "^29.7.0", - "prettier": "^3.2.4", + "prettier": "^3.2.5", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", "tslib": "^2.6.2", "typescript": "^5.3.3", - "vite": "^4.5.2" + "vite": "^4.5.3" } }, "possible-typed-array-names": { diff --git a/package.json b/package.json index 895ca19943..c45f1fe788 100644 --- a/package.json +++ b/package.json @@ -83,6 +83,7 @@ "webpack-merge": "^5.10.0", "zip-folder-promise": "^1.2.0" }, + "workspaces": ["src/*"], "volta": { "node": "20.11.1" } From 96188d4ce822954b5674941029853941d74e2c9a Mon Sep 17 00:00:00 2001 From: tjcouch-sil Date: Mon, 8 Apr 2024 17:04:35 -0500 Subject: [PATCH 2/5] Squashed 'extensions/src/hello-someone/' changes from 7134434a5..973c0c513 973c0c513 Fixed dts self-import (#66) 830945c66 Fixed dts self-import git-subtree-dir: extensions/src/hello-someone git-subtree-split: 973c0c513ea3c3d0d22e0420dcc695092eb35776 --- .eslintrc.js | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 7ad191c13e..279bb37dcd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -132,6 +132,13 @@ module.exports = { 'no-console': 'off', }, }, + { + files: ['*.d.ts'], + rules: { + // Allow .d.ts files to self import so they can refer to their types in `papi-shared-types` + 'import/no-self-import': 'off', + }, + }, ], parserOptions: { ecmaVersion: 2022, diff --git a/package.json b/package.json index 6eba34958a..ec30342395 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "lint:scripts": "eslint --ext .cjs,.js,.jsx,.ts,.tsx --cache .", "lint:styles": "stylelint **/*.{css,scss}", "lint-fix": "npm run lint-fix:scripts && npm run lint:styles -- --fix", - "lint-fix:scripts": "prettier --write \"**/*.{ts,tsx,js,jsx}\" && npm run lint:scripts" + "lint-fix:scripts": "prettier --write \"**/*.{ts,tsx,js,jsx,cjs}\" && npm run lint:scripts" }, "browserslist": [], "peerDependencies": { From 1addbfcb602f5320cc3257b2eee0acbac6769380 Mon Sep 17 00:00:00 2001 From: tjcouch-sil Date: Mon, 8 Apr 2024 17:04:36 -0500 Subject: [PATCH 3/5] Squashed 'extensions/src/hello-world/' changes from 7134434a5..973c0c513 973c0c513 Fixed dts self-import (#66) 830945c66 Fixed dts self-import git-subtree-dir: extensions/src/hello-world git-subtree-split: 973c0c513ea3c3d0d22e0420dcc695092eb35776 --- .eslintrc.js | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 7ad191c13e..279bb37dcd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -132,6 +132,13 @@ module.exports = { 'no-console': 'off', }, }, + { + files: ['*.d.ts'], + rules: { + // Allow .d.ts files to self import so they can refer to their types in `papi-shared-types` + 'import/no-self-import': 'off', + }, + }, ], parserOptions: { ecmaVersion: 2022, diff --git a/package.json b/package.json index 6eba34958a..ec30342395 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "lint:scripts": "eslint --ext .cjs,.js,.jsx,.ts,.tsx --cache .", "lint:styles": "stylelint **/*.{css,scss}", "lint-fix": "npm run lint-fix:scripts && npm run lint:styles -- --fix", - "lint-fix:scripts": "prettier --write \"**/*.{ts,tsx,js,jsx}\" && npm run lint:scripts" + "lint-fix:scripts": "prettier --write \"**/*.{ts,tsx,js,jsx,cjs}\" && npm run lint:scripts" }, "browserslist": [], "peerDependencies": { From 87a57c1e137bcfa92835810fcf22f39a0bf33a69 Mon Sep 17 00:00:00 2001 From: tjcouch-sil Date: Mon, 8 Apr 2024 17:04:39 -0500 Subject: [PATCH 4/5] Squashed 'extensions/src/quick-verse/' changes from 7134434a5..973c0c513 973c0c513 Fixed dts self-import (#66) 830945c66 Fixed dts self-import git-subtree-dir: extensions/src/quick-verse git-subtree-split: 973c0c513ea3c3d0d22e0420dcc695092eb35776 --- .eslintrc.js | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 7ad191c13e..279bb37dcd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -132,6 +132,13 @@ module.exports = { 'no-console': 'off', }, }, + { + files: ['*.d.ts'], + rules: { + // Allow .d.ts files to self import so they can refer to their types in `papi-shared-types` + 'import/no-self-import': 'off', + }, + }, ], parserOptions: { ecmaVersion: 2022, diff --git a/package.json b/package.json index 6eba34958a..ec30342395 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "lint:scripts": "eslint --ext .cjs,.js,.jsx,.ts,.tsx --cache .", "lint:styles": "stylelint **/*.{css,scss}", "lint-fix": "npm run lint-fix:scripts && npm run lint:styles -- --fix", - "lint-fix:scripts": "prettier --write \"**/*.{ts,tsx,js,jsx}\" && npm run lint:scripts" + "lint-fix:scripts": "prettier --write \"**/*.{ts,tsx,js,jsx,cjs}\" && npm run lint:scripts" }, "browserslist": [], "peerDependencies": { From 8f905f161eac1d8a86fcc77bb65e6ad198ce262c Mon Sep 17 00:00:00 2001 From: tjcouch-sil Date: Mon, 8 Apr 2024 17:04:41 -0500 Subject: [PATCH 5/5] Squashed 'extensions/src/resource-viewer/' changes from 7134434a5..973c0c513 973c0c513 Fixed dts self-import (#66) 830945c66 Fixed dts self-import git-subtree-dir: extensions/src/resource-viewer git-subtree-split: 973c0c513ea3c3d0d22e0420dcc695092eb35776 --- .eslintrc.js | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 7ad191c13e..279bb37dcd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -132,6 +132,13 @@ module.exports = { 'no-console': 'off', }, }, + { + files: ['*.d.ts'], + rules: { + // Allow .d.ts files to self import so they can refer to their types in `papi-shared-types` + 'import/no-self-import': 'off', + }, + }, ], parserOptions: { ecmaVersion: 2022, diff --git a/package.json b/package.json index 6eba34958a..ec30342395 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "lint:scripts": "eslint --ext .cjs,.js,.jsx,.ts,.tsx --cache .", "lint:styles": "stylelint **/*.{css,scss}", "lint-fix": "npm run lint-fix:scripts && npm run lint:styles -- --fix", - "lint-fix:scripts": "prettier --write \"**/*.{ts,tsx,js,jsx}\" && npm run lint:scripts" + "lint-fix:scripts": "prettier --write \"**/*.{ts,tsx,js,jsx,cjs}\" && npm run lint:scripts" }, "browserslist": [], "peerDependencies": {