Merge pull request #13 from vordgi/get-9

get-9 update package structure
vordgi · Feb 18, 2024 · bff4abe · bff4abe
2 parents 4320631 + 5639b0d
commit bff4abe
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 10 deletions.
diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
@@ -5,16 +5,37 @@ on:
     types: [created]
 
 jobs:
-  publish-npm:
+  publish:
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
         with:
-          node-version: 18.17.1
-          registry-url: https://registry.npmjs.org/
-      - run: npm ci
-      - run: npm run build
-      - run: npm publish --access public
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+          node-version: '20'
+
+      - name: Install dependencies and build
+        run: |
+          npm ci
+          npm run build
+          cp ../README.md .
+          cp ../LICENSE .
+        working-directory: ./package
+
+      - name: Publish on main
+        if: "!contains(github.ref_name, 'canary')"
+        run: |
+          npm set //registry.npmjs.org/:_authToken=${{secrets.NPM_TOKEN}}
+          npm publish --access public
+        working-directory: ./package
+
+      - name: Publish on canary
+        if: contains(github.ref_name, 'canary')
+        run: |
+          npm set //registry.npmjs.org/:_authToken=${{secrets.NPM_TOKEN}}
+          npm version --no-git-tag-version ${{github.ref_name}}
+          npm publish --tag canary --access public
+        working-directory: ./package
diff --git a/README.md → package/README.md b/README.md → package/README.md
diff --git a/package-lock.json → package/package-lock.json b/package-lock.json → package/package-lock.json
diff --git a/package.json → package/package.json b/package.json → package/package.json
diff --git a/src/create-server-context.tsx → package/src/create-server-context.tsx b/src/create-server-context.tsx → package/src/create-server-context.tsx
diff --git a/src/get-page-config.ts → package/src/get-page-config.ts b/src/get-page-config.ts → package/src/get-page-config.ts
diff --git a/src/get-params.ts → package/src/get-params.ts b/src/get-params.ts → package/src/get-params.ts
diff --git a/src/get-pathname.ts → package/src/get-pathname.ts b/src/get-pathname.ts → package/src/get-pathname.ts
diff --git a/src/get-search-params.ts → package/src/get-search-params.ts b/src/get-search-params.ts → package/src/get-search-params.ts
diff --git a/src/get-server-context.tsx → package/src/get-server-context.tsx b/src/get-server-context.tsx → package/src/get-server-context.tsx
diff --git a/...erver-getter-in-client-component-error.ts → ...erver-getter-in-client-component-error.ts b/...erver-getter-in-client-component-error.ts → ...erver-getter-in-client-component-error.ts
diff --git a/src/types.ts → package/src/types.ts b/src/types.ts → package/src/types.ts
diff --git a/src/utils.ts → package/src/utils.ts b/src/utils.ts → package/src/utils.ts
diff --git a/tsconfig.json → package/tsconfig.json b/tsconfig.json → package/tsconfig.json