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.

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

fix: update dependencies to avoid conflict in WP 6.6 #3181

Merged
merged 47 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
755154b
chore: refactor for updating dependencies in newspack-scripts
dkoo Jun 13, 2024
e38e5ea
chore: JS formatting fixes for eslint errors
dkoo Jun 13, 2024
9185e74
chore: update NPM scripts and other dependencies
dkoo Jun 13, 2024
f6b1ed5
chore: fix jest unit tests
dkoo Jun 13, 2024
a4a4355
chore: update dependencies in newspack-components
dkoo Jun 13, 2024
2253022
fix: peer dependency conflicts with @wordp
dkoo Jun 14, 2024
34016d5
chore: update newspack-components dependencies
dkoo Jun 14, 2024
2ce1471
chore: proxy stylelint from newspack-scripts
dkoo Jun 14, 2024
db30339
chore: remove unnecessary stylelint
dkoo Jun 14, 2024
c095f51
refactor: use proxy script for eslint and stylelint scripts
dkoo Jun 17, 2024
657f385
chore: remove console.log
dkoo Jun 17, 2024
1f638f9
chore: update newspack-scripts to NPM alpha version
dkoo Jun 17, 2024
2447a58
chore: update newspack-scripts to git branch
dkoo Jun 17, 2024
365b010
chore: update newspack-scripts to alpha.3
dkoo Jun 18, 2024
661d026
Merge trunk into chore/update-dependencies
adekbadek Jun 18, 2024
b27dbd7
test: remove unneeded mocks
adekbadek Jun 18, 2024
2039072
deps: newspack-scripts@5.6.0-alpha.1
adekbadek Jun 18, 2024
74f78f3
chore: fix scripts
dkoo Jun 19, 2024
eb1f9ca
fix: update newspack-scripts to v5.6.0-alpha.2
dkoo Jun 19, 2024
d5ea530
fix: add newspack-revisions.js to webpack build for linting
dkoo Jun 19, 2024
76e4cc8
fix: update stylelint and format CSS for errors
dkoo Jun 19, 2024
458beaf
chore: clear TS check errors
dkoo Jun 19, 2024
3559e76
fix: start command
dkoo Jun 19, 2024
4cc65ce
fix: remove i18n script (Blocks only)
dkoo Jun 19, 2024
197a808
temporarily revert stylelint autoformat to avoid merge conflicts
dkoo Jun 19, 2024
4aca8bb
chore: add .stylelintrc.js
dkoo Jun 19, 2024
aa23968
fix: reformat SCSS
dkoo Jun 20, 2024
857cd1e
chore: update newspack-scripts to v5.6.0-alpha.4
dkoo Jun 20, 2024
a190274
fix: add missing Prettier config files
dkoo Jun 20, 2024
8f48c28
chore: update newspack-scripts to 5.6.0-alpha.5
dkoo Jun 20, 2024
4c89f07
chore: update newspack-scripts to v5.6.0-alpha.7
dkoo Jun 21, 2024
6dc28a5
Merge branch 'trunk' into chore/update-dependencies
adekbadek Jun 24, 2024
9cc319d
style: stylelint autofixes
adekbadek Jun 24, 2024
741ab3f
Merge branch 'trunk' into chore/update-dependencies
dkoo Jun 25, 2024
c580196
fix: add fix:js script; temporarily remove format:js
dkoo Jun 25, 2024
ebf4197
fix: update newspack-scripts to v5.5.0-alpha.8 and restore format:js …
dkoo Jun 25, 2024
5c59f7a
Merge branch 'trunk' into chore/update-dependencies
dkoo Jul 1, 2024
dc91530
chore: add NPM scripts for PHP
dkoo Jul 1, 2024
672d4dc
refactor: move recaptcha JS to src directory
dkoo Jul 2, 2024
c2d6524
fix: ignore dist and node_modules inside src/components, too
dkoo Jul 2, 2024
88fcfe9
fix: update Babel configs for components
dkoo Jul 2, 2024
9b77c80
fix(components): output TS and JS, and publish new major version to NPM
dkoo Jul 2, 2024
3aad6b5
fix: do not delete node_modules after post-publish
dkoo Jul 2, 2024
aaf0846
Merge branch 'trunk' into chore/update-dependencies
dkoo Jul 11, 2024
a11ec80
Merge branch 'trunk' into chore/update-dependencies
dkoo Jul 29, 2024
3dede67
chore: bump newspack-scripts to v5.5.2
dkoo Aug 2, 2024
7464171
Merge branch 'trunk' into chore/update-dependencies
dkoo Aug 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .distignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ node_modules
.circleci
/tests
/bin
/assets/**/*.js
/assets/**/*.scss
/src/**/*.js
/src/**/*.scss
/release
.cache
codecov
Expand Down
5 changes: 1 addition & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,5 @@ module.exports = {
newspack_urls: 'readonly',
newspack_aux_data: 'readonly',
},
rules: {
'@typescript-eslint/ban-ts-comment': 'warn',
},
ignorePatterns: [ 'dist/', 'node_modules/', 'assets/components/node_modules' ],
ignorePatterns: [ 'dist/', 'node_modules/', 'src/components/node_modules' ],
};
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ updates:

# Enable version updates for npm
- package-ecosystem: 'npm'
# Look for `package.json` and `lock` files in the `assets/components` directory
directory: '/assets/components'
# Look for `package.json` and `lock` files in the `src/components` directory
directory: '/src/components'
# Check the npm registry for updates every day (weekdays)
schedule:
interval: 'weekly'
Expand Down
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ Thumbs.db

# Built files
/dist
/assets/components/dist
/assets/components/shared
/assets/components/node_modules
/src/components/dist
/src/components/shared
/src/components/node_modules
release

# Tests
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.11.1
lts/*
122 changes: 0 additions & 122 deletions assets/components/src/position-control/index.js

This file was deleted.

4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
},
"config": {
"platform": {
"php": "7.4"
"php": "8.0"
},
"allow-plugins": {
"composer/installers": true,
"dealerdirect/phpcodesniffer-composer-installer": true
}
}
}
}
Loading