Merge branch 'master' into feat-0.3-beta

Author: ije

commands/helpers/is-folder-empty.ts

@@ -0,0 +1,61 @@
+import { green, blue } from 'https://deno.land/[email protected]/fmt/colors.ts'
+import { join } from "https://deno.land/std/path/mod.ts"
+
+export default function (root: string, name: string): boolean {
+  const validFiles = [
+    '.DS_Store',
+    '.git',
+    '.gitattributes',
+    '.gitignore',
+    '.gitlab-ci.yml',
+    '.hg',
+    '.hgcheck',
+    '.hgignore',
+    '.idea',
+    '.travis.yml',
+    'LICENSE',
+    'Thumbs.db',
+    'docs',
+    'mkdocs.yml',
+  ]
+
+  const conflicts = []
+
+  for (const { name: file } of Deno.readDirSync(root)) {
+    // Support IntelliJ IDEA-based editors
+    if (validFiles.includes(file) || /\.iml$/.test(file)) {
+      conflicts.push(file)
+    }
+  }
+
+  if (conflicts.length > 0) {
+    console.log(
+      `The directory ${green(name)} contains files that could conflict:`
+    )
+    console.log()
+
+    for (const file of conflicts) {
+      try {
+        const stats = Deno.lstatSync(join(root, file))
+        if (stats.isDirectory) {
+          console.log(`  ${blue(file)}/`)
+        } else {
+          console.log(`  ${file}`)
+        }
+      } catch {
+        console.log(`  ${file}`)
+      }
+    }
+
+    console.log()
+    console.log(
+      'Either try using a new directory name, or remove the files listed above.'
+    )
+    console.log()
+
+    return false
+  }
+
+  return true
+
+}

commands/init.ts

@@ -8,6 +8,7 @@ import util from '../shared/util.ts'
 import { defaultReactVersion } from '../shared/constants.ts'
 import { VERSION } from '../version.ts'
 import { deno_x_brotli, deno_x_flate } from '../server/compress.ts'
+import isFolderEmpty from './helpers/is-folder-empty.ts';
 
 export const helpMessage = `
 Usage:
@@ -28,6 +29,10 @@ export default async function (nameArg?: string) {
     return
   }
 
+  if (!isFolderEmpty(cwd, name)) {
+    Deno.exit(1)
+  }
+
   const template = 'hello-world' // todo: add template select ui
   const vscode = await confirm('Add recommended workspace settings of VS Code?')
 

framework/react/helper.ts

@@ -6,29 +6,10 @@ const REACT_MEMO_TYPE = symbolFor ? Symbol.for('react.memo') : 0xead3
 
 export const inDeno = typeof Deno !== 'undefined' && typeof Deno.version?.deno === 'string'
 
-export function isLikelyReactComponent(type: any, strict = true): Boolean {
+export function isLikelyReactComponent(type: any): Boolean {
   switch (typeof type) {
     case 'function':
-      if (type.prototype != null) {
-        if (type.prototype.isReactComponent) {
-          return true
-        }
-        const ownNames = Object.getOwnPropertyNames(type.prototype)
-        if (ownNames.length > 1 || ownNames[0] !== 'constructor') {
-          return false
-        }
-      }
-      if (!strict) {
-        // don't check component name
-        return true
-      }
-      const { __ALEPH__: ALEPH } = window as any
-      if (ALEPH) {
-        // in bundle mode, the component names have been compressed.
-        return true
-      }
-      const name = type.displayName || type.name
-      return typeof name === 'string' && /^[A-Z]/.test(name)
+      return true
     case 'object':
       if (type != null) {
         switch (type.$$typeof) {

server/helper.ts

@@ -148,6 +148,8 @@ export function getSourceType(url: string, contentType?: string): SourceType {
   return SourceType.Unknown
 }
 
+const reEndsWithVersion = /@\d+(\.\d+){0,2}(\-[a-z0-9]+(\.[a-z0-9]+)?)?$/
+
 /**
  * fix remote import url to local
  * https://esm.sh/react.js?bundle -> /-/esm.sh/react.YnVuZGxl.js
@@ -162,9 +164,10 @@ export function toLocalPath(url: string): string {
     if (search !== '') {
       const a = util.splitPath(pathname)
       const basename = a.pop()!
-      const ext = extname(basename)
+      const realext = extname(basename)
+      const ext = realext != "" && !basename.match(reEndsWithVersion) ? realext : "js"
       const search64 = util.btoaUrl(search.slice(1))
-      a.push(util.trimSuffix(basename, ext) + `.${search64}` + ext)
+      a.push(util.trimSuffix(basename, ext) + `.${search64}.` + ext)
       pathname = '/' + a.join('/')
     }
     return [

server/helper_test.ts

@@ -29,8 +29,9 @@ Deno.test('server/helper: toRelativePath', () => {
 })
 
 Deno.test('server/helper: toLocalPath', () => {
+  assertEquals(toLocalPath('https://foo.com/[email protected]?action'), `/-/foo.com/[email protected].${util.btoaUrl('action')}.js`)
   assertEquals(toLocalPath('https://deno.land/x/[email protected]/'), '/-/deno.land/x/[email protected]/')
-  assertEquals(toLocalPath('http://foo.com/bar?lang=us-en'), `/-/http_foo.com/bar.${util.btoaUrl('lang=us-en')}`)
+  assertEquals(toLocalPath('http://foo.com/bar?lang=us-en'), `/-/http_foo.com/bar.${util.btoaUrl('lang=us-en')}.js`)
   assertEquals(toLocalPath('http://foo.com:8080/bar'), '/-/http_foo.com_8080/bar')
   assertEquals(toLocalPath('file://foo/bar/'), 'foo/bar/')
   assertEquals(toLocalPath('/foo/bar/'), '/foo/bar/')