Move files into place

Author: Mina Smart

package.json

@@ -12,14 +12,14 @@
     "clean": "rimraf .tmp types.js",
     "setup-paths": "mkdir -p .tmp/test",
     "test": "yarn run clean && yarn run setup-paths && yarn run test:node-deps && yarn run mocha",
-    "test:watch": "cross-env BABEL_ENV='browser' node -- scripts-graphql/test-build-watch.js --with-dependency-tracking .tmp/test/tests.js",
+    "test:watch": "cross-env BABEL_ENV='browser' node -- scripts/test-build-watch.js --with-dependency-tracking .tmp/test/tests.js",
     "test:web-deps": "concurrently 'yarn run test:copy-web-deps' 'yarn run schema:transform-to-types'",
-    "test:node-deps": "yarn run schema:transform-to-types && cross-env BABEL_ENV='node' node -- scripts-graphql/test-build-node.js --with-dependency-tracking .tmp/test/node-tests.js",
-    "test:copy-web-deps": "cp test-graphql/index.html node_modules/mocha/mocha.* node_modules/jquery/dist/jquery.slim.min.js .tmp/test/ && cp node_modules/expect.js/index.js .tmp/test/expect.js",
-    "test:livereload-server": "node scripts-graphql/livereload.js",
+    "test:node-deps": "yarn run schema:transform-to-types && cross-env BABEL_ENV='node' node -- scripts/test-build-node.js --with-dependency-tracking .tmp/test/node-tests.js",
+    "test:copy-web-deps": "cp test/index.html node_modules/mocha/mocha.* node_modules/jquery/dist/jquery.slim.min.js .tmp/test/ && cp node_modules/expect.js/index.js .tmp/test/expect.js",
+    "test:livereload-server": "node scripts/livereload.js",
     "mocha": "mocha -u tdd $(yarn run mocha:reporter-args 2>&1 >/dev/null) .tmp/test/node-tests.js",
     "mocha:reporter-args": "test -n \"${CI}\" && >&2 echo --reporter xunit --reporter-options output=$CIRCLE_TEST_REPORTS/junit/mocha.xml || true",
-    "lint": "eslint --max-warnings 0 -c .eslintrc.json $(yarn run lint:reporter-args 2>&1 >/dev/null) src-graphql/ test-graphql/",
+    "lint": "eslint --max-warnings 0 -c .eslintrc.json $(yarn run lint:reporter-args 2>&1 >/dev/null) src/ test/",
     "lint:reporter-args": "test -n \"${CI}\" && >&2 echo -o $CIRCLE_TEST_REPORTS/junit/eslint.xml -f junit",
     "print-start-message": "wait-on file:.tmp/test/index.html file:.tmp/test/tests.js tcp:35729 tcp:4200 file:types.js && echo \"\n\n⚡️⚡️⚡️  Good to go at http://localhost:4200 ⚡️⚡️⚡️\"",
     "schema:refresh": "rimraf types.js && yarn run schema:fetch && yarn run schema:transform-to-types",

rollup.config.js

@@ -9,8 +9,8 @@ const targets = [];
 // eslint-disable-next-line no-process-env
 if (process.env.BUILD_MODE === 'production') {
   plugins.push(remap({
-    originalPath: './src-graphql/graphl-client',
-    targetPath: './src-graphql/graphl-client-dev'
+    originalPath: './src/graphl-client',
+    targetPath: './src/graphl-client-dev'
   }));
 
   targets.push(

scripts-graphql/.eslintrc.json scripts/.eslintrc.json

@@ -16,8 +16,8 @@ function envRollupInfo({browser, withDependencyTracking}) {
     json(),
     eslintTestGenerator({
       paths: [
-        'src-graphql',
-        'test-graphql'
+        'src',
+        'test'
       ]
     }),
     commonjs({
@@ -38,16 +38,16 @@ function envRollupInfo({browser, withDependencyTracking}) {
   // eslint-disable-next-line no-process-env
   if (!withDependencyTracking) {
     plugins.unshift(remap({
-      originalPath: './src-graphql/graphl-client',
-      targetPath: './src-graphql/graphl-client-dev'
+      originalPath: './src/graphl-client',
+      targetPath: './src/graphl-client-dev'
     }));
   }
 
   if (browser) {
     plugins.unshift(globals(), builtins());
     plugins.unshift(remap({
-      originalPath: './test-graphql/isomorphic-fetch-mock.js',
-      targetPath: './test-graphql/fetch-mock-browser.js'
+      originalPath: './test/isomorphic-fetch-mock.js',
+      targetPath: './test/fetch-mock-browser.js'
     }));
   } else {
     external.push(
@@ -62,8 +62,8 @@ function envRollupInfo({browser, withDependencyTracking}) {
       'string_decoder'
     );
     plugins.unshift(remap({
-      originalPath: './test-graphql/isomorphic-fetch-mock.js',
-      targetPath: './test-graphql/fetch-mock-node.js'
+      originalPath: './test/isomorphic-fetch-mock.js',
+      targetPath: './test/fetch-mock-node.js'
     }));
   }
 
@@ -74,7 +74,7 @@ function rollupTests({dest, withDependencyTracking, cache, browser}) {
   const {plugins, external, format} = envRollupInfo({withDependencyTracking, browser});
 
   return rollup.rollup({
-    entry: 'test-graphql/**/*-test.js',
+    entry: 'test/**/*-test.js',
     plugins,
     external,
     cache

scripts/build-doc

@@ -14,7 +14,7 @@ function notifyReload() {
   fetch(reloadUri);
 }
 
-watcher([['src-graphql', 'js'], ['test-graphql', 'js']], () => {
+watcher([['src', 'js'], ['test', 'js']], () => {
   const start = Date.now();
 
   rollupTests({dest, withDependencyTracking, cache: bundle, browser: true}).then((newBundle) => {