Merge pull request #12 from grafana/elliot/remove-module

removing type module from package jsons

Author: eskirk

.gitignore

@@ -6,4 +6,5 @@ src/index.d.ts
 yalc.lock
 .yalc
 .npmrc
-lerna-debug.log
+lerna-debug.log
+.DS_Store

packages/faro-bundlers-shared/tsconfig.json

@@ -3,6 +3,7 @@
   "extends": "@grafana/tsconfig",
   "include": ["./**/*", "../package.json"],
   "compilerOptions": {
+    "sourceMap": true,
     "esModuleInterop": true
   }
 }

packages/faro-rollup/package.json

@@ -2,8 +2,8 @@
   "name": "@grafana/faro-rollup-plugin",
   "version": "0.0.14",
   "description": "Upload a source map to the Faro source map API from a Rollup build pipeline",
-  "type": "module",
   "main": "dist/cjs/index.js",
+  "types": "dist/cjs/index.d.ts",
   "module": "dist/esm/index.mjs",
   "repository": {
     "type": "git",
@@ -14,7 +14,7 @@
   "author": "Grafana Labs",
   "scripts": {
     "build": "rollup --config rollup.config.mjs",
-    "test": "ava src/index.test.js"
+    "test": "ava src/index.test.mjs"
   },
   "devDependencies": {
     "ava": "^3.8.1"

packages/faro-rollup/rollup.config.mjs

@@ -35,7 +35,7 @@ export default {
       extensions,
       babelHelpers: "bundled",
       include: ["src/**/*"],
-      exclude: [/node_modules/, /test/, "*.test.ts"]
+      exclude: [/node_modules/, /test/]
     }),
     json(),
     resolve({
@@ -45,7 +45,6 @@ export default {
     }),
     commonjs({
       include: /node_modules/,
-      exclude: "*.test.ts"
     }),
   ],
 };

packages/faro-rollup/src/index.test.js packages/faro-rollup/src/index.test.mjs

@@ -1,6 +1,6 @@
 import test from 'ava';
 import { rollup } from 'rollup';
-import config from './test/rollup.config.cjs';
+import { config } from './test/rollup.config.mjs';
 
 test('rollup', async t => {
   const bundle = await rollup(config);

packages/faro-rollup/src/test/package.json

@@ -2,8 +2,9 @@
   "name": "webpack-test-app",
   "version": "1.0.0",
   "main": "index.js",
+  "type": "module",
   "scripts": {
-    "build": "rollup --config rollup.config.cjs"
+    "build": "rollup --config rollup.config.js"
   },
   "dependencies": {
     "@grafana/faro-rollup-plugin": "^0.0.12"

packages/faro-rollup/src/test/rollup.config.cjs packages/faro-rollup/src/test/rollup.config.mjs

@@ -1,6 +1,6 @@
-const faroUploader = require('@grafana/faro-rollup-plugin');
+import faroUploader from '@grafana/faro-rollup-plugin';
 
-module.exports =
+export const config =
 {
   input: "./src/test/main.js",
   output: {
@@ -16,4 +16,6 @@ module.exports =
       bundleId: 'test'
     })
   ]
-};
+};
+
+export default config;

packages/faro-rollup/tsconfig.json

@@ -3,6 +3,7 @@
   "extends": "@grafana/tsconfig",
   "include": ["./**/*", "../package.json"],
   "compilerOptions": {
+    "sourceMap": true,
     "esModuleInterop": true
   }
 }

packages/faro-webpack/package.json

@@ -2,8 +2,8 @@
   "name": "@grafana/faro-webpack-plugin",
   "version": "0.0.14",
   "description": "Upload a source map to the Faro source map API from a Webpack build pipeline ",
-  "type": "module",
   "main": "dist/cjs/index.js",
+  "types": "dist/cjs/index.d.ts",
   "module": "dist/esm/index.mjs",
   "repository": {
     "type": "git",
@@ -14,7 +14,7 @@
   "author": "Grafana Labs",
   "scripts": {
     "build": "rollup --config rollup.config.mjs",
-    "test": "ava src/index.test.js"
+    "test": "ava src/index.test.mjs"
   },
   "dependencies": {
     "@grafana/faro-bundlers-shared": "^0.0.14",

packages/faro-webpack/src/index.test.js packages/faro-webpack/src/index.test.mjs

@@ -1,7 +1,6 @@
 {
   "name": "webpack-test-app",
   "version": "1.0.0",
-  "type": "module",
   "main": "index.js",
   "scripts": {
     "build": "webpack"

packages/faro-webpack/src/test/package.json

@@ -1,7 +1,7 @@
 import FaroSourcemapUploaderPlugin from '@grafana/faro-webpack-plugin';
 import path from 'path';
 
-const config = {
+export const config = {
   entry: {
     module: './main.cjs'
   },

packages/faro-webpack/src/test/webpack.config.js packages/faro-webpack/src/test/webpack.config.mjs

@@ -5,6 +5,7 @@
   "rootDir": "./src",
   "declaration": true,
   "compilerOptions": {
+    "sourceMap": true,
     "esModuleInterop": true
   }
 }