fix: create shared directory (#117)

netlify · Sep 14, 2022 · 9a21c18 · 9a21c18
1 parent 8fabd91
commit 9a21c18
Show file tree

Hide file tree

Showing 36 changed files with 26 additions and 26 deletions.
diff --git a/deno/lib/stage2.ts b/deno/lib/stage2.ts
@@ -2,7 +2,7 @@ import { build, LoadResponse } from 'https://deno.land/x/[email protected]/mod.ts'
 
 import * as path from 'https://deno.land/[email protected]/path/mod.ts'
 
-import type { InputFunction, WriteStage2Options } from '../../src/stage2.ts'
+import type { InputFunction, WriteStage2Options } from '../../shared/stage2.ts'
 import { PUBLIC_SPECIFIER, STAGE2_SPECIFIER, virtualRoot } from './consts.ts'
 import { inlineModule, loadFromVirtualRoot, loadWithRetry } from './common.ts'
 

diff --git a/src/bridge.ts → node/bridge.ts b/src/bridge.ts → node/bridge.ts
diff --git a/src/bundle.ts → node/bundle.ts b/src/bundle.ts → node/bundle.ts
diff --git a/src/bundle_error.ts → node/bundle_error.ts b/src/bundle_error.ts → node/bundle_error.ts
diff --git a/src/bundler.ts → node/bundler.ts b/src/bundler.ts → node/bundler.ts
diff --git a/src/declaration.ts → node/declaration.ts b/src/declaration.ts → node/declaration.ts
diff --git a/src/downloader.ts → node/downloader.ts b/src/downloader.ts → node/downloader.ts
diff --git a/src/edge_function.ts → node/edge_function.ts b/src/edge_function.ts → node/edge_function.ts
diff --git a/src/feature_flags.ts → node/feature_flags.ts b/src/feature_flags.ts → node/feature_flags.ts
diff --git a/src/finder.ts → node/finder.ts b/src/finder.ts → node/finder.ts
diff --git a/src/formats/eszip.ts → node/formats/eszip.ts b/src/formats/eszip.ts → node/formats/eszip.ts
@@ -1,12 +1,12 @@
 import { join, resolve } from 'path'
 import { fileURLToPath } from 'url'
 
+import type { WriteStage2Options } from '../../shared/stage2.js'
 import { DenoBridge } from '../bridge.js'
 import type { Bundle } from '../bundle.js'
 import { wrapBundleError } from '../bundle_error.js'
 import { EdgeFunction } from '../edge_function.js'
 import { ImportMap } from '../import_map.js'
-import type { WriteStage2Options } from '../stage2.js'
 import { getFileHash } from '../utils/sha256.js'
 
 interface BundleESZIPOptions {

diff --git a/src/formats/javascript.ts → node/formats/javascript.ts b/src/formats/javascript.ts → node/formats/javascript.ts
diff --git a/src/home_path.ts → node/home_path.ts b/src/home_path.ts → node/home_path.ts
diff --git a/src/import_map.ts → node/import_map.ts b/src/import_map.ts → node/import_map.ts
diff --git a/src/index.ts → node/index.ts b/src/index.ts → node/index.ts
diff --git a/src/logger.ts → node/logger.ts b/src/logger.ts → node/logger.ts
diff --git a/src/manifest.ts → node/manifest.ts b/src/manifest.ts → node/manifest.ts
diff --git a/src/package_json.ts → node/package_json.ts b/src/package_json.ts → node/package_json.ts
diff --git a/src/platform.ts → node/platform.ts b/src/platform.ts → node/platform.ts
diff --git a/src/server/server.ts → node/server/server.ts b/src/server/server.ts → node/server/server.ts
diff --git a/src/server/util.ts → node/server/util.ts b/src/server/util.ts → node/server/util.ts
diff --git a/src/types.ts → node/types.ts b/src/types.ts → node/types.ts
diff --git a/src/utils/non_nullable.ts → node/utils/non_nullable.ts b/src/utils/non_nullable.ts → node/utils/non_nullable.ts
diff --git a/src/utils/sha256.ts → node/utils/sha256.ts b/src/utils/sha256.ts → node/utils/sha256.ts
diff --git a/package.json b/package.json
@@ -3,12 +3,13 @@
   "version": "2.0.1",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
-  "main": "./dist/index.js",
-  "exports": "./dist/index.js",
+  "main": "./dist/node/index.js",
+  "exports": "./dist/node/index.js",
   "files": [
     "deno/**",
     "dist/**/*.js",
-    "dist/**/*.d.ts"
+    "dist/**/*.d.ts",
+    "shared/**"
   ],
   "scripts": {
     "build": "tsc",
@@ -30,8 +31,8 @@
     "test:ci:ava": "nyc -r lcovonly -r text -r json ava"
   },
   "config": {
-    "eslint": "--ignore-path .gitignore --cache --format=codeframe --max-warnings=0 \"{src,scripts,.github}/**/*.{js,ts,md,html}\" \"*.{js,ts,md,html}\"",
-    "prettier": "--ignore-path .gitignore --loglevel=warn \"{src,scripts,.github}/**/*.{js,ts,md,yml,json,html}\" \"*.{js,ts,yml,json,html}\" \".*.{js,ts,yml,json,html}\" \"!**/package-lock.json\" \"!package-lock.json\""
+    "eslint": "--ignore-path .gitignore --cache --format=codeframe --max-warnings=0 \"{node,scripts,.github}/**/*.{js,ts,md,html}\" \"*.{js,ts,md,html}\"",
+    "prettier": "--ignore-path .gitignore --loglevel=warn \"{node,scripts,.github}/**/*.{js,ts,md,yml,json,html}\" \"*.{js,ts,yml,json,html}\" \".*.{js,ts,yml,json,html}\" \"!**/package-lock.json\" \"!package-lock.json\""
   },
   "ava": {
     "files": [

diff --git a/src/stage2.ts → shared/stage2.ts b/src/stage2.ts → shared/stage2.ts
diff --git a/test/bootstrap.ts b/test/bootstrap.ts
@@ -4,7 +4,7 @@ import { env } from 'process'
 import test from 'ava'
 import fetch, { Headers } from 'node-fetch'
 
-import { getBootstrapURL } from '../src/formats/javascript.js'
+import { getBootstrapURL } from '../node/formats/javascript.js'
 
 test.serial('Imports the bootstrap layer from a valid URL', async (t) => {
   const importURL = new URL(getBootstrapURL())

diff --git a/test/bridge.ts b/test/bridge.ts
@@ -9,8 +9,8 @@ import nock from 'nock'
 import { spy } from 'sinon'
 import tmp, { DirectoryResult } from 'tmp-promise'
 
-import { DenoBridge } from '../src/bridge.js'
-import { getPlatformTarget } from '../src/platform.js'
+import { DenoBridge } from '../node/bridge.js'
+import { getPlatformTarget } from '../node/platform.js'
 
 const require = createRequire(import.meta.url)
 const archiver = require('archiver')

diff --git a/test/bundler.ts b/test/bundler.ts
@@ -5,8 +5,8 @@ import { fileURLToPath, pathToFileURL } from 'url'
 import test from 'ava'
 import tmp from 'tmp-promise'
 
-import { BundleError } from '../src/bundle_error.js'
-import { bundle, BundleOptions } from '../src/bundler.js'
+import { BundleError } from '../node/bundle_error.js'
+import { bundle, BundleOptions } from '../node/bundler.js'
 
 const url = new URL(import.meta.url)
 const dirname = fileURLToPath(url)

diff --git a/test/downloader.ts b/test/downloader.ts
@@ -8,12 +8,11 @@ import { execa } from 'execa'
 import nock from 'nock'
 import tmp from 'tmp-promise'
 
-import { download } from '../src/downloader.js'
-import { getLogger } from '../src/logger.js'
-import { getPlatformTarget } from '../src/platform.js'
+import { download } from '../node/downloader.js'
+import { getLogger } from '../node/logger.js'
+import { getPlatformTarget } from '../node/platform.js'
 
-const testLogger = getLogger(() => {
-})
+const testLogger = getLogger(() => {})
 
 const streamError = () => {
   const stream = new PassThrough()

diff --git a/test/import_map.ts b/test/import_map.ts
@@ -1,6 +1,6 @@
 import test from 'ava'
 
-import { ImportMap } from '../src/import_map.js'
+import { ImportMap } from '../node/import_map.js'
 
 test('Handles import maps with full URLs without specifying a base URL', (t) => {
   const inputFile1 = {

diff --git a/test/logger.ts b/test/logger.ts
@@ -1,7 +1,7 @@
 import test from 'ava'
 import { stub } from 'sinon'
 
-import { getLogger } from '../src/logger.js'
+import { getLogger } from '../node/logger.js'
 
 const consoleLog = console.log
 

diff --git a/test/main.ts b/test/main.ts
@@ -9,8 +9,8 @@ import nock from 'nock'
 import { spy } from 'sinon'
 import tmp from 'tmp-promise'
 
-import { DenoBridge } from '../src/bridge.js'
-import { getPlatformTarget } from '../src/platform.js'
+import { DenoBridge } from '../node/bridge.js'
+import { getPlatformTarget } from '../node/platform.js'
 
 const require = createRequire(import.meta.url)
 const archiver = require('archiver')

diff --git a/test/manifest.ts b/test/manifest.ts
@@ -2,7 +2,7 @@ import { env } from 'process'
 
 import test from 'ava'
 
-import { generateManifest } from '../src/manifest.js'
+import { generateManifest } from '../node/manifest.js'
 
 test('Generates a manifest with different bundles', (t) => {
   const bundle1 = {

diff --git a/test/types.ts b/test/types.ts
@@ -6,9 +6,9 @@ import nock from 'nock'
 import { stub } from 'sinon'
 import tmp from 'tmp-promise'
 
-import { DenoBridge } from '../src/bridge.js'
-import { getLogger } from '../src/logger.js'
-import { ensureLatestTypes } from '../src/types.js'
+import { DenoBridge } from '../node/bridge.js'
+import { getLogger } from '../node/logger.js'
+import { ensureLatestTypes } from '../node/types.js'
 
 const testLogger = getLogger(() => {
   // no-op

diff --git a/tsconfig.json b/tsconfig.json
@@ -65,5 +65,5 @@
     "skipLibCheck": true /* Skip type checking of declaration files. */,
     "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
   },
-  "include": ["src"]
+  "include": ["node", "shared"]
 }