Update micromatch dependency (#60)

lukastaegert · web-flow · commit dcbcae11a481 · 2019-05-30T10:21:39.000+02:00
* Update micromatch dependency

* Include bundled micromatch

* Test actually distributed code

* Improve config
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,17 +15,20 @@
     "@types/estree": "0.0.39",
     "@types/jest": "^24.0.13",
     "@types/micromatch": "^3.1.0",
-    "@types/node": "^12.0.2",
+    "@types/node": "^12.0.3",
     "husky": "^2.3.0",
     "jest": "^24.8.0",
     "lint-staged": "^8.1.7",
+    "micromatch": "^4.0.2",
     "prettier": "^1.17.1",
-    "rollup": "^1.12.1",
+    "rollup": "^1.12.4",
+    "rollup-plugin-commonjs": "^10.0.0",
+    "rollup-plugin-node-resolve": "^5.0.0",
     "rollup-plugin-typescript": "^1.0.1",
     "shx": "^0.3.2",
     "ts-jest": "^24.0.2",
     "tslint": "^5.16.0",
-    "typescript": "^3.4.5",
+    "typescript": "^3.5.1",
     "typescript-eslint-parser": "^22.0.0"
   },
   "scripts": {
@@ -38,8 +41,7 @@
     "prepare": "npm run build"
   },
   "dependencies": {
-    "estree-walker": "^0.6.0",
-    "micromatch": "^3.1.10"
+    "estree-walker": "^0.6.1"
   },
   "repository": "rollup/rollup-pluginutils",
   "keywords": [
diff --git a/rollup.config.js b/rollup.config.js
@@ -1,10 +1,16 @@
 import pkg from './package.json';
 import typescript from 'rollup-plugin-typescript';
+import resolve from 'rollup-plugin-node-resolve';
+import commonjs from 'rollup-plugin-commonjs';
 
 export default {
 	input: 'src/index.ts',
-	plugins: [ typescript() ],
-	external: [ 'path', 'estree-walker', 'micromatch', 'tosource' ],
+	plugins: [
+		resolve(),
+		commonjs({ include: 'node_modules/**' }),
+		typescript({ include: '**/*.{ts,js}' })
+	],
+	external: ['estree-walker', 'path', 'util'],
 
 	output: [
 		{
diff --git a/src/createFilter.ts b/src/createFilter.ts
@@ -1,4 +1,4 @@
-import * as mm from 'micromatch';
+import mm from 'micromatch';
 import { resolve, sep } from 'path';
 import { CreateFilter } from './pluginutils';
 import ensureArray from './utils/ensureArray';
diff --git a/test/addExtension.test.ts b/test/addExtension.test.ts
@@ -1,4 +1,4 @@
-import { addExtension } from '../src/index';
+import { addExtension } from '..';
 
 describe('addExtension', function() {
 	it('adds .js to an ID without an extension', function() {
diff --git a/test/attachScopes.test.ts b/test/attachScopes.test.ts
@@ -1,4 +1,4 @@
-import { attachScopes } from '../src/index';
+import { attachScopes } from '..';
 
 describe('attachScopes', function() {
 	it('attaches a scope to the top level', function() {
diff --git a/test/createFilter.test.ts b/test/createFilter.test.ts
@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { createFilter } from '../src/index';
+import { createFilter } from '..';
 
 describe('createFilter', function() {
 	it('includes by default', function() {
diff --git a/test/dataToEsm.test.ts b/test/dataToEsm.test.ts
@@ -1,4 +1,4 @@
-import { dataToEsm } from '../src/index';
+import { dataToEsm } from '..';
 
 describe('dataToEsm', function() {
 	it('outputs treeshakeable data', function() {
diff --git a/test/extractAssignedNames.test.ts b/test/extractAssignedNames.test.ts
@@ -1,4 +1,4 @@
-import { extractAssignedNames } from '../src/index';
+import { extractAssignedNames } from '..';
 
 describe('extractAssignedNames', function() {
 	it('extracts an Identifier', function() {
diff --git a/test/makeLegalIdentifier.test.ts b/test/makeLegalIdentifier.test.ts
@@ -1,4 +1,4 @@
-import { makeLegalIdentifier } from '../src/index';
+import { makeLegalIdentifier } from '..';
 
 describe('makeLegalIdentifier', function() {
 	it('camel-cases names', function() {
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,13 +1,13 @@
 {
   "compilerOptions": {
     /* Basic Options */
-    "target": "es5",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
+    "target": "es2015",                       /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
     "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
-    // "lib": [],                             /* Specify library files to be included in the compilation. */
+    "lib": ["es6"],                           /* Specify library files to be included in the compilation. */
     // "allowJs": true,                       /* Allow javascript files to be compiled. */
     // "checkJs": true,                       /* Report errors in .js files. */
     // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
-    "declaration": true,                      /* Generates corresponding '.d.ts' file. */
+    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
     // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
     "sourceMap": true,                        /* Generates corresponding '.map' file. */
     // "outFile": "./",                       /* Concatenate and emit output to single file. */
@@ -57,4 +57,4 @@
     // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import * as mm from 'micromatch';`
	`1`	`+import mm from 'micromatch';`
`2`	`2`	`import { resolve, sep } from 'path';`
`3`	`3`	`import { CreateFilter } from './pluginutils';`
`4`	`4`	`import ensureArray from './utils/ensureArray';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { addExtension } from '../src/index';`
	`1`	`+import { addExtension } from '..';`
`2`	`2`
`3`	`3`	`describe('addExtension', function() {`
`4`	`4`	`it('adds .js to an ID without an extension', function() {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { attachScopes } from '../src/index';`
	`1`	`+import { attachScopes } from '..';`
`2`	`2`
`3`	`3`	`describe('attachScopes', function() {`
`4`	`4`	`it('attaches a scope to the top level', function() {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { dataToEsm } from '../src/index';`
	`1`	`+import { dataToEsm } from '..';`
`2`	`2`
`3`	`3`	`describe('dataToEsm', function() {`
`4`	`4`	`it('outputs treeshakeable data', function() {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { extractAssignedNames } from '../src/index';`
	`1`	`+import { extractAssignedNames } from '..';`
`2`	`2`
`3`	`3`	`describe('extractAssignedNames', function() {`
`4`	`4`	`it('extracts an Identifier', function() {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { makeLegalIdentifier } from '../src/index';`
	`1`	`+import { makeLegalIdentifier } from '..';`
`2`	`2`
`3`	`3`	`describe('makeLegalIdentifier', function() {`
`4`	`4`	`it('camel-cases names', function() {`