Skip to content

Commit

Permalink
chore(deps): update dependency glob to v11 (#427)
Browse files Browse the repository at this point in the history
* chore(deps): update dependency glob to v11

* update workflow to use node 20

* update workflows

* upgrade dependencies

* update workflow

* remove verbose

* update utils.ts

* update wrap-ansi

* update dependencies again

* update deps again :(

* attempt to remove resolution, check if it works on ci

* remove additional steps from is-compatible.yml

* remove character spacing

* update webpack utils for glob

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: abdullah-cognite <[email protected]>
  • Loading branch information
renovate[bot] and abdullah-cognite authored Nov 26, 2024
1 parent 92235d5 commit 13d48e0
Show file tree
Hide file tree
Showing 7 changed files with 125 additions and 61 deletions.
8 changes: 3 additions & 5 deletions .config/webpack/utils.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import fs from 'fs';
import path from 'path';
import util from 'util';
import glob from 'glob';
import { glob } from 'glob';
import { SOURCE_DIR } from './constants';

const globAsync = util.promisify(glob);

export function getPackageJson() {
return require(path.resolve(process.cwd(), 'package.json'));
}
Expand All @@ -21,11 +19,11 @@ export function hasReadme() {
// Support bundling nested plugins by finding all plugin.json files in src directory
// then checking for a sibling module.[jt]sx? file.
export async function getEntries(): Promise<Record<string, string>> {
const pluginsJson = await globAsync('**/src/**/plugin.json', { absolute: true });
const pluginsJson = await glob('**/src/**/plugin.json', { absolute: true });

const plugins = await Promise.all(pluginsJson.map((pluginJson) => {
const folder = path.dirname(pluginJson);
return globAsync(`${folder}/module.{ts,tsx,js,jsx}`, { absolute: true });
return glob(`${folder}/module.{ts,tsx,js,jsx}`, { absolute: true });
})
);

Expand Down
2 changes: 1 addition & 1 deletion .config/webpack/webpack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const config = async (env): Promise<Configuration> => ({
loader: 'swc-loader',
options: {
jsc: {
baseUrl: './src',
baseUrl: path.resolve(process.cwd(), 'src'),
target: 'es2015',
loose: false,
parser: {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/buind_n_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Setup Node.js environment
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '20'
cache: 'yarn'
- name: Install dependencies
run: yarn install --immutable --prefer-offline
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/is-compatible.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '20'
cache: 'yarn'
- name: Install dependencies
run: yarn install --immutable --prefer-offline
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Node.js environment
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '20'
cache: 'yarn'

- name: Setup Go environment
Expand Down
31 changes: 18 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@
"@grafana/e2e-selectors": "11.3.0",
"@grafana/eslint-config": "^6.0.0",
"@grafana/tsconfig": "^2.0.0",
"@swc/core": "^1.2.144",
"@swc/core": "^1.3.90",
"@swc/helpers": "^0.5.0",
"@swc/jest": "^0.2.23",
"@swc/jest": "^0.2.26",
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^16.0.0",
"@types/glob": "^8.0.0",
"@types/jest": "^29.2.2",
"@types/jest": "^29.5.0",
"@types/lodash": "^4.14.188",
"@types/ms": "^0.7.31",
"@types/node": "^20.0.0",
"@types/node": "^20.8.7",
"@types/react": "^18.0.0",
"@typescript-eslint/eslint-plugin": "^4.4.0",
"@typescript-eslint/parser": "^4.4.0",
Expand All @@ -57,24 +57,26 @@
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-webpack-plugin": "^4.0.0",
"fork-ts-checker-webpack-plugin": "^9.0.0",
"glob": "^8.0.3",
"glob": "^10.2.7",
"identity-obj-proxy": "3.0.0",
"jest": "^29.3.1",
"jest-environment-jsdom": "^29.3.1",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"lint-staged": "^15.0.0",
"prettier": "^3.0.0",
"replace-in-file-webpack-plugin": "^1.0.6",
"sass": "1.80.6",
"sass-loader": "14.2.1",
"style-loader": "3.3.4",
"swc-loader": "^0.2.3",
"ts-jest": "^29.0.5",
"ts-node": "^10.5.0",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.1.0",
"typescript": "~5.6.0",
"webpack": "^5.69.1",
"webpack-cli": "^5.0.2",
"webpack-livereload-plugin": "^3.0.2"
"webpack": "^5.96.1",
"webpack-cli": "^5.1.4",
"webpack-livereload-plugin": "^3.0.2",
"wrap-ansi": "^9.0.0",
"wrap-ansi-cjs": "^8.0.0"
},
"husky": {
"hooks": {
Expand All @@ -97,6 +99,9 @@
"*/**/grammar.ts"
]
},
"engines": {
"node": ">=20"
},
"dependencies": {
"@emotion/css": "^11.1.3",
"@grafana/data": "^11.3.0",
Expand All @@ -116,4 +121,4 @@
"react": "18.3.1",
"react-dom": "18.3.1"
}
}
}
Loading

0 comments on commit 13d48e0

Please sign in to comment.