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

Change deasync to its latest version #13839

Merged
merged 5 commits into from
Feb 13, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
33 changes: 17 additions & 16 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
# Directories/files that may be generated by this project
build
build-module
build-style
node_modules
gutenberg.zip
languages/gutenberg.pot
/languages/gutenberg-translations.php

# Directories/files that may appear in your environment
.DS_Store
*.log
phpcs.xml
yarn.lock
docker-compose.override.yml
/wordpress
# Directories/files that may be generated by this project
build
build-module
build-style
node_modules
gutenberg.zip
languages/gutenberg.pot
/languages/gutenberg-translations.php

# Directories/files that may appear in your environment
.DS_Store
*.log
phpcs.xml
yarn.lock
docker-compose.override.yml
/wordpress
/nbproject/*
Copy link
Contributor

Choose a reason for hiding this comment

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

Any reason for the change here?

Copy link
Contributor Author

@manooweb manooweb Feb 13, 2019

Choose a reason for hiding this comment

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

I'm using netbeans and this IDE puts its project configurations in this folder directly in the project. For me it is useful if I want to branch / switch easily without commit this folder.

Copy link
Contributor

Choose a reason for hiding this comment

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

I see, in that case, I suggest using the global gitignore instead of adding this to all the projects you work on https://gist.github.com/subfuzion/db7f57fff2fb6998a16c

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hum, thanks I'm doing and testing it.
It's useful for all my projects :-)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's done. It works and I also removed this folder from .gitignore file

Copy link
Contributor

Choose a reason for hiding this comment

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

Can you restore the .gitignore file to its original version (it shouldn't appear in the changes)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done ! It's due to line feed. Very strange because editorconfig is well configured.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,17 +80,17 @@
"core-js": "2.5.7",
"cross-env": "3.2.4",
"cssnano": "4.0.3",
"enzyme": "3.7.0",
"deasync": "0.1.13",
"deasync": "0.1.14",
"deep-freeze": "0.0.1",
"doctrine": "2.1.0",
"enzyme": "3.7.0",
"eslint-plugin-jest": "21.5.0",
"espree": "3.5.4",
"fbjs": "0.8.17",
"glob": "7.1.2",
"husky": "0.14.3",
"is-plain-obj": "1.1.0",
"is-equal-shallow": "0.1.3",
"is-plain-obj": "1.1.0",
"jsdom": "11.12.0",
"lerna": "3.4.3",
"lint-staged": "7.3.0",
Expand All @@ -109,8 +109,8 @@
"shallow-equal": "1.0.0",
"shallow-equals": "1.0.0",
"shallowequal": "1.1.0",
"sprintf-js": "1.1.1",
"source-map-loader": "0.2.3",
"sprintf-js": "1.1.1",
"stylelint-config-wordpress": "13.1.0",
"uuid": "3.3.2",
"webpack-bundle-analyzer": "3.0.2",
Copy link
Contributor

Choose a reason for hiding this comment

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

After the change here, I expect at least a small change in the package-lock.json file. (That's why the tests are failing). You should run npm install and commit the package lock.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hum ok. I understand now why package-lock.json is needed :)
I just didn't commit this file. I'm going to do it.

Expand Down