Revert "chore: update Deno import maps on release (remix-run#3225)" (r…

…emix-run#3254) This reverts commit c28e179.
justjavac · Jun 11, 2022 · e37e1f9 · e37e1f9
1 parent 91d92f0
commit e37e1f9
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 91 deletions.
diff --git a/.vscode/deno_resolve_npm_imports.json b/.vscode/deno_resolve_npm_imports.json
@@ -7,7 +7,7 @@
   "// Deno-only dependencies may be imported via URL imports (without using import maps).": "",
 
   "imports": {
-    "@remix-run/server-runtime": "https://esm.sh/@remix-run/[email protected].0",
-    "mime": "https://esm.sh/[email protected]"
+    "mime": "https://esm.sh/[email protected].0",
+    "@remix-run/server-runtime": "https://esm.sh/@remix-run/[email protected]"
   }
 }
diff --git a/contributors.yml b/contributors.yml
@@ -158,7 +158,6 @@
 - jesse-deboer
 - jesseflorig
 - jgarrow
-- jiahao-c
 - jkup
 - jmasson
 - JNaftali

diff --git a/packages/remix-deno/README.md b/packages/remix-deno/README.md
@@ -7,7 +7,7 @@ For more, see the [Remix docs](https://remix.run/docs/).
 ## Install
 
 Installation is done via `npm`, but the code itself is Deno source code.
-Read more about [why we use `npm` to manage dependencies for Deno projects](https://github.com/remix-run/remix/blob/main/decisions/0001-use-npm-to-manage-npm-dependencies-for-deno-projects.md) in Remix.
+Read more about [why we use `npm` to manage dependencies for Deno projects](https://github.com/remix-run/remix/blob/main/docs/decisions/0001-use-npm-to-manage-npm-dependencies-for-deno-projects.md) in Remix.
 
 ```sh
 npm install @remix-run/deno

diff --git a/packages/remix-server-runtime/README.md b/packages/remix-server-runtime/README.md
@@ -10,7 +10,7 @@ Support for each runtime is provided by a corresponding Remix package:
 
 - [`@remix-run/node`](https://github.com/remix-run/remix/tree/main/packages/remix-node)
 - [`@remix-run/cloudflare`](https://github.com/remix-run/remix/tree/main/packages/remix-cloudflare)
-- [`@remix-run/deno`](https://github.com/remix-run/remix/tree/main/packages/remix-deno)
+- [`remix-deno`](https://github.com/remix-run/remix/tree/main/templates/deno/remix-deno) (will be renamed to `@remix-run/deno` when Deno support is stable)
 
 This package defines a "Remix server runtime interface" that each runtime package must conform to.
 

diff --git a/scripts/utils.js b/scripts/utils.js
@@ -176,52 +176,6 @@ async function updateDeploymentScriptVersion(nextVersion) {
   );
 }
 
-/**
- * @param {string} importSpecifier
- * @returns {[string, string]} [packageName, importPath]
- */
-const getPackageNameFromImportSpecifier = (importSpecifier) => {
-  if (importSpecifier.startsWith("@")) {
-    let [scope, pkg, ...path] = importSpecifier.split("/");
-    return [`${scope}/${pkg}`, path.join("/")];
-  }
-
-  let [pkg, ...path] = importSpecifier.split("/");
-  return [pkg, path.join("/")];
-};
-/**
- * @param {string} importMapPath
- * @param {string} nextVersion
- */
-const updateDenoImportMap = async (importMapPath, nextVersion) => {
-  let { imports, ...json } = await jsonfile.readFile(importMapPath);
-  let remixPackagesFull = remixPackages.all.map(
-    (remixPackage) => `@remix-run/${remixPackage}`
-  );
-
-  let newImports = Object.fromEntries(
-    Object.entries(imports).map(([importName, path]) => {
-      let [packageName, importPath] =
-        getPackageNameFromImportSpecifier(importName);
-
-      return remixPackagesFull.includes(packageName)
-        ? [
-            importName,
-            `https://esm.sh/${packageName}@${nextVersion}${
-              importPath ? `/${importPath}` : ""
-            }`,
-          ]
-        : [importName, path];
-    })
-  );
-
-  return jsonfile.writeFile(
-    importMapPath,
-    { ...json, imports: newImports },
-    { spaces: 2 }
-  );
-};
-
 /**
  * @param {string} nextVersion
  */
@@ -233,16 +187,6 @@ async function incrementRemixVersion(nextVersion) {
     await updateRemixVersion(`remix-${name}`, nextVersion);
   }
 
-  // Update version numbers in Deno's import maps
-  await Promise.all(
-    [
-      path.join(".vscode", "deno_resolve_npm_imports.json"),
-      path.join("templates", "deno", ".vscode", "resolve_npm_imports.json"),
-    ].map((importMapPath) =>
-      updateDenoImportMap(path.join(rootDir, importMapPath), nextVersion)
-    )
-  );
-
   // Update versions in the examples
   await updateExamplesRemixVersion(nextVersion);
 

diff --git a/templates/deno/.gitignore b/templates/deno/.gitignore
@@ -1,6 +1,5 @@
-node_modules
+/node_modules/
 
 /.cache
 /build
-/public/build
-.env
+/public/build
diff --git a/templates/deno/.vscode/resolve_npm_imports.json b/templates/deno/.vscode/resolve_npm_imports.json
@@ -5,11 +5,11 @@
   "// Deno-only dependencies may be imported via URL imports (without using import maps).": "",
 
   "imports": {
-    "@remix-run/deno": "https://esm.sh/@remix-run/[email protected].0",
-    "@remix-run/dev/server-build": "https://esm.sh/@remix-run/[email protected]/server-build",
-    "@remix-run/react": "https://esm.sh/@remix-run/react@1.5.0",
-    "react": "https://esm.sh/[email protected]",
-    "react-dom": "https://esm.sh/[email protected]",
-    "react-dom/server": "https://esm.sh/[email protected]/server"
+    "react": "https://esm.sh/[email protected].0",
+    "react-dom": "https://esm.sh/[email protected]",
+    "react-dom/server": "https://esm.sh/react[email protected]/server",
+    "@remix-run/dev/server-build": "https://esm.sh/@remix-run/[email protected]/server-build",
+    "@remix-run/deno": "https://esm.sh/@remix-run/[email protected]",
+    "@remix-run/react": "https://esm.sh/@remix-run/[email protected]"
   }
 }
diff --git a/templates/deno/.vscode/settings.json b/templates/deno/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
   "deno.enable": true,
-  "deno.importMap": "./.vscode/resolve_npm_imports.json",
-  "deno.lint": true
+  "deno.lint": true,
+  "deno.importMap": "./.vscode/resolve_npm_imports.json"
 }
diff --git a/templates/deno/README.md b/templates/deno/README.md
@@ -12,7 +12,8 @@ npx create-remix@latest --template deno
 
 ## Managing dependencies
 
-Read about [how we recommend to manage dependencies for Remix projects using Deno](https://github.com/remix-run/remix/blob/main/decisions/0001-use-npm-to-manage-npm-dependencies-for-deno-projects.md).
+Read about [how we recommend to manage dependencies for Remix projects using Deno](https://github.com/remix-run/remix/blob/main/docs/decisions/0001-use-npm-to-manage-npm-dependencies-for-deno-projects.md
+).
 
 - ✅ You should use `npm` to install NPM packages
   ```sh

diff --git a/templates/deno/app/entry.client.tsx b/templates/deno/app/entry.client.tsx
@@ -1,5 +1,5 @@
+import React from "react";
+import ReactDOM from "react-dom";
 import { RemixBrowser } from "@remix-run/react";
-import * as React from "react";
-import { hydrate } from "react-dom";
 
-hydrate(<RemixBrowser />, document);
+ReactDOM.hydrate(<RemixBrowser />, document);
diff --git a/templates/deno/app/entry.server.tsx b/templates/deno/app/entry.server.tsx
@@ -1,7 +1,7 @@
-import type { EntryContext } from "@remix-run/deno";
-import { RemixServer } from "@remix-run/react";
-import * as React from "react";
+import React from "react";
 import { renderToString } from "react-dom/server";
+import { RemixServer } from "@remix-run/react";
+import type { EntryContext } from "@remix-run/deno";
 
 export default function handleRequest(
   request: Request,

diff --git a/templates/deno/app/root.tsx b/templates/deno/app/root.tsx
@@ -1,4 +1,4 @@
-import type { MetaFunction } from "@remix-run/deno";
+import React from "react";
 import {
   Links,
   LiveReload,
@@ -7,7 +7,7 @@ import {
   Scripts,
   ScrollRestoration,
 } from "@remix-run/react";
-import * as React from "react";
+import type { MetaFunction } from "@remix-run/deno";
 
 export const meta: MetaFunction = () => ({
   charset: "utf-8",

diff --git a/templates/deno/app/routes/index.tsx b/templates/deno/app/routes/index.tsx
@@ -1,4 +1,4 @@
-import * as React from "react";
+import React from "react";
 
 export default function Index() {
   return (

diff --git a/templates/deno/package.json b/templates/deno/package.json
@@ -5,11 +5,11 @@
     "build": "remix build",
     "deploy": "deployctl deploy --prod --include=build,public --project=<your deno deploy project> ./build/index.js",
     "dev": "remix build && run-p dev:*",
-    "dev:deno": "cross-env NODE_ENV=development deno run --unstable --watch --allow-net --allow-read --allow-env ./build/index.js",
     "dev:remix": "remix watch",
-    "format": "deno fmt --ignore=node_modules",
+    "dev:deno": "cross-env NODE_ENV=development deno run --unstable --watch --allow-net --allow-read --allow-env ./build/index.js",
+    "start": "cross-env NODE_ENV=production deno run --unstable --allow-net --allow-read --allow-env ./build/index.js",
     "lint": "deno lint --ignore=node_modules",
-    "start": "cross-env NODE_ENV=production deno run --unstable --allow-net --allow-read --allow-env ./build/index.js"
+    "format": "deno fmt --ignore=node_modules"
   },
   "dependencies": {
     "@remix-run/deno": "*",

diff --git a/templates/deno/remix.config.js b/templates/deno/remix.config.js
@@ -1,16 +1,12 @@
 module.exports = {
   serverBuildTarget: "deno",
   server: "./server.ts",
+
   /*
   If live reload causes page to re-render without changes (live reload is too fast),
   increase the dev server broadcast delay.
 
   If live reload seems slow, try to decrease the dev server broadcast delay.
   */
   devServerBroadcastDelay: 300,
-  ignoredRouteFiles: ["**/.*"],
-  // appDirectory: "app",
-  // assetsBuildDirectory: "public/build",
-  // serverBuildPath: "build/index.js",
-  // publicPath: "/build/",
 };
diff --git a/templates/vercel/.gitignore b/templates/vercel/.gitignore
@@ -8,4 +8,3 @@ node_modules
 /build/
 /public/build
 /api/index.js
-/api/index.js.map