Skip to content

Commit

Permalink
Merge pull request #93 from viqueen/issue/dependency-upgrades
Browse files Browse the repository at this point in the history
v1: dependency upgrades
  • Loading branch information
viqueen authored Jun 9, 2024
2 parents fd51486 + b1744c4 commit 351f203
Show file tree
Hide file tree
Showing 7 changed files with 3,730 additions and 3,266 deletions.
4 changes: 3 additions & 1 deletion modules/cli/commands/build/webpack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ export const webpackConfig = (props: {
});

const definePlugin = new DefinePlugin({
__SITE_PROPERTIES__: JSON.stringify(siteProperties())
__SITE_PROPERTIES__: JSON.stringify(siteProperties()),
process: { env: { CI: false }, version: '"v0.0.0"' }
});

const copyPlugin = assets
Expand Down Expand Up @@ -112,6 +113,7 @@ export const webpackConfig = (props: {
path: require.resolve('path-browserify'),
stream: require.resolve('stream-browserify'),
url: require.resolve('url/'),
vm: false,
zlib: false
}
},
Expand Down
4 changes: 4 additions & 0 deletions modules/cli/commands/extract/extract-site-emojis.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ export const extractSiteEmojis = async (
output: Output,
options = { force: false }
) => {
const siteId = configuration.CONFLUENCE_SITE_ID;
if (!siteId) {
return;
}
const adminClient = axios.create({
baseURL: 'https://admin.atlassian.com'
});
Expand Down
2 changes: 1 addition & 1 deletion modules/configuration/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import type { GenerateThemeArgs } from '@atlaskit/atlassian-navigation';

export type Configuration = {
CONFLUENCE_SITE_NAME: string;
CONFLUENCE_SITE_ID: string;
CONFLUENCE_SITE_ID?: string;
CONFLUENCE_USERNAME: string;
CONFLUENCE_API_TOKEN: string;
CONFLUENCE_CLOUD_TOKEN: string;
Expand Down
32 changes: 19 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "@labset/confluence-static-site",
"version": "1.3.0",
"version": "1.4.0",
"description": "confluence static site",
"bin": {
"confsite": "./dist/cli/index.js"
},
"scripts": {
"build": "tsc",
"build:watch": "tsc -w",
"postbuild": "./postbuild.js",
"postinstall": "./postinstall.js",
"lint": "eslint modules/ --ext .ts,.tsx,.js",
Expand Down Expand Up @@ -36,9 +37,10 @@
"homepage": "https://github.com/viqueen/confluence-static-site#readme",
"devDependencies": {
"@types/lodash": "^4.14.202",
"@types/node": "^20.14.2",
"@types/prompt": "^1.1.8",
"@types/react": "^18.0.28",
"@types/react-dom": "^18.0.11",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@wdio/cli": "^8.29.7",
Expand All @@ -56,14 +58,18 @@
"wdio-image-comparison-service": "^5.0.2"
},
"dependencies": {
"@atlaskit/atlassian-navigation": "^3.2.0",
"@atlaskit/breadcrumbs": "^12.0.5",
"@atlaskit/date": "^0.10.6",
"@atlaskit/link-provider": "^1.5.1",
"@atlaskit/media-core": "^34.1.4",
"@atlaskit/page": "^12.3.4",
"@atlaskit/page-layout": "^2.1.2",
"@atlaskit/renderer": "^107.0.0",
"@atlaskit/atlassian-navigation": "^3.6.2",
"@atlaskit/breadcrumbs": "^12.1.1",
"@atlaskit/date": "^0.10.10",
"@atlaskit/link-provider": "^1.10.0",
"@atlaskit/media-core": "^34.2.1",
"@atlaskit/media-state": "^1.1.0",
"@atlaskit/page": "^12.4.0",
"@atlaskit/page-layout": "^3.3.1",
"@atlaskit/renderer": "^109.31.3",
"@atlaskit/side-navigation": "^3.2.0",
"@atlaskit/smart-card": "^27.5.2",
"@atlaskit/theme": "^12.8.0",
"@labset/fs-directory": "^1.1.0",
"axios": "^1.6.7",
"copy-webpack-plugin": "^12.0.2",
Expand All @@ -75,8 +81,8 @@
"os-browserify": "^0.3.0",
"path-browserify": "^1.0.1",
"prompt": "^1.3.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sharp": "^0.32.1",
"stream-browserify": "^3.0.0",
"style-loader": "^3.3.4",
Expand Down
Binary file modified test/baseline/desktop_chrome/home-page-ci-1600x1200.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/baseline/desktop_chrome/home-page-local-1600x1200.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 351f203

Please sign in to comment.