From 7e4e165189da69b9bbc0ae0c97f513e0ee5ba710 Mon Sep 17 00:00:00 2001 From: Samuel Date: Sat, 19 Oct 2019 00:15:26 +0200 Subject: [PATCH 1/5] Updated tsconfig.base.json to target es5 The builds across the packages currently depend on the transpiled files to be in es5 (for example uglify is used to minify graphiql and it doesn't support es6). --- tsconfig.base.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.base.json b/tsconfig.base.json index 1738154f4eb..019adeec194 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1,7 +1,7 @@ { "compilerOptions": { "composite": false, - "target": "esnext", + "target": "es5", "module": "commonjs", "moduleResolution": "node", "esModuleInterop": true, From 7000d5072c6865d32f36c355c3071024ebaaad11 Mon Sep 17 00:00:00 2001 From: Samuel Date: Sat, 19 Oct 2019 00:17:13 +0200 Subject: [PATCH 2/5] Changed source minify to graphiql.js The source for the minify operation should be graphiql.js for it to work properly. --- packages/graphiql/resources/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphiql/resources/build.sh b/packages/graphiql/resources/build.sh index 720bd017f67..73aef0be61e 100644 --- a/packages/graphiql/resources/build.sh +++ b/packages/graphiql/resources/build.sh @@ -13,7 +13,7 @@ babel src --ignore __tests__ --out-dir dist/ echo "Bundling graphiql.js..." browserify -g browserify-shim -s GraphiQL dist/index.js > graphiql.js echo "Bundling graphiql.min.js..." -browserify -g browserify-shim -t uglifyify -s GraphiQL graphiql.min.js | uglifyjs -c > graphiql.min.js +browserify -g browserify-shim -t uglifyify -s GraphiQL graphiql.js | uglifyjs -c > graphiql.min.js echo "Bundling graphiql.css..." postcss --no-map --use autoprefixer -d dist/ css/*.css cat dist/*.css > graphiql.css From 8a6f1f557618184416124a801a4661b8f0a5e579 Mon Sep 17 00:00:00 2001 From: Samuel Date: Sat, 19 Oct 2019 11:30:36 +0200 Subject: [PATCH 3/5] Added browserify transform to package.json To ensure babelify transforms files in node_modules. --- packages/graphiql/package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/graphiql/package.json b/packages/graphiql/package.json index 4e7f45d4065..7864f8cd884 100644 --- a/packages/graphiql/package.json +++ b/packages/graphiql/package.json @@ -35,6 +35,9 @@ "git add" ] }, + "browserify": { + "transform": [["babelify", { "presets": ["@babel/preset-env"] }]] + }, "dependencies": { "codemirror": "^5.47.0", "codemirror-graphql": "^0.11.1", From ff9e767ba35f3d8079af814691a8a1e0a877039a Mon Sep 17 00:00:00 2001 From: Samuel Date: Sat, 19 Oct 2019 11:31:08 +0200 Subject: [PATCH 4/5] Revert target back to esnext --- tsconfig.base.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.base.json b/tsconfig.base.json index 019adeec194..1738154f4eb 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1,7 +1,7 @@ { "compilerOptions": { "composite": false, - "target": "es5", + "target": "esnext", "module": "commonjs", "moduleResolution": "node", "esModuleInterop": true, From f7895f669d4d30cc6022a281681f6e0c3b5bab98 Mon Sep 17 00:00:00 2001 From: Samuel Imolorhe Date: Sat, 19 Oct 2019 15:17:08 +0200 Subject: [PATCH 5/5] chore(graphiql): removed babel presets from babelify config --- packages/graphiql/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphiql/package.json b/packages/graphiql/package.json index 7864f8cd884..66925f6b196 100644 --- a/packages/graphiql/package.json +++ b/packages/graphiql/package.json @@ -36,7 +36,7 @@ ] }, "browserify": { - "transform": [["babelify", { "presets": ["@babel/preset-env"] }]] + "transform": ["babelify"] }, "dependencies": { "codemirror": "^5.47.0",