Skip to content

Commit

Permalink
chore: merge pull request #72 from Questionable-Content-Extensions/re…
Browse files Browse the repository at this point in the history
…lease/1.1.0

Release version 1.1.0
  • Loading branch information
ilyvion authored Sep 10, 2023
2 parents 1ec5baf + 069dd66 commit cbf601e
Show file tree
Hide file tree
Showing 70 changed files with 30,354 additions and 38,722 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["react-app"],
"extends": ["react-app", "plugin:storybook/recommended"],
"ignorePatterns": [
"dist/**",
"build/**",
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,10 @@ jobs:

- name: Ensure everything builds
run: npm run build

- name: Deploy Storybook
uses: JamesIves/github-pages-deploy-action@v4
with:
folder: storybook-static
target-folder: storybook
single-commit: true
5 changes: 4 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@ node_modules

# Ignore artifacts:
build
coverage
coverage

dist
storybook-static
3 changes: 2 additions & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"singleQuote": true,
"importOrder": ["\\.css$", "^@", "^~", "^[./]"],
"importOrderSeparation": true,
"importOrderSortSpecifiers": true
"importOrderSortSpecifiers": true,
"plugins": ["@trivago/prettier-plugin-sort-imports"]
}
21 changes: 14 additions & 7 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,27 @@
import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin'

import type { StorybookConfig } from '@storybook/core-common'
import type { StorybookConfig } from '@storybook/react-webpack5'

const config: StorybookConfig = {
stories: [
'../src/**/*.stories.mdx',
'../src/**/*.stories.@(js|jsx|ts|tsx)',
],

addons: [
'@storybook/addon-links',
'@storybook/addon-essentials',
'@storybook/addon-interactions',
'@storybook/preset-create-react-app',
],
framework: '@storybook/react',
core: {
builder: '@storybook/builder-webpack5',

framework: {
name: '@storybook/react-webpack5',
options: {},
},

core: {},

webpackFinal: async (config, { configType: _configType }) => {
if (!config.resolve) {
config.resolve = {}
Expand All @@ -26,11 +31,13 @@ const config: StorybookConfig = {
}
config.resolve.plugins.push(new TsconfigPathsPlugin())

config.devtool = 'inline-source-map'

return config
},
features: {
interactionsDebugger: true,
},
}

export default config

// TODO: After upgrading to Storybook 7.5, interaction tests have broken.
// Figure out why and fix it.
63 changes: 42 additions & 21 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,27 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased][unreleased]
## [Unreleased]

## [1.1.0] - 2023-09-10

### Added ✨

- Add guest comic/non-canon pills to `ComicList`
- Add Storybook link to README
- Added list of comics an item is featured in. Closes [#19](https://github.com/Questionable-Content-Extensions/client/issues/19)
- Added feature and setting for whether to show the current comic's tagline as its tooltip. Closes [#47](https://github.com/Questionable-Content-Extensions/client/issues/47)
- Added feature and setting for being able to navigate to random comics by item. Closes [#20](https://github.com/Questionable-Content-Extensions/client/issues/20)

### Changed 🔧

- Upgraded all dependencies to their latest versions and made the necessary changes to make things work the same as before

### Fixed 🐛

- Don't show "last strip" button in item navigation bar when said strip is the current strip
- The logic for which exclusion setting takes precedence was backwards, so if you had set both "skip non-canon comics" and "skip guest comics," it would only skip guest comics, but not non-canon comics. Fixes [#36](https://github.com/Questionable-Content-Extensions/client/issues/36)
- Single-frame flicker at the end of dialog close animation removed. Fixes [#70](https://github.com/Questionable-Content-Extensions/client/issues/70)

## [1.0.0][] - 2023-09-09

Expand Down Expand Up @@ -60,7 +80,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed 🐛

- Better fix for missing sidebar. More idiomatic fix for Issue #37. It uses jQuery within the proper file, just before adding the sidebar base. It also directly tests the DOM to see if the "small-2" column is missing, rather than just guessing using the URL. Fixes #37
- Better fix for missing sidebar. More idiomatic fix for Issue [#37](https://github.com/Questionable-Content-Extensions/client/issues/37). It uses jQuery within the proper file, just before adding the sidebar base. It also directly tests the DOM to see if the "small-2" column is missing, rather than just guessing using the URL. Fixes [#37](https://github.com/Questionable-Content-Extensions/client/issues/37)

## [0.6.0][] - 2019-03-08

Expand All @@ -71,36 +91,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Add support for the new item image system and for image uploading
- Add edit log view for editors
- Add flags for indicating whether a comic is lacking certain features
- Add loading indicators for the comic image. Implements the comic image of #14.
- Add loading indicators for the comic image. Implements the comic image of [#14](https://github.com/Questionable-Content-Extensions/client/issues/14).
- Add updating indicators for the item details dialog
- Add updating indicators and/or disable controls for editor actions
- Add loading indicators for edit log. Closes #14
- Add loading indicators for edit log. Closes [#14](https://github.com/Questionable-Content-Extensions/client/issues/14)
- Add ItemService to avoid loading data multiple times
- Report version to server. Closes #29
- Report version to server. Closes [#29](https://github.com/Questionable-Content-Extensions/client/issues/29)
- Create LICENSE

### Changed 🔧

- Use async where possible
- Do events for loading item data
- Supports using the correct image format data from the server, which closes #17
- Supports using the correct image format data from the server, which closes [#17](https://github.com/Questionable-Content-Extensions/client/issues/17)
- Update copyright year
- Rename ComicDataControllerBase to EventHandlingControllerBase
- Separate out code checking from building. To speed up building simple fixes and amendments (Flow and ESLint are slow)
- Move more code to ItemService, where it belongs. Closes #31
- Move more code to ItemService, where it belongs. Closes [#31](https://github.com/Questionable-Content-Extensions/client/issues/31)
- Organize the existing CSS
- Extract inline styles to proper style classes. Closes #32
- Extract inline styles to proper style classes. Closes [#32](https://github.com/Questionable-Content-Extensions/client/issues/32)
- Update copyright year also for HTML templates
- Update build packages
- Fully transition to using events for maintenance mode

### Fixed 🐛

- Fix various minor bugs
- Ensure maintenance mode is handled correctly everywhere. Closes #27
- Ensure maintenance mode is handled correctly everywhere. Closes [#27](https://github.com/Questionable-Content-Extensions/client/issues/27)
- Handle errors at all in the edit log dialog
- Set $inject on SettingsController so the code keeps working uglified/minified
- Ensure that random comic navigation respects exclusion settings. Closes #18
- Ensure that random comic navigation respects exclusion settings. Closes [#18](https://github.com/Questionable-Content-Extensions/client/issues/18)
- Fix indentation in constants.js
- Undo checkboxes and turn off update indicator when updates fail
- Fix server/client API mismatch
Expand Down Expand Up @@ -136,7 +156,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added ✨

- Add shim to support GM 4.0 (PR #23)
- Add shim to support GM 4.0 (PR [#23](https://github.com/Questionable-Content-Extensions/client/pull/23))

### Changed 🔧

Expand All @@ -149,7 +169,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed 🐛

- Fix build errors
- Fix #25
- Fix [#25](https://github.com/Questionable-Content-Extensions/client/issues/25)

## [0.5.1][] - 2017-04-08

Expand All @@ -158,7 +178,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Add support for showing the comic strip publish date
- Add support for setting the comic strip publish date
- Add support for approximate publish dates
- Add a ribbon indicating comic status for non-canon and guest strips. Closes #4
- Add a ribbon indicating comic status for non-canon and guest strips. Closes [#4](https://github.com/Questionable-Content-Extensions/client/issues/4)
- Show an indicator when the script is set to development mode

### Changed 🔧
Expand All @@ -170,7 +190,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed 🐛

- Reduce scope of overzealous border removal style. Fixes #16
- Reduce scope of overzealous border removal style. Fixes [#16](https://github.com/Questionable-Content-Extensions/client/issues/16)

### Removed 🗑

Expand All @@ -189,11 +209,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Update Grunt version and Grunt plugin versions
- Make Travis use Ruby v2.4.1
- Have VersionEye watch 'develop' branch instead of 'master'
- Make "Show all members" behave much nicer than before. It now shows the cast/locations/storylines in the comic strip separate from the non-present cast/locations/storylines, and out of the way. (Also, fixes #8 for real this time.)
- Make "Show all members" behave much nicer than before. It now shows the cast/locations/storylines in the comic strip separate from the non-present cast/locations/storylines, and out of the way. (Also, fixes [#8](https://github.com/Questionable-Content-Extensions/client/issues/8) for real this time.)

### Fixed 🐛

- Show all members should always work, even when a comic has no data. Fixes #8
- Show all members should always work, even when a comic has no data. Fixes [#8](https://github.com/Questionable-Content-Extensions/client/issues/8)
- Make the button the correct size

## [0.4.1][] - 2016-12-26
Expand All @@ -207,7 +227,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added ✨

- Add in missing notifications for locations, storylines, titles and taglines
- Put comic number in site title for better browser navigation experience. Resolves #11
- Put comic number in site title for better browser navigation experience. Resolves [#11](https://github.com/Questionable-Content-Extensions/client/issues/11)

### Changed 🔧

Expand All @@ -224,8 +244,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fix for dynamic news on QC frontpage
- Fix indentation issues
- Fix bug introduced regarding editorData from the web service
- Save settings regardless of how the setting dialog is closed. Fixes #3
- Fixed #13 and hopefully also fixed #12
- Save settings regardless of how the setting dialog is closed. Fixes [#3](https://github.com/Questionable-Content-Extensions/client/issues/3)
- Fixed [#13](https://github.com/Questionable-Content-Extensions/client/issues/13) and hopefully also fixed [#12](https://github.com/Questionable-Content-Extensions/client/issues/12)

### Removed 🗑

Expand Down Expand Up @@ -267,7 +287,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed 🐛

- Don't interfere with Firefox' Alt+Left/Alt+Right navigation. Fixes #2.
- Don't interfere with Firefox' Alt+Left/Alt+Right navigation. Fixes [#2](https://github.com/Questionable-Content-Extensions/client/issues/2).
- Deal with the two special cases of no next or no previous comic from the web service.
- Editor mode: Show taglines missing only for comics >= 3133 and missing location

Expand Down Expand Up @@ -349,5 +369,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[0.1.2]: https://github.com/Questionable-Content-Extensions/client/compare/0.1.0...0.1.2
[0.1.0]: https://github.com/Questionable-Content-Extensions/client/releases/tag/0.1.0
[issues]: https://github.com/Questionable-Content-Extensions/client/issues
[unreleased]: https://github.com/Questionable-Content-Extensions/client/compare/1.0.0...HEAD
[1.0.0]: https://github.com/Questionable-Content-Extensions/client/compare/0.6.2...1.0.0
[Unreleased]: https://github.com/Questionable-Content-Extensions/client/compare/1.1.0...HEAD
[1.1.0]: https://github.com/Questionable-Content-Extensions/client/compare/1.0.0...1.1.0
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Questionable Content Extensions Userscript

[![CI](https://github.com/Questionable-Content-Extensions/client/actions/workflows/CI.yml/badge.svg)](https://github.com/Questionable-Content-Extensions/client/actions/workflows/CI.yml)
[![CI](https://github.com/Questionable-Content-Extensions/client/actions/workflows/CI.yml/badge.svg)](https://github.com/Questionable-Content-Extensions/client/actions/workflows/CI.yml) [![Storybook](https://raw.githubusercontent.com/storybooks/brand/master/badge/badge-storybook.svg)](https://questionable-content-extensions.github.io/client/storybook/)

Questionable Content Extensions Userscript is the client-half of the Questionable Content Extensions stack. You can find the server-half [in this sibling repository](https://github.com/Questionable-Content-Extensions/client). The project also has [its own website](https://questionablextensions.net/).

Expand Down
54 changes: 38 additions & 16 deletions buildValues.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,24 +62,41 @@ const userscriptHeader = `\
// ==/UserScript==`

const pjson = require('./package.json')
const dependencies = pjson.dependencies
const devDependencies = pjson.devDependencies
function pjsonDependency(dependency) {
if (dependency in dependencies) {
return `${dependency}@${dependencies[dependency]}`
} else if (dependency in devDependencies) {
return `${dependency}@${devDependencies[dependency]}`
} else {
return null
}
}

const userscriptHeaderVariables = {
version: pjson.version,
'redux-logger-js':
'https://unpkg.com/[email protected]/dist/redux-logger.js',
'redux-logger-js': `https://unpkg.com/${pjsonDependency(
'redux-logger'
)}/dist/redux-logger.js`,
development: {
name: 'Questionable Content Extensions Development Script',
description:
'Development mode for Questionable Content Extensions Script. ' +
'Loads the script directly from the last output of `npm start` on page refresh.',
connect: 'localhost',
'react-js': 'https://unpkg.com/react@17/umd/react.development.js',
'react-dom-js':
'https://unpkg.com/react-dom@17/umd/react-dom.development.js',
'react-redux-js':
'https://unpkg.com/[email protected]/dist/react-redux.js',
'redux-toolkit-js':
'https://unpkg.com/@reduxjs/[email protected]/dist/redux-toolkit.umd.js',
'react-js': `https://unpkg.com/${pjsonDependency(
'react'
)}/umd/react.development.js`,
'react-dom-js': `https://unpkg.com/${pjsonDependency(
'react-dom'
)}/umd/react-dom.development.js`,
'react-redux-js': `https://unpkg.com/${pjsonDependency(
'react-redux'
)}/dist/react-redux.js`,
'redux-toolkit-js': `https://unpkg.com/${pjsonDependency(
'@reduxjs/toolkit'
)}/dist/redux-toolkit.umd.js`,
version: pjson.version + '+development',
},
production: {
Expand All @@ -88,13 +105,18 @@ const userscriptHeaderVariables = {
'Converts questionablecontent.net into a single-page application and adds ' +
'extra features, such as character, location and storyline navigation.',
connect: 'questionablextensions.net',
'react-js': 'https://unpkg.com/react@17/umd/react.production.min.js',
'react-dom-js':
'https://unpkg.com/react-dom@17/umd/react-dom.production.min.js',
'react-redux-js':
'https://unpkg.com/[email protected]/dist/react-redux.min.js',
'redux-toolkit-js':
'https://unpkg.com/@reduxjs/[email protected]/dist/redux-toolkit.umd.min.js',
'react-js': `https://unpkg.com/${pjsonDependency(
'react'
)}/umd/react.production.min.js`,
'react-dom-js': `https://unpkg.com/${pjsonDependency(
'react-dom'
)}/umd/react-dom.production.min.js`,
'react-redux-js': `https://unpkg.com/${pjsonDependency(
'react-redux'
)}/dist/react-redux.min.js`,
'redux-toolkit-js': `https://unpkg.com/${pjsonDependency(
'@reduxjs/toolkit'
)}/dist/redux-toolkit.umd.min.js`,
},
}

Expand Down
Loading

0 comments on commit cbf601e

Please sign in to comment.