Unify build scripts to all rely on npm run build (#1161)

While `npm run build` prepares a module-aware package, we don't actually deploy one. This fixes that and avoids future issue by unifying the three build scripts in use.

Author: leebyron

.gitignore

@@ -8,3 +8,4 @@
 node_modules
 coverage
 dist
+npm

.npmignore

@@ -14,3 +14,4 @@ coverage
 resources
 src
 dist
+npm

package.json

@@ -29,9 +29,10 @@
     "prettier": "prettier --write 'src/**/*.js'",
     "check": "flow check",
     "check-cover": "for file in {src/*.js,src/**/*.js}; do echo $file; flow coverage $file; done",
-    "build": "npm run build:clean && npm run build:npm && npm run build:npm-flow && npm run build:module && npm run build:module-flow",
+    "build": "npm run build:clean && npm run build:npm && npm run build:npm-flow && npm run build:module && npm run build:module-flow && npm run build:package-json",
     "build:clean": "rm -rf ./dist",
-    "build:npm": "babel src --optional runtime --ignore __tests__ --out-dir dist/ && cp package.json dist/",
+    "build:package-json": "node ./resources/copy-package-json.js",
+    "build:npm": "babel src --optional runtime --ignore __tests__ --out-dir dist/",
     "build:npm-flow": "find ./src -name '*.js' -not -path '*/__tests__*' | while read filepath; do cp $filepath `echo $filepath | sed 's/\\/src\\//\\/dist\\//g'`.flow; done",
     "build:module": "BABEL_MODULES=1 babel src --optional runtime --ignore __tests__ --out-dir dist/module/",
     "build:module-flow": "find ./src -name '*.js' -not -path '*/__tests__*' | while read filepath; do cp $filepath `echo $filepath | sed 's/\\/src\\//\\/dist\\/module\\//g'`.flow; done",

resources/copy-package-json.js

@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * Ensure a vanilla package.json before deploying so other tools do not
+ * interpret the built output as requiring any further transformation.
+ */
+
+const fs = require('fs');
+
+const package = require('../package.json');
+delete package.scripts;
+delete package.options;
+delete package.devDependencies;
+fs.writeFileSync('./dist/package.json', JSON.stringify(package, null, 2));

resources/gitpublish.sh

@@ -6,23 +6,35 @@
 #     "graphql": "git://github.com/graphql/graphql-js.git#npm"
 #
 
-babel src --ignore __tests__ --out-dir npm
+# Build
+npm run build
 
-# Ensure a vanilla package.json before deploying so other tools do not interpret
-# The built output as requiring any further transformation.
-node -e "var package = require('./package.json'); \
-  delete package.scripts; \
-  delete package.options; \
-  delete package.devDependencies; \
-  require('fs').writeFileSync('./npm/package.json', JSON.stringify(package, null, 2));"
+# Create empty npm directory
+rm -rf npm
+git clone -b npm "https://${GH_TOKEN}@github.com/graphql/graphql-js.git" npm
 
+# Remove existing files first
+rm -rf npm/**/*
+rm -rf npm/*
+
+# Copy over necessary files
+cp -r dist/* npm/
 cp README.md npm/
 cp LICENSE npm/
 
+# Reference current commit
+HEADREV=`git rev-parse HEAD`
+echo $HEADREV
+
+# Deploy
 cd npm
-git init
 git config user.name "Travis CI"
 git config user.email "[email protected]"
-git add .
-git commit -m "Deploy master to NPM branch"
-git push --force --quiet "https://${GH_TOKEN}@github.com/graphql/graphql-js.git" master:npm
+git add -A .
+if git diff --staged --quiet; then
+  echo "Nothing to publish"
+else
+  git commit -a -m "Deploy $HEADREV to NPM branch"
+  git push > /dev/null 2>&1
+  echo "Pushed"
+fi

resources/prepublish.sh

@@ -18,16 +18,5 @@ fi;
 
 # When Travis CI publishes to NPM, the published files are available in the root
 # directory, which allows for a clean include or require of sub-modules.
-#
-#    var language = require('graphql/language');
-#
-babel src --ignore __tests__ --out-dir ./;
-find ./src -name '*.js' -not -path '*/__tests__*' | while read filepath; do cp $filepath `echo $filepath | sed 's/\\/src\\//\\//g'`.flow; done;
-
-# Ensure a vanilla package.json before deploying so other tools do not interpret
-# The built output as requiring any further transformation.
-node -e "var package = require('./package.json'); \
-  delete package.scripts; \
-  delete package.options; \
-  delete package.devDependencies; \
-  require('fs').writeFileSync('package.json', JSON.stringify(package));"
+npm run build
+cp -r ./dist/* ./