chore: esm for all packages

graphql · Nov 17, 2019 · e225d56 · e225d56
1 parent 7ba107d
commit e225d56
Show file tree

Hide file tree

Showing 31 changed files with 478 additions and 75 deletions.
diff --git a/packages/graphiql/.browserslistrc → .browserslistrc b/packages/graphiql/.browserslistrc → .browserslistrc
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ node_modules/
 npm-debug.log
 lerna-debug.log
 **/tsconfig.tsbuildinfo
+**/*.tsbuildinfo
diff --git a/babel.config.js b/babel.config.js
@@ -1,7 +1,13 @@
-
+// for ESM don't transpile modules
 module.exports = {
   presets: [
-    require.resolve('@babel/preset-env'),
+    [
+      require.resolve('@babel/preset-env'),
+      {
+        modules: process.env.ESM ? false : 'commonjs',
+        targets: process.env.ESM ? { node: true } : '> 0.25%, not dead'
+      },
+    ],
     require.resolve('@babel/preset-flow'),
     require.resolve('@babel/preset-react'),
   ],

diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
     "build-js": "lerna run build --scope codemirror-graphql --scope graphql-language-service-server --scope graphiql graphql-language-service",
     "build-ts": "tsc --build",
     "build-clean": "tsc --build --clean && rm -rf 'packages/**/src/{dist,esm,bundle}' && lerna run build-clean --parallel",
+    "build-demo": "lerna run build-demo",
     "test": "yarn run lint && yarn run check && yarn run build && yarn run testonly && yarn run e2e",
     "testonly": "jest && lerna run test --scope codemirror-graphql",
     "e2e": "cd packages/graphiql && yarn e2e",
@@ -61,6 +62,7 @@
     "chai": "4.2.0",
     "codecov": "^3.5.0",
     "conventional-changelog-conventionalcommits": "^4.1.0",
+    "copy": "^0.3.2",
     "cypress": "^3.4.1",
     "eslint": "^6.4.0",
     "eslint-config-prettier": "6.3.0",

diff --git a/packages/codemirror-graphql/babel.config.js b/packages/codemirror-graphql/babel.config.js
@@ -1,12 +1,2 @@
 
-module.exports = {
-  presets: [
-    require.resolve('@babel/preset-env'),
-    require.resolve('@babel/preset-flow'),
-    require.resolve('@babel/preset-react'),
-  ],
-  plugins: [
-    require.resolve('@babel/plugin-proposal-class-properties'),
-    require.resolve('@babel/plugin-syntax-dynamic-import'),
-  ],
-};
+module.exports = require('../../babel.config')
diff --git a/packages/codemirror-graphql/package.json b/packages/codemirror-graphql/package.json
@@ -35,8 +35,9 @@
   "scripts": {
     "lint": "eslint src",
     "check": "flow check",
-    "build": "yarn build-clean && yarn build-js && yarn build-flow .",
-    "build-js": "babel src --root-mode upward --ignore src/__tests__ --out-dir .",
+    "build": "yarn build-clean && yarn build-js && yarn build-esm && yarn build-flow .",
+    "build-js": "babel src --root-mode upward --ignore src/__tests__ --out-dir . && babel src --root-mode upward --ignore src/__tests__ --out-dir esm && node ../../resources/renameFileExtensions.js './esm/**/*.js' . .esm.js",
+    "build-esm": "ESM=true babel src --root-mode upward --ignore src/__tests__ --out-dir esm",
     "build-clean": "rimraf {mode,hint,info,jump,lint}.{js,js.flow} && rimraf esm results utils variables coverage __tests__",
     "build-flow": "node ../../resources/buildFlow.js",
     "watch": "babel --optional runtime resources/watch.js | node",

diff --git a/packages/examples/graphiql-cdn/index.html b/packages/examples/graphiql-cdn/index.html
@@ -36,13 +36,10 @@
       favored resource bundler.
      -->
     <link rel="stylesheet" href="/graphiql.css" />
-    <script src="/graphiql.js" type="application/javascript"></script>
-    <script src="/renderExample.js" type="application/javascript"></script>
-
   </head>
   <body>
     <div id="graphiql">Loading...</div>
-    <script>
-    </script>
+      <script src="/graphiql.js" type="application/javascript"></script>
+      <script src="/renderExample.js" type="application/javascript"></script>
   </body>
 </html>
diff --git a/packages/graphiql/.babelrc.js b/packages/graphiql/.babelrc.js
@@ -0,0 +1 @@
+module.exports = require('./babel.config')
diff --git a/packages/graphiql/babel.config.js b/packages/graphiql/babel.config.js
@@ -1,13 +1 @@
-module.exports = {
-  presets: [
-    [
-      require.resolve('@babel/preset-env'),
-      {
-        targets: '> 0.25%, not dead',
-      },
-    ],
-    require.resolve('@babel/preset-flow'),
-    require.resolve('@babel/preset-react'),
-  ],
-  plugins: [require.resolve('@babel/plugin-proposal-class-properties')],
-};
+module.exports = require('../../babel.config')
diff --git a/packages/graphiql/cypress/support/commands.js b/packages/graphiql/cypress/support/commands.js
@@ -8,7 +8,7 @@
 // https://on.cypress.io/custom-commands
 // ***********************************************
 //
-//
+
 Cypress.Commands.add('getCy', cyName => {
   return cy.get(`[data-cy=${cyName}]`);
 });
@@ -39,15 +39,3 @@ Cypress.Commands.add('assertQueryResult', (op, mockSuccess) => {
     );
   });
 });
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This is will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
diff --git a/packages/graphiql/resources/build.sh b/packages/graphiql/resources/build.sh
@@ -9,6 +9,7 @@ if [ ! -d "node_modules/.bin" ]; then
 fi
 
 babel src --ignore __tests__ --out-dir dist/
+ESM=true babel src --ignore __tests__ --out-dir esm/
 echo "Bundling graphiql.js..."
 browserify -g browserify-shim -s GraphiQL dist/index.js > graphiql.js
 echo "Bundling graphiql.min.js..."

diff --git a/packages/graphql-language-service-interface/package.json b/packages/graphql-language-service-interface/package.json
@@ -20,6 +20,8 @@
     "graphql"
   ],
   "main": "dist/index.js",
+  "module": "esm/index.js",
+  "typings": "esm/index.d.ts",
   "scripts": {
     "test": "node ../../resources/runTests.js",
     "build": "yarn run build-ts && yarn run build-flow",

diff --git a/packages/graphql-language-service-interface/tsconfig.esm.json b/packages/graphql-language-service-interface/tsconfig.esm.json
@@ -0,0 +1,19 @@
+{
+  "extends": "../../resources/tsconfig.base.esm.json",
+  "compilerOptions": {
+    "rootDir": "./src",
+    "outDir": "./esm",
+    "composite": true
+  },
+  "references": [
+    {
+      "path": "../graphql-language-service-parser"
+    },
+    {
+      "path": "../graphql-language-service-types"
+    },
+    {
+      "path": "../graphql-language-service-utils"
+    }
+  ]
+}
diff --git a/packages/graphql-language-service-interface/tsconfig.json b/packages/graphql-language-service-interface/tsconfig.json
@@ -1,7 +1,19 @@
 {
-  "extends": "../../tsconfig.base",
+  "extends": "../../resources/tsconfig.base.cjs.json",
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "./dist",
-  }
+    "composite": true
+  },
+  "references": [
+    {
+      "path": "../graphql-language-service-parser"
+    },
+    {
+      "path": "../graphql-language-service-types"
+    },
+    {
+      "path": "../graphql-language-service-utils"
+    }
+  ]
 }
diff --git a/packages/graphql-language-service-parser/package.json b/packages/graphql-language-service-parser/package.json
@@ -19,8 +19,9 @@
   "keywords": [
     "graphql"
   ],
-  "main": "./dist/index.js",
-  "typings": "./dist/index.d.ts",
+  "main": "dist/index.js",
+  "module": "esm/index.js",
+  "typings": "esm/index.d.ts",
   "scripts": {
     "build": "yarn run build-ts && yarn run build-flow",
     "build-ts": "tsc",

diff --git a/packages/graphql-language-service-parser/tsconfig.esm.json b/packages/graphql-language-service-parser/tsconfig.esm.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../resources/tsconfig.base.esm.json",
+  "compilerOptions": {
+    "rootDir": "./src",
+    "outDir": "./esm",
+    "composite": true
+  },
+  "references": [
+    {
+      "path": "../graphql-language-service-types"
+    }
+  ]
+}
diff --git a/packages/graphql-language-service-parser/tsconfig.json b/packages/graphql-language-service-parser/tsconfig.json
@@ -1,7 +1,13 @@
 {
-  "extends": "../../tsconfig.base",
+  "extends": "../../resources/tsconfig.base.cjs.json",
   "compilerOptions": {
     "rootDir": "./src",
-    "outDir": "./dist"
-  }
+    "outDir": "./dist",
+    "composite": true
+  },
+  "references": [
+    {
+      "path": "../graphql-language-service-types"
+    }
+  ]
 }
diff --git a/packages/graphql-language-service-server/package.json b/packages/graphql-language-service-server/package.json
@@ -20,10 +20,13 @@
     "graphql"
   ],
   "main": "dist/index.js",
+  "module": "esm/index.js",
+  "typings": "esm/index.d.ts",
   "scripts": {
     "test": "node ../../resources/runTests.js",
-    "build": "yarn run build-js && yarn run build-flow",
+    "build": "yarn build-js && yarn build-esm && yarn build-flow",
     "build-js": "node ../../resources/buildJs.js",
+    "build-esm": "ESM=true babel src --root-mode upward --ignore __tests__ --out-dir esm",
     "build-flow": "node ../../resources/buildFlow.js",
     "prepublish": "node ../../resources/prepublish.js"
   },

diff --git a/packages/graphql-language-service-types/package.json b/packages/graphql-language-service-types/package.json
@@ -20,7 +20,8 @@
     "graphql"
   ],
   "main": "dist/index.js",
-  "typings": "src/index",
+  "module": "esm/index.js",
+  "typings": "src/index.ts",
   "scripts": {
     "build": "yarn run build-ts && yarn run build-flow",
     "build-ts": "tsc",

diff --git a/packages/graphql-language-service-types/tsconfig.esm.json b/packages/graphql-language-service-types/tsconfig.esm.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../resources/tsconfig.base.esm.json",
+  "compilerOptions": {
+    "rootDir": "./src",
+    "outDir": "./esm",
+  }
+}
diff --git a/packages/graphql-language-service-types/tsconfig.json b/packages/graphql-language-service-types/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base",
+  "extends": "../../resources/tsconfig.base.cjs.json",
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "./dist",

diff --git a/packages/graphql-language-service-utils/package.json b/packages/graphql-language-service-utils/package.json
@@ -20,7 +20,8 @@
     "graphql"
   ],
   "main": "dist/index.js",
-  "types": "src/index.ts",
+  "module": "esm/index.js",
+  "typings": "esm/index.d.ts",
   "engines": {
     "node": ">= 9.7.3"
   },

diff --git a/packages/graphql-language-service-utils/tsconfig.esm.json b/packages/graphql-language-service-utils/tsconfig.esm.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../resources/tsconfig.base.esm.json",
+  "compilerOptions": {
+    "rootDir": "./src",
+    "outDir": "./esm",
+  }
+}
diff --git a/packages/graphql-language-service-utils/tsconfig.json b/packages/graphql-language-service-utils/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base",
+  "extends": "../../resources/tsconfig.base.cjs.json",
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "./dist",

diff --git a/resources/renameFileExtensions.js b/resources/renameFileExtensions.js
@@ -0,0 +1,30 @@
+const copy = require('copy');
+const path = require('path');
+const fs = require('fs');
+const os = require('os');
+
+const tmpDir = os.tmpdir();
+const [, , src, dest, destExtension] = process.argv;
+if (!src || !dest || !destExtension) {
+  console.error(
+    `\nMissing arguments.\n\nUsage:\nnode renameFileExtensions.js './dist/**/*.js' './dest-dir' .new.extension.js`,
+  );
+  process.exit(1);
+}
+
+const tempDirectory = fs.mkdtempSync(`${tmpDir}${path.sep}`);
+
+copy(src, tempDirectory, (error, files) => {
+  if (error) {
+    throw error;
+  }
+  files.forEach(file => {
+    if (file.dest) {
+      const srcExt = path.parse(file.dest).ext;
+      const destinationPath = file.dest
+        .replace(srcExt, destExtension)
+        .replace(tempDirectory, dest);
+      fs.renameSync(file.dest, path.resolve(destinationPath));
+    }
+  });
+});
diff --git a/tsconfig.base.json → resources/tsconfig.base.cjs.json b/tsconfig.base.json → resources/tsconfig.base.cjs.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "composite": false,
+    "composite": true,
     "target": "esnext",
     "module": "commonjs",
     "moduleResolution": "node",

diff --git a/resources/tsconfig.base.esm.json b/resources/tsconfig.base.esm.json
@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.base.cjs.json",
+  "compilerOptions": {
+    "module": "esnext"
+  }
+}
diff --git a/resources/tsconfig.build.cjs.json b/resources/tsconfig.build.cjs.json
@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "composite": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "../packages/graphql-language-service-utils"
+    },
+    {
+      "path": "../packages/graphql-language-service-types"
+    },
+    {
+      "path": "../packages/graphql-language-service-parser"
+    },
+    {
+      "path": "../packages/graphql-language-service-interface"
+    }
+  ]
+}
diff --git a/resources/tsconfig.build.esm.json b/resources/tsconfig.build.esm.json
@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "composite": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "../packages/graphql-language-service-utils/tsconfig.esm.json"
+    },
+    {
+      "path": "../packages/graphql-language-service-types/tsconfig.esm.json"
+    },
+    {
+      "path": "../packages/graphql-language-service-parser/tsconfig.esm.json"
+    },
+    {
+      "path": "../packages/graphql-language-service-interface/tsconfig.esm.json"
+    }
+  ]
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -6,16 +6,10 @@
   "include": [],
   "references": [
     {
-      "path": "packages/graphql-language-service-utils"
+      "path": "resources/tsconfig.build.esm.json"
     },
     {
-      "path": "packages/graphql-language-service-types"
-    },
-    {
-      "path": "packages/graphql-language-service-parser"
-    },
-    {
-      "path": "packages/graphql-language-service-interface"
+      "path": "resources/tsconfig.build.cjs.json"
     }
   ]
 }