Skip to content

Commit

Permalink
Move Frontend code out of app/assets to avoid recompile (#3751)
Browse files Browse the repository at this point in the history
* move frontend code out of app/assets to avoid recompile

* remove save saga

* remove snapshot files (should be gitignored)

* move new files after merge
  • Loading branch information
fm3 committed Feb 12, 2019
1 parent 44f32f7 commit 647b6b8
Show file tree
Hide file tree
Showing 422 changed files with 33 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Expand Up @@ -265,7 +265,7 @@ jobs:
(exit $s)
- store_artifacts:
path: app/assets/javascripts/test/screenshots
path: frontend/javascripts/test/screenshots

workflows:
version: 2
Expand Down
2 changes: 1 addition & 1 deletion .eslintignore
@@ -1,2 +1,2 @@
app/assets/javascripts/test/snapshots/flow-check/*
frontend/javascripts/test/snapshots/flow-check/*
tools/proxy/node_modules/*
6 changes: 3 additions & 3 deletions .flowconfig
Expand Up @@ -29,10 +29,10 @@ include_warnings=true
module.ignore_non_literal_requires=true

module.name_mapper='three' -> '<PROJECT_ROOT>/node_modules/three.js/build/three.js'
module.name_mapper='^\([^.].*\)' -> '<PROJECT_ROOT>/app/assets/javascripts/\1'
module.name_mapper='^\([^.].*\)' -> '<PROJECT_ROOT>/frontend/javascripts/\1'

module.name_mapper.extension='proto' -> '<PROJECT_ROOT>/app/assets/flow/ProtoFlowStub.js.flow'
module.name_mapper.extension='less' -> '<PROJECT_ROOT>/app/assets/flow/ProtoFlowStub.js.flow'
module.name_mapper.extension='proto' -> '<PROJECT_ROOT>/frontend/flow/ProtoFlowStub.js.flow'
module.name_mapper.extension='less' -> '<PROJECT_ROOT>/frontend/flow/ProtoFlowStub.js.flow'

[lints]
all=error
Expand Down
8 changes: 4 additions & 4 deletions .gitignore
Expand Up @@ -60,10 +60,10 @@ flow-coverage/
public/docs/frontend-api
dev-db/
docker-compose.override.yml
app/assets/javascripts/test/snapshots/debug-htmls/*
!app/assets/javascripts/test/snapshots/debug-htmls/.gitkeep
app/assets/javascripts/test/snapshots/flow-check/*
!app/assets/javascripts/test/snapshots/flow-check/.gitkeep
frontend/javascripts/test/snapshots/debug-htmls/*
!frontend/javascripts/test/snapshots/debug-htmls/.gitkeep
frontend/javascripts/test/snapshots/flow-check/*
!frontend/javascripts/test/snapshots/flow-check/.gitkeep
.eslintcache
*.sublime-project
*.sublime-workspace
Expand Down
2 changes: 1 addition & 1 deletion .importjs.js
Expand Up @@ -7,7 +7,7 @@ module.exports = {
},
moduleNameFormatter({ moduleName, pathToCurrentFile }) {
// trim the path prefix
const appDirPrefix = "app/assets/javascripts/";
const appDirPrefix = "frontend/javascripts/";
if (moduleName.startsWith(appDirPrefix)) {
return moduleName.slice(appDirPrefix.length);
}
Expand Down
1 change: 1 addition & 0 deletions clean
Expand Up @@ -12,5 +12,6 @@ rm -rf webknossos-tracingstore/target
rm -rf webknossos-tracingstore/project/target
rm -rf webknossos-tracingstore/project/project/target
rm -rf node_modules
mkdir target

echo "[info] Done."
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 647b6b8

Please sign in to comment.