diff options
| author | crupest <crupest@outlook.com> | 2020-06-02 15:41:51 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2020-06-02 15:41:51 +0800 |
| commit | d8109e45a966d0823ba1ae0e51f0da0154ba156f (patch) | |
| tree | 994d60ab59ff4b9ca0a9bdd5fae73fbbcde77df6 | |
| parent | 362317837ab8f1901485ba92685b77ec949c9e49 (diff) | |
| parent | bf86f471e99d67fa9cbe141c347423c37cca8524 (diff) | |
| download | timeline-d8109e45a966d0823ba1ae0e51f0da0154ba156f.tar.gz timeline-d8109e45a966d0823ba1ae0e51f0da0154ba156f.tar.bz2 timeline-d8109e45a966d0823ba1ae0e51f0da0154ba156f.zip | |
Merge branch 'dev' of https://github.com/crupest/Timeline into dev
| -rw-r--r-- | .dockerignore | 5 | ||||
| -rw-r--r-- | Timeline/ClientApp/package.json | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/.dockerignore b/.dockerignore index d0b276f2..ea6782cb 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,5 +3,10 @@ */bin */obj Timeline/publish + Timeline/ClientApp/dist Timeline/ClientApp/node_modules +Timeline/ClientApp/.yarn/* +!Timeline/ClientApp/.yarn/releases +!Timeline/ClientApp/.yarn/plugins +Timeline/ClientApp/.pnp.* diff --git a/Timeline/ClientApp/package.json b/Timeline/ClientApp/package.json index 7742fb87..a84267e8 100644 --- a/Timeline/ClientApp/package.json +++ b/Timeline/ClientApp/package.json @@ -63,6 +63,7 @@ "@types/react-router": "^5.1.7", "@types/react-router-dom": "^5.1.5", "@types/reactstrap": "^8.4.2", + "@types/webpack-env": "^1.15.2", "@types/xregexp": "^4.3.0", "@typescript-eslint/eslint-plugin": "^3.0.2", "@typescript-eslint/parser": "^3.0.2", |