FredKSchott · FredKSchott · Feb 5, 2020 · Feb 4, 2020 · Feb 5, 2020 · FredKSchott
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,4 @@ www/index.md
 www/dist
 /node_modules
 /web_modules
-__tests__/**/*/web_modules
+__tests__/integration/*/web_modules
diff --git a/__tests__/babel-plugin/__fixtures__/addVersion/options.json b/__tests__/babel-plugin/__fixtures__/addVersion/options.json
diff --git a/__tests__/babel-plugin/__fixtures__/addVersion/output.js b/__tests__/babel-plugin/__fixtures__/addVersion/output.js
diff --git a/__tests__/babel-plugin/__fixtures__/dir/options.json b/__tests__/babel-plugin/__fixtures__/dir/options.json
diff --git a/__tests__/babel-plugin/__fixtures__/dir/output.js b/__tests__/babel-plugin/__fixtures__/dir/output.js
diff --git a/__tests__/babel-plugin/__fixtures__/optionalExtensions/code.js b/__tests__/babel-plugin/__fixtures__/optionalExtensions/code.js
diff --git a/__tests__/babel-plugin/__fixtures__/optionalExtensions/output.js b/__tests__/babel-plugin/__fixtures__/optionalExtensions/output.js
diff --git a/...gin/node_modules/example-dep/package.json → ...cwd/node_modules/example-dep/package.json b/...gin/node_modules/example-dep/package.json → ...cwd/node_modules/example-dep/package.json
diff --git a/...-plugin/node_modules/example-dep/test.cjs → ...gin/cwd/node_modules/example-dep/test.cjs b/...-plugin/node_modules/example-dep/test.cjs → ...gin/cwd/node_modules/example-dep/test.cjs
diff --git a/...-plugin/node_modules/example-dep/test.mjs → ...gin/cwd/node_modules/example-dep/test.mjs b/...-plugin/node_modules/example-dep/test.mjs → ...gin/cwd/node_modules/example-dep/test.mjs
diff --git a/__tests__/babel-plugin/cwd/web_modules/import-map.json b/__tests__/babel-plugin/cwd/web_modules/import-map.json
@@ -0,0 +1,5 @@
+{
+  "imports": {
+    "example-dep": "./example-dep.js"
+  }
+}
diff --git a/__tests__/babel-plugin/cwd/web_modules/import-map.test.json b/__tests__/babel-plugin/cwd/web_modules/import-map.test.json
@@ -0,0 +1,5 @@
+{
+  "imports": {
+    "example-dep": "./example-dep.js?from=import-map.test.json"
+  }
+}
diff --git a/__tests__/babel-plugin/cwd/web_modules_custom_dir/import-map.json b/__tests__/babel-plugin/cwd/web_modules_custom_dir/import-map.json
@@ -0,0 +1,5 @@
+{
+  "imports": {
+    "example-dep": "./test_val/example-dep.js"
+  }
+}
diff --git a/...el-plugin/__fixtures__/addVersion/code.js → __tests__/babel-plugin/fixtures/dir/code.js b/...el-plugin/__fixtures__/addVersion/code.js → __tests__/babel-plugin/fixtures/dir/code.js
diff --git a/__tests__/babel-plugin/fixtures/dir/options.json b/__tests__/babel-plugin/fixtures/dir/options.json
@@ -0,0 +1,3 @@
+{
+    "dir": "web_modules_custom_dir"
+}
diff --git a/__tests__/babel-plugin/fixtures/dir/output.js b/__tests__/babel-plugin/fixtures/dir/output.js
@@ -0,0 +1 @@
+import module from '/web_modules_custom_dir/test_val/example-dep.js';
diff --git a/...s__/babel-plugin/__fixtures__/dir/code.js → ..._/babel-plugin/fixtures/importMap/code.js b/...s__/babel-plugin/__fixtures__/dir/code.js → ..._/babel-plugin/fixtures/importMap/code.js
diff --git a/__tests__/babel-plugin/fixtures/importMap/options.json b/__tests__/babel-plugin/fixtures/importMap/options.json
@@ -0,0 +1,3 @@
+{
+    "importMap": "import-map.test.json"
+}
diff --git a/__tests__/babel-plugin/fixtures/importMap/output.js b/__tests__/babel-plugin/fixtures/importMap/output.js
@@ -0,0 +1 @@
+import module from '/web_modules/example-dep.js?from=import-map.test.json';
diff --git a/...abel-plugin/__fixtures__/noOption/code.js → ...__/babel-plugin/fixtures/noOption/code.js b/...abel-plugin/__fixtures__/noOption/code.js → ...__/babel-plugin/fixtures/noOption/code.js
diff --git a/...plugin/__fixtures__/noOption/options.json → ...bel-plugin/fixtures/noOption/options.json b/...plugin/__fixtures__/noOption/options.json → ...bel-plugin/fixtures/noOption/options.json
diff --git a/...el-plugin/__fixtures__/noOption/output.js → .../babel-plugin/fixtures/noOption/output.js b/...el-plugin/__fixtures__/noOption/output.js → .../babel-plugin/fixtures/noOption/output.js
diff --git a/__tests__/babel-plugin/fixtures/optionalExtensions/code.js b/__tests__/babel-plugin/fixtures/optionalExtensions/code.js
@@ -0,0 +1 @@
+import module from './any/local/file';
diff --git a/...ixtures__/optionalExtensions/options.json → .../fixtures/optionalExtensions/options.json b/...ixtures__/optionalExtensions/options.json → .../fixtures/optionalExtensions/options.json
diff --git a/__tests__/babel-plugin/fixtures/optionalExtensions/output.js b/__tests__/babel-plugin/fixtures/optionalExtensions/output.js
@@ -0,0 +1 @@
+import module from './any/local/file.js';
diff --git a/__tests__/babel-plugin/runner.js b/__tests__/babel-plugin/runner.js
@@ -2,10 +2,10 @@ const path = require('path');
 const pluginTester = require('babel-plugin-tester').default;
 const babelPlugin = require('../../assets/babel-plugin.js');
 
-process.chdir(__dirname);
+process.chdir(path.join(__dirname, 'cwd'));
 
 pluginTester({
   plugin: babelPlugin,
   pluginName: 'snowpack/assets/babel-plugin.js',
-  fixtures: path.join(__dirname, '__fixtures__'),
+  fixtures: path.join(__dirname, 'fixtures'),
 });
diff --git a/__tests__/integration/dep-list-complex/expected-install/import-map.json b/__tests__/integration/dep-list-complex/expected-install/import-map.json
@@ -1,5 +1,5 @@
 {
   "imports": {
-    "dat.gui": "./dat.gui.js"
+    "dat.gui": "./dat.gui.js?rev=XXXXXXXXXX"
   }
 }