diff --git a/.gitignore b/.gitignore index c5d3f7c62b..0f96fb3ee1 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,10 @@ public/js/bundle* *.map // revision manifest +server/rev-manifest.json +server/manifests/* +!server/manifests/README.md + public/js/main* public/js/commonFramework* public/js/sandbox* diff --git a/server/README.md b/server/README.md new file mode 100644 index 0000000000..7b675cf5fe --- /dev/null +++ b/server/README.md @@ -0,0 +1,5 @@ +Everything to due with the server + +One file that is not tracked here is `rev-manifest.json`. +It is generated at runtime and its contents changes as the contents +of client side files change. diff --git a/server/manifests/README.md b/server/manifests/README.md new file mode 100644 index 0000000000..6b4af2b5ea --- /dev/null +++ b/server/manifests/README.md @@ -0,0 +1,8 @@ +This folder contains a list of json files representing the name +of revisioned client files. It is empty due to the fact that the +files are generated at runtime and their content is determined by +the content of the files they are derived from. + +Since the build process is not exactly the same on every machine, +this files are not tracked in github otherwise conflicts arise when +building on our servers. diff --git a/server/manifests/css-manifest.json b/server/manifests/css-manifest.json deleted file mode 100644 index dfac7264c7..0000000000 --- a/server/manifests/css-manifest.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "main.css": "main-6645810137.css" -} \ No newline at end of file diff --git a/server/manifests/dependents-manifest.json b/server/manifests/dependents-manifest.json deleted file mode 100644 index 53bc4daf4b..0000000000 --- a/server/manifests/dependents-manifest.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "commonFramework.js": "commonFramework-f2a3a38931.js" -} \ No newline at end of file diff --git a/server/manifests/js-manifest.json b/server/manifests/js-manifest.json deleted file mode 100644 index 802a1037a5..0000000000 --- a/server/manifests/js-manifest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "iFrameScripts.js": "iFrameScripts-fee9f17adb.js", - "main.js": "main-c4d88948ff.js", - "plugin.js": "plugin-4564d5d4ec.js" -} \ No newline at end of file diff --git a/server/manifests/react-manifest.json b/server/manifests/react-manifest.json deleted file mode 100644 index 73bc562cd3..0000000000 --- a/server/manifests/react-manifest.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "bundle.js": "bundle-5c9b5836a9.js" -} \ No newline at end of file