web: build. api in different folder
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
		
							
								
								
									
										4
									
								
								.github/workflows/web-api-publish.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/web-api-publish.yml
									
									
									
									
										vendored
									
									
								
							@ -16,8 +16,8 @@ jobs:
 | 
				
			|||||||
          registry-url: 'https://registry.npmjs.org'
 | 
					          registry-url: 'https://registry.npmjs.org'
 | 
				
			||||||
      - run: make gen-web
 | 
					      - run: make gen-web
 | 
				
			||||||
      - run: |
 | 
					      - run: |
 | 
				
			||||||
          cd web/api/
 | 
					          cd web-api/
 | 
				
			||||||
          npm run build
 | 
					          npm i
 | 
				
			||||||
          npm publish
 | 
					          npm publish
 | 
				
			||||||
        env:
 | 
					        env:
 | 
				
			||||||
          NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
 | 
					          NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
									
									
									
									
								
							@ -42,7 +42,7 @@ gen-web:
 | 
				
			|||||||
		openapitools/openapi-generator-cli generate \
 | 
							openapitools/openapi-generator-cli generate \
 | 
				
			||||||
		-i /local/schema.yml \
 | 
							-i /local/schema.yml \
 | 
				
			||||||
		-g typescript-fetch \
 | 
							-g typescript-fetch \
 | 
				
			||||||
		-o /local/web/api \
 | 
							-o /local/web-api \
 | 
				
			||||||
		--additional-properties=typescriptThreePlus=true,supportsES6=true,npmName=@goauthentik/api,npmVersion=${TIMESTAMP}.0.0
 | 
							--additional-properties=typescriptThreePlus=true,supportsES6=true,npmName=@goauthentik/api,npmVersion=${TIMESTAMP}.0.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
gen-outpost:
 | 
					gen-outpost:
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										14
									
								
								web/package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										14
									
								
								web/package-lock.json
									
									
									
										generated
									
									
									
								
							@ -15,7 +15,7 @@
 | 
				
			|||||||
                "@babel/preset-env": "^7.15.0",
 | 
					                "@babel/preset-env": "^7.15.0",
 | 
				
			||||||
                "@babel/preset-typescript": "^7.15.0",
 | 
					                "@babel/preset-typescript": "^7.15.0",
 | 
				
			||||||
                "@fortawesome/fontawesome-free": "^5.15.4",
 | 
					                "@fortawesome/fontawesome-free": "^5.15.4",
 | 
				
			||||||
                "@goauthentik/api": "^1629055619.0.0",
 | 
					                "@goauthentik/api": "^1629704636.0.0",
 | 
				
			||||||
                "@lingui/cli": "^3.10.2",
 | 
					                "@lingui/cli": "^3.10.2",
 | 
				
			||||||
                "@lingui/core": "^3.10.4",
 | 
					                "@lingui/core": "^3.10.4",
 | 
				
			||||||
                "@lingui/macro": "^3.10.2",
 | 
					                "@lingui/macro": "^3.10.2",
 | 
				
			||||||
@ -1690,9 +1690,9 @@
 | 
				
			|||||||
            }
 | 
					            }
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        "node_modules/@goauthentik/api": {
 | 
					        "node_modules/@goauthentik/api": {
 | 
				
			||||||
            "version": "1629055619.0.0",
 | 
					            "version": "1629704636.0.0",
 | 
				
			||||||
            "resolved": "https://registry.npmjs.org/@goauthentik/api/-/api-1629055619.0.0.tgz",
 | 
					            "resolved": "https://registry.npmjs.org/@goauthentik/api/-/api-1629704636.0.0.tgz",
 | 
				
			||||||
            "integrity": "sha512-FQR1hoYC8hEGAm/oHC6VPoB/T8zb+V7pccx4LRJlKo8VxdsRAxgGn9nm/5h/1zIg8VmuRQqsXFNQMRT86nzyjw=="
 | 
					            "integrity": "sha512-rjUjp7Gbf/Tzw0hGPx2ig5InXa4bPqj4FkFnIEgR6T1w6jbHV+q2BghztVFDc2hK2ib2NnQUQp6LWIAcYLAdSw=="
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        "node_modules/@humanwhocodes/config-array": {
 | 
					        "node_modules/@humanwhocodes/config-array": {
 | 
				
			||||||
            "version": "0.5.0",
 | 
					            "version": "0.5.0",
 | 
				
			||||||
@ -9567,9 +9567,9 @@
 | 
				
			|||||||
            "integrity": "sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg=="
 | 
					            "integrity": "sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg=="
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        "@goauthentik/api": {
 | 
					        "@goauthentik/api": {
 | 
				
			||||||
            "version": "1629055619.0.0",
 | 
					            "version": "1629704636.0.0",
 | 
				
			||||||
            "resolved": "https://registry.npmjs.org/@goauthentik/api/-/api-1629055619.0.0.tgz",
 | 
					            "resolved": "https://registry.npmjs.org/@goauthentik/api/-/api-1629704636.0.0.tgz",
 | 
				
			||||||
            "integrity": "sha512-FQR1hoYC8hEGAm/oHC6VPoB/T8zb+V7pccx4LRJlKo8VxdsRAxgGn9nm/5h/1zIg8VmuRQqsXFNQMRT86nzyjw=="
 | 
					            "integrity": "sha512-rjUjp7Gbf/Tzw0hGPx2ig5InXa4bPqj4FkFnIEgR6T1w6jbHV+q2BghztVFDc2hK2ib2NnQUQp6LWIAcYLAdSw=="
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        "@humanwhocodes/config-array": {
 | 
					        "@humanwhocodes/config-array": {
 | 
				
			||||||
            "version": "0.5.0",
 | 
					            "version": "0.5.0",
 | 
				
			||||||
 | 
				
			|||||||
@ -46,7 +46,7 @@
 | 
				
			|||||||
        "@babel/preset-env": "^7.15.0",
 | 
					        "@babel/preset-env": "^7.15.0",
 | 
				
			||||||
        "@babel/preset-typescript": "^7.15.0",
 | 
					        "@babel/preset-typescript": "^7.15.0",
 | 
				
			||||||
        "@fortawesome/fontawesome-free": "^5.15.4",
 | 
					        "@fortawesome/fontawesome-free": "^5.15.4",
 | 
				
			||||||
        "@goauthentik/api": "^1629704307.0.0",
 | 
					        "@goauthentik/api": "^1629704636.0.0",
 | 
				
			||||||
        "@lingui/cli": "^3.10.2",
 | 
					        "@lingui/cli": "^3.10.2",
 | 
				
			||||||
        "@lingui/core": "^3.10.4",
 | 
					        "@lingui/core": "^3.10.4",
 | 
				
			||||||
        "@lingui/macro": "^3.10.2",
 | 
					        "@lingui/macro": "^3.10.2",
 | 
				
			||||||
 | 
				
			|||||||
@ -75,6 +75,10 @@ export default [
 | 
				
			|||||||
            resolve({ browser: true }),
 | 
					            resolve({ browser: true }),
 | 
				
			||||||
            commonjs(),
 | 
					            commonjs(),
 | 
				
			||||||
            isProdBuild && terser(),
 | 
					            isProdBuild && terser(),
 | 
				
			||||||
 | 
					            copy({
 | 
				
			||||||
 | 
					                targets: [...resources],
 | 
				
			||||||
 | 
					                copyOnce: false,
 | 
				
			||||||
 | 
					            }),
 | 
				
			||||||
        ].filter((p) => p),
 | 
					        ].filter((p) => p),
 | 
				
			||||||
        watch: {
 | 
					        watch: {
 | 
				
			||||||
            clearScreen: false,
 | 
					            clearScreen: false,
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user