opendev/gerrit
Code Issues Proposed changes

Fix import path @polymer/decorators in server.go

Browse Source 
Change-Id: Iaca7fa0c363b6f8f1bc9b53ff4e0e99ebecb9f73
This commit is contained in:
Dmitrii Filippov
2020-08-02 22:49:01 +02:00
parent 5e2f552a7d
commit bc36a0a046
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
polygerrit-ui/server.go
View File

@@ -167,6 +167,15 @@ func handleSrcRequest(compiledSrcPath string, dirListingMux *http.ServeMux, writ
// with the import error, so we can catch this problem easily. // with the import error, so we can catch this problem easily.
writer.Header().Set("Content-Type", "text/html") writer.Header().Set("Content-Type", "text/html")
} else if isJsFile { } else if isJsFile {
// import ... from '@polymer/decorators'
// must be transformed into
// import ... from '@polymer/decorators/lib/decorators.js'
// The correct way to do it is to use value of the "main" property
// from the @polymer/decorators/package.json. However, parsing package.json
// is overcomplicated right now, hard-code exact path here.
moduleImportRegexp := regexp.MustCompile("(?m)^(import.*)'@polymer/decorators';$")
data = moduleImportRegexp.ReplaceAll(data, []byte("$1 '@polymer/decorators/lib/decorators.js';"))
// The following code updates import statements. // The following code updates import statements.
// 1. if an in imported file has .js or .mjs extension, the code keeps // 1. if an in imported file has .js or .mjs extension, the code keeps
// the file extension unchanged. Otherwise, it adds .js extension // the file extension unchanged. Otherwise, it adds .js extension
@@ -176,7 +185,7 @@ func handleSrcRequest(compiledSrcPath string, dirListingMux *http.ServeMux, writ
// 'page/page.mjs' -> '/node_modules/page.mjs' // 'page/page.mjs' -> '/node_modules/page.mjs'
// '@polymer/iron-icon' -> '/node_modules/@polymer/iron-icon.js' // '@polymer/iron-icon' -> '/node_modules/@polymer/iron-icon.js'
// './element/file' -> './element/file.js' // './element/file' -> './element/file.js'
moduleImportRegexp := regexp.MustCompile("(?m)^(import.*)'(.*?)(\\.(m?)js)?';$") moduleImportRegexp = regexp.MustCompile("(?m)^(import.*)'(.*?)(\\.(m?)js)?';$")
data = moduleImportRegexp.ReplaceAll(data, []byte("$1 '$2.${4}js';")) data = moduleImportRegexp.ReplaceAll(data, []byte("$1 '$2.${4}js';"))
moduleImportRegexp = regexp.MustCompile("(?m)^(import.*)'([^/.].*)';$") moduleImportRegexp = regexp.MustCompile("(?m)^(import.*)'([^/.].*)';$")