fix: assets destinations renamed (#26)

Bucket paths re-evaluated to be more precise and context with packages.
websublime · Sep 12, 2022 · 5d2e558 · 5d2e558
1 parent 9e0f38c
commit 5d2e558
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 21 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -18,9 +18,9 @@
                 "../sublime-sdk", 
                 "action", 
                 "--type", 
-                "branch", 
+                "tag", 
                 "--env", 
-                "develop"
+                "production"
             ]
         },
         {

diff --git a/cmd/action.go b/cmd/action.go
@@ -174,11 +174,17 @@ func (ctx *ActionFlags) DeployArtifacts() {
 			os.Exit(0)
 		}
 
+		// patern: <bucket>/<package-json-name>/<package-json-version>(dev-SNAPSHOT)
 		var destinationFolder = ""
+		var pkgVersion = ""
 		if isBranch {
-			destinationFolder = fmt.Sprintf("%s@%s-SNAPSHOT", pkg.Name, packageJson.Version)
+			//destinationFolder = fmt.Sprintf("%s@%s-SNAPSHOT", pkg.Name, packageJson.Version)
+			destinationFolder = fmt.Sprintf("%s/%s-SNAPSHOT", packageJson.Name, packageJson.Version)
+			pkgVersion = fmt.Sprintf("%s-SNAPSHOT", packageJson.Version)
 		} else {
-			destinationFolder = fmt.Sprintf("%s@%s", pkg.Name, packageJson.Version)
+			//destinationFolder = fmt.Sprintf("%s@%s", pkg.Name, packageJson.Version)
+			destinationFolder = fmt.Sprintf("%s/%s", packageJson.Name, packageJson.Version)
+			pkgVersion = packageJson.Version
 		}
 
 		distFiles, err := utils.PathWalk(packageDistDir)
@@ -203,23 +209,16 @@ func (ctx *ActionFlags) DeployArtifacts() {
 			Name:    pkg.Name,
 			Scope:   scope,
 			Repo:    ctx.Sublime.Repo,
-			Version: packageJson.Version,
+			Version: pkgVersion,
 			Scripts: &core.ManifestScripts{
-				Main: fmt.Sprintf("%s/%s", manifestBaseLink, filepath.Base(packageJson.Main)),
-				Esm:  fmt.Sprintf("%s/%s", manifestBaseLink, filepath.Base(packageJson.Module)),
+				NoModule: fmt.Sprintf("%s/%s", manifestBaseLink, filepath.Base(packageJson.Main)),
+				Module:   fmt.Sprintf("%s/%s", manifestBaseLink, filepath.Base(packageJson.Module)),
 			},
 			Styles: make([]string, 0),
 			Docs:   fmt.Sprintf("https://websublime.dev/organization/%s/%s/%s", ctx.Sublime.Organization, ctx.Sublime.Name, pkg.Name),
 		})
 
-		var manifestDestination = ""
-		if isBranch {
-			manifestDestination = fmt.Sprintf("manifests/%s/%s", packageJson.Name, string(env))
-		} else {
-			manifestDestination = packageJson.Name
-		}
-
-		manifest, err := supabase.Upload(ctx.Sublime.Organization, manifestFile.Name(), manifestDestination)
+		manifest, err := supabase.Upload(ctx.Sublime.Organization, manifestFile.Name(), destinationFolder)
 		if err != nil {
 			utils.WarningOut(err.Error())
 			os.Exit(0)

diff --git a/cmd/templates/lib-package-solid.json b/cmd/templates/lib-package-solid.json
@@ -34,6 +34,7 @@
       "rollup-plugin-postcss": "^4.0.2",
       "rollup-plugin-postcss-lit": "^2.0.0",
       "rollup-plugin-typescript2": "^0.31.2",
+      "@rollup/plugin-replace": "^4.0.0",
       "sass": "^1.51.0",
       "ts-jest": "^26.1.1",
       "typescript": "^4.5.4",

diff --git a/cmd/templates/lib-package-vue.json b/cmd/templates/lib-package-vue.json
@@ -30,6 +30,7 @@
       "rollup-plugin-postcss": "^4.0.2",
       "rollup-plugin-postcss-lit": "^2.0.0",
       "rollup-plugin-typescript2": "^0.31.2",
+      "@rollup/plugin-replace": "^4.0.0",
       "sass": "^1.51.0",
       "ts-jest": "^26.1.1",
       "typescript": "^4.5.4",

diff --git a/cmd/templates/lib-package.json b/cmd/templates/lib-package.json
@@ -29,6 +29,7 @@
       "rollup-plugin-postcss": "^4.0.2",
       "rollup-plugin-postcss-lit": "^2.0.0",
       "rollup-plugin-typescript2": "^0.31.2",
+      "@rollup/plugin-replace": "^4.0.0",
       "sass": "^1.51.0",
       "ts-jest": "^26.1.1",
       "typescript": "^4.5.4",

diff --git a/cmd/templates/manifest.json b/cmd/templates/manifest.json
@@ -4,9 +4,10 @@
     "scope": "{{ .Scope }}",
     "repo": "{{ .Repo }}",
     "scripts": {
-        "main": "{{ .Scripts.Main }}",
-        "esm": "{{ .Scripts.Esm }}"
+        "nomodule": "{{ .Scripts.Main }}",
+        "module": "{{ .Scripts.Esm }}"
     },
     "styles": {{ .Styles }},
-    "docs": "{{ .Docs }}"
+    "docs": "{{ .Docs }}",
+    "global": false
 }
diff --git a/cmd/templates/vite-config-lit.json b/cmd/templates/vite-config-lit.json
@@ -2,6 +2,7 @@
 /* eslint-disable import/no-import-module-exports */
 import path from 'path';
 
+import replace from '@rollup/plugin-replace';
 import { workspacesAlias } from '{{ .Scope }}/vite';
 import postcss from 'rollup-plugin-postcss';
 import postcssLit from 'rollup-plugin-postcss-lit';
@@ -45,6 +46,12 @@ module.exports = defineConfig({
     }
   },
   plugins: [
+    replace({
+      'process.env.NODE_ENV':
+        process.env.NODE_ENV === 'production'
+          ? JSON.stringify('production')
+          : JSON.stringify('development')
+    }),
     postcss({
       inject: false
     }),

diff --git a/cmd/templates/vite-config-solid.json b/cmd/templates/vite-config-solid.json
@@ -2,6 +2,7 @@
 /* eslint-disable import/no-import-module-exports */
 import path from 'path';
 
+import replace from '@rollup/plugin-replace';
 import { workspacesAlias } from '{{ .Scope }}/vite';
 import postcss from 'rollup-plugin-postcss';
 import solidPlugin from 'vite-plugin-solid';
@@ -45,6 +46,12 @@ module.exports = defineConfig({
     }
   },
   plugins: [
+    replace({
+      'process.env.NODE_ENV':
+        process.env.NODE_ENV === 'production'
+          ? JSON.stringify('production')
+          : JSON.stringify('development')
+    }),
     postcss({
       inject: false
     }),

diff --git a/cmd/templates/vite-config-typescript.json b/cmd/templates/vite-config-typescript.json
@@ -2,6 +2,7 @@
 /* eslint-disable import/no-import-module-exports */
 import path from 'path';
 
+import replace from '@rollup/plugin-replace';
 import { workspacesAlias } from '{{ .Scope }}/vite';
 import postcss from 'rollup-plugin-postcss';
 import { defineConfig } from 'vite';
@@ -44,6 +45,12 @@ module.exports = defineConfig({
     }
   },
   plugins: [
+    replace({
+      'process.env.NODE_ENV':
+        process.env.NODE_ENV === 'production'
+          ? JSON.stringify('production')
+          : JSON.stringify('development')
+    }),
     postcss({
       inject: false
     }),

diff --git a/cmd/templates/vite-config-vue.json b/cmd/templates/vite-config-vue.json
@@ -2,6 +2,7 @@
 /* eslint-disable import/no-import-module-exports */
 import path from 'path';
 
+import replace from '@rollup/plugin-replace';
 import { workspacesAlias } from '{{ .Scope }}/vite';
 import postcss from 'rollup-plugin-postcss';
 import vue from '@vitejs/plugin-vue';
@@ -45,6 +46,12 @@ module.exports = defineConfig({
     }
   },
   plugins: [
+    replace({
+      'process.env.NODE_ENV':
+        process.env.NODE_ENV === 'production'
+          ? JSON.stringify('production')
+          : JSON.stringify('development')
+    }),
     postcss({
       inject: false
     }),

diff --git a/cmd/templates/workflow-artifact.yaml b/cmd/templates/workflow-artifact.yaml
@@ -4,6 +4,8 @@ on:
   push:
     tags:
       - '*'
+      - '**'
+      - '*/*'
 
 env:
   CI: true

diff --git a/cmd/version.go b/cmd/version.go
@@ -29,7 +29,7 @@ import (
 )
 
 var (
-	Version   string = "v0.1.6"
+	Version   string = "v0.1.7"
 	BuildTime string = fmt.Sprintf("%d", time.Now().Unix())
 )
 

diff --git a/core/manifest.go b/core/manifest.go
@@ -29,8 +29,8 @@ import (
 )
 
 type ManifestScripts struct {
-	Main string `json:"main"`
-	Esm  string `json:"esm"`
+	NoModule string `json:"nomodule"`
+	Module   string `json:"module"`
 }
 
 type Manifest struct {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,8 @@ on: @@
       push:
         tags:
           - '*'
+          - '**'
+          - '*/*'
     env:
       CI: true
@@ Expand Down @@