Skip to content

Commit

Permalink
chore: update dependencies (#3cj43t)
Browse files Browse the repository at this point in the history
  • Loading branch information
matzeeable committed Jun 29, 2020
1 parent 6c2db41 commit 82994f9
Show file tree
Hide file tree
Showing 16 changed files with 3,276 additions and 2,552 deletions.
19 changes: 16 additions & 3 deletions common/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,30 @@
//"sort-imports": "warn",
"@typescript-eslint/no-explicit-any": 0,
"@typescript-eslint/explicit-function-return-type": 0,
"@typescript-eslint/explicit-module-boundary-types": 0,
"@typescript-eslint/ban-ts-ignore": 0,
"@typescript-eslint/member-ordering": "error"
"@typescript-eslint/member-ordering": "error",
"@typescript-eslint/ban-types": [
"error",
{
"types": {
"{}": false
},
"extendDefaults": true
}
]
}
},
{
"files": ["**/jest/**/*.test.{tsx,ts}"],
"plugins": ["jest"],
"extends": ["plugin:jest/recommended", "plugin:jest/style"]
"extends": ["plugin:jest/recommended", "plugin:jest/style"],
"rules": {
"@typescript-eslint/ban-ts-comment": 0
}
},
{
"files": ["**/*.test.{tsx,ts}"],
"files": ["**/*.test.{tsx,ts}", "**/cypress/plugins/*"],
"rules": {
"@typescript-eslint/no-var-requires": 0
}
Expand Down
4 changes: 2 additions & 2 deletions common/Gruntfile.plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function applyPluginRunnerConfiguration(grunt: IGrunt) {
},
packageManageFiles: ["<%= BUILD_PLUGIN_DIR %>/?(composer|package).*"]
},
strip_code: /* eslint-disable-line @typescript-eslint/camelcase */ {
strip_code: /* eslint-disable-line @typescript-eslint/naming-convention */ {
/**
* Clean development source maps.
*/
Expand Down Expand Up @@ -111,7 +111,7 @@ function applyPluginRunnerConfiguration(grunt: IGrunt) {
dest: "src/inc/base/others/cachebuster.php"
}
},
node_modules_cachebuster: /* eslint-disable-line @typescript-eslint/camelcase */ {
node_modules_cachebuster: /* eslint-disable-line @typescript-eslint/naming-convention */ {
publiclib: {
options: {
banner: `/* This file was automatically generated by the \`grunt libs:cachebuster\` command (${new Date().toString()}). */`,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/node_modules/@lerna/version/index.js b/node_modules/@lerna/version/index.js
index 80bd8db..a6d9c68 100644
index 30836fe..dc8e232 100644
--- a/node_modules/@lerna/version/index.js
+++ b/node_modules/@lerna/version/index.js
@@ -476,7 +476,7 @@ class VersionCommand extends Command {
@@ -493,7 +493,7 @@ class VersionCommand extends Command {
}

updatePackageVersions() {
Expand All @@ -11,15 +11,15 @@ index 80bd8db..a6d9c68 100644
const independentVersions = this.project.isIndependent();
const rootPath = this.project.manifest.location;
const changedFiles = new Set();
@@ -534,6 +534,7 @@ class VersionCommand extends Command {
@@ -551,6 +551,7 @@ class VersionCommand extends Command {
actions.push(pkg =>
ConventionalCommitUtilities.updateChangelog(pkg, type, {
changelogPreset,
+ conventionalChangelog,
rootPath,
tagPrefix: this.tagPrefix,
}).then(({ logPath, newEntry }) => {
@@ -569,6 +570,7 @@ class VersionCommand extends Command {
@@ -586,6 +587,7 @@ class VersionCommand extends Command {
chain = chain.then(() =>
ConventionalCommitUtilities.updateChangelog(this.project.manifest, "root", {
changelogPreset,
Expand Down
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,32 +172,32 @@
]
},
"devDependencies": {
"@commitlint/cli": "^8.3.5",
"@commitlint/config-conventional": "^8.3.4",
"@prettier/plugin-php": "^0.14.0",
"@commitlint/cli": "^9.0.1",
"@commitlint/config-conventional": "^9.0.1",
"@prettier/plugin-php": "^0.14.2",
"@prettier/plugin-xml": "^0.7.2",
"@types/grunt": "^0.4.25",
"@types/rimraf": "^3.0.0",
"@typescript-eslint/eslint-plugin": "^2.25.0",
"@typescript-eslint/parser": "^2.25.0",
"concurrently": "^5.1.0",
"@typescript-eslint/eslint-plugin": "^3.4.0",
"@typescript-eslint/parser": "^3.4.0",
"concurrently": "^5.2.0",
"dotenv": "^8.2.0",
"eslint": "^6.7.1",
"eslint-config-prettier": "^6.10.1",
"eslint-plugin-import": "^2.19.1",
"eslint-plugin-jest": "^23.8.2",
"eslint-plugin-prettier": "^3.1.1",
"eslint-plugin-react": "^7.19.0",
"husky": "^4.2.3",
"lerna": "^3.18.4",
"lint-staged": "^10.0.9",
"eslint": "^7.3.1",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jest": "^23.17.1",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.20.1",
"husky": "^4.2.5",
"lerna": "^3.22.1",
"lint-staged": "^10.2.11",
"node-gitlab-ci": "^0.2.0",
"parallel-webpack": "^2.4.0",
"patch-package": "^6.2.1",
"php-parser": "^3.0.0",
"postinstall-postinstall": "^2.0.0",
"prettier": "^2.0.2",
"parallel-webpack": "^2.6.0",
"patch-package": "^6.2.2",
"php-parser": "^3.0.1",
"postinstall-postinstall": "^2.1.0",
"prettier": "^2.0.5",
"rimraf": "^3.0.2",
"typescript": "~3.8.3"
"typescript": "~3.9.5"
}
}
2 changes: 1 addition & 1 deletion packages/utils/lib/factory/ajax/commonUrlBuilder.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function commonUrlBuilder({

// Set path depending on permalink settings
if (query.rest_route) {
query.rest_route = usePath; // eslint-disable-line @typescript-eslint/camelcase
query.rest_route = usePath; // eslint-disable-line @typescript-eslint/naming-convention
} else {
apiUrl.set("pathname", usePath); // Set path
}
Expand Down
60 changes: 30 additions & 30 deletions packages/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,15 @@
".yarn"
],
"dependencies": {
"@wordpress/i18n": "^3.6.1",
"@wordpress/i18n": "^3.14.0",
"classnames": "^2.2.6",
"core-js": "3",
"core-js": "3.6.5",
"deepmerge": "^4.2.2",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"immer": "^6.0.2",
"immer": "^7.0.5",
"interpolate-components": "^1.1.1",
"jquery": "^3.4.1",
"jquery": "^3.5.1",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-test-renderer": "^16.13.1",
Expand All @@ -118,48 +118,48 @@
"whatwg-fetch": "^3.0.0"
},
"devDependencies": {
"@babel/core": "^7.9.0",
"@babel/plugin-proposal-class-properties": "^7.7.4",
"@babel/plugin-proposal-decorators": "^7.7.4",
"@babel/plugin-transform-runtime": "^7.9.0",
"@babel/preset-env": "^7.9.0",
"@babel/preset-react": "^7.9.4",
"@babel/preset-typescript": "^7.9.0",
"@babel/runtime": "^7.9.2",
"@babel/core": "^7.10.3",
"@babel/plugin-proposal-class-properties": "^7.10.1",
"@babel/plugin-proposal-decorators": "^7.10.3",
"@babel/plugin-transform-runtime": "^7.10.3",
"@babel/preset-env": "^7.10.3",
"@babel/preset-react": "^7.10.1",
"@babel/preset-typescript": "^7.10.1",
"@babel/runtime": "^7.10.3",
"@types/classnames": "^2.2.10",
"@types/clean-css": "^4.2.1",
"@types/clean-css": "^4.2.2",
"@types/enzyme": "^3.10.5",
"@types/enzyme-adapter-react-16": "^1.0.6",
"@types/jest": "^25.1.4",
"@types/jquery": "^3.3.33",
"@types/jest": "^26.0.3",
"@types/jquery": "^3.5.0",
"@types/mini-css-extract-plugin": "^0.9.1",
"@types/react": "^16.9.25",
"@types/react-dom": "^16.9.4",
"@types/react": "^16.9.41",
"@types/react-dom": "^16.9.8",
"@types/url-parse": "^1.4.3",
"@types/webpack": "^4.41.8",
"@types/webpackbar": "^2.6.0",
"@types/wordpress__i18n": "^3.4.0",
"autoprefixer": "^9.7.5",
"babel-jest": "^25.1.0",
"@types/webpack": "^4.41.18",
"@types/webpackbar": "^4.0.0",
"@types/wordpress__i18n": "^3.11.0",
"autoprefixer": "^9.8.4",
"babel-jest": "^26.1.0",
"babel-loader": "^8.1.0",
"cache-loader": "^4.1.0",
"chokidar-cli": "^2.1.0",
"clean-css": "^4.2.1",
"css-loader": "^3.4.2",
"fork-ts-checker-webpack-plugin": "^4.1.1",
"css-loader": "^3.6.0",
"fork-ts-checker-webpack-plugin": "^5.0.5",
"grunt": "^1.1.0",
"grunt-cli": "^1.3.2",
"identity-obj-proxy": "^3.0.0",
"jest": "^25.1.0",
"jest-junit": "^10.0.0",
"jest": "^26.1.0",
"jest-junit": "^11.0.1",
"mini-css-extract-plugin": "^0.9.0",
"node-sass": "^4.13.0",
"node-sass": "^4.14.1",
"postcss-loader": "^3.0.0",
"sass-loader": "^8.0.2",
"thread-loader": "^2.1.3",
"ts-node": "^8.8.1",
"webpack": "^4.42.1",
"webpack-cli": "^3.3.11",
"ts-node": "^8.10.2",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.12",
"webpackbar": "^4.0.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ describe("commonUrlBuilder", () => {

const { urlSetMock } = createUrlMock((draft) => {
draft.query = {
// eslint-disable-next-line @typescript-eslint/camelcase
// eslint-disable-next-line @typescript-eslint/naming-convention
rest_route: "/wp-json/"
};
});
Expand All @@ -129,7 +129,7 @@ describe("commonUrlBuilder", () => {
{},
{
_wpnonce: opts.options.restNonce,
// eslint-disable-next-line @typescript-eslint/camelcase
// eslint-disable-next-line @typescript-eslint/naming-convention
rest_route: "/wp-json/jest/v1/user"
}
]);
Expand Down
68 changes: 34 additions & 34 deletions plugins/wp-reactjs-starter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -132,53 +132,53 @@
},
"dependencies": {
"@wp-reactjs-multi-starter/utils": "^1.2.0",
"core-js": "3",
"core-js": "3.6.5",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"jquery": "^3.4.1",
"jquery": "^3.5.1",
"lodash": "^4.17.15",
"mobx": "^4.15.0",
"mobx-react": "^6.1.8",
"mobx-react": "^6.2.2",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-test-renderer": "^16.13.1"
},
"devDependencies": {
"@babel/core": "^7.9.0",
"@babel/plugin-proposal-class-properties": "^7.7.0",
"@babel/plugin-proposal-decorators": "^7.7.0",
"@babel/plugin-transform-runtime": "^7.9.0",
"@babel/preset-env": "^7.9.0",
"@babel/preset-react": "^7.9.4",
"@babel/preset-typescript": "^7.9.0",
"@babel/runtime": "^7.9.2",
"@cypress/webpack-preprocessor": "^4.1.3",
"@babel/core": "^7.10.3",
"@babel/plugin-proposal-class-properties": "^7.10.1",
"@babel/plugin-proposal-decorators": "^7.10.3",
"@babel/plugin-transform-runtime": "^7.10.3",
"@babel/preset-env": "^7.10.3",
"@babel/preset-react": "^7.10.1",
"@babel/preset-typescript": "^7.10.1",
"@babel/runtime": "^7.10.3",
"@cypress/webpack-preprocessor": "^5.4.1",
"@types/classnames": "^2.2.10",
"@types/clean-css": "^4.2.1",
"@types/clean-css": "^4.2.2",
"@types/cypress-cucumber-preprocessor": "^1.14.1",
"@types/enzyme": "^3.10.5",
"@types/enzyme-adapter-react-16": "^1.0.6",
"@types/jest": "^25.1.4",
"@types/jquery": "^3.3.33",
"@types/jest": "^26.0.3",
"@types/jquery": "^3.5.0",
"@types/mini-css-extract-plugin": "^0.9.1",
"@types/react": "^16.9.25",
"@types/react-dom": "^16.9.4",
"@types/react": "^16.9.41",
"@types/react-dom": "^16.9.8",
"@types/url-parse": "^1.4.3",
"@types/webpack": "^4.41.8",
"@types/webpackbar": "^2.6.0",
"apidoc": "^0.20.1",
"autoprefixer": "^9.7.5",
"babel-jest": "^25.1.0",
"@types/webpack": "^4.41.18",
"@types/webpackbar": "^4.0.0",
"apidoc": "^0.23.0",
"autoprefixer": "^9.8.4",
"babel-jest": "^26.1.0",
"babel-loader": "^8.1.0",
"cache-loader": "^4.1.0",
"chokidar-cli": "^2.1.0",
"classnames": "^2.2.6",
"clean-css": "^4.2.1",
"css-loader": "^3.4.2",
"cypress": "~4.4.0",
"cypress-cucumber-preprocessor": "^2.0.1",
"css-loader": "^3.6.0",
"cypress": "~4.9.0",
"cypress-cucumber-preprocessor": "^2.5.0",
"cypress-plugin-retries": "^1.5.2",
"fork-ts-checker-webpack-plugin": "^4.1.1",
"fork-ts-checker-webpack-plugin": "^5.0.5",
"grunt": "^1.1.0",
"grunt-cachebuster": "^0.1.7",
"grunt-cli": "^1.3.2",
Expand All @@ -188,18 +188,18 @@
"grunt-node-modules-cachebuster": "^0.1.1",
"grunt-strip-code": "^1.0.6",
"identity-obj-proxy": "^3.0.0",
"jest": "^25.1.0",
"jest-junit": "^10.0.0",
"jsdoc": "^3.6.3",
"jest": "^26.1.0",
"jest-junit": "^11.0.1",
"jsdoc": "^3.6.4",
"mini-css-extract-plugin": "^0.9.0",
"node-sass": "^4.13.0",
"node-sass": "^4.14.1",
"postcss-loader": "^3.0.0",
"sass-loader": "^8.0.2",
"thread-loader": "^2.1.3",
"ts-node": "^8.8.1",
"typedoc": "^0.17.3",
"webpack": "^4.42.1",
"webpack-cli": "^3.3.11",
"ts-node": "^8.10.2",
"typedoc": "^0.17.8",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.12",
"webpackbar": "^4.0.0",
"wp-hookdoc": "^0.2.0"
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/wp-reactjs-starter/scripts/Gruntfile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function setupGrunt(grunt: IGrunt) {
]
}
},
strip_code: /* eslint-disable-line @typescript-eslint/camelcase */ {
strip_code: /* eslint-disable-line @typescript-eslint/naming-convention */ {
/**
* With clean:productionLibs all sourcemap files are cleaned. To avoid 404 errors
* on client side you also need to remove the link to the sourcemap.
Expand Down
8 changes: 4 additions & 4 deletions plugins/wp-reactjs-starter/src/public/ts/store/option.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ import { BaseOptions } from "@wp-reactjs-multi-starter/utils";
import { RootStore } from "./stores";

class OptionStore extends BaseOptions {
// Implement "others" property in your Assets.php;
@observable
public others: {} = {};

public readonly pureSlug: ReturnType<typeof BaseOptions.getPureSlug>;

public readonly pureSlugCamelCased: ReturnType<typeof BaseOptions.getPureSlug>;

public readonly rootStore: RootStore;

// Implement "others" property in your Assets.php;
@observable
public others: {} = {};

constructor(rootStore: RootStore) {
super();
this.rootStore = rootStore;
Expand Down
Loading

0 comments on commit 82994f9

Please sign in to comment.