Skip to content

Commit 9512999

Browse files
author
Dobromir Hristov
authored
resolves rdar://100963792 * chore: update vue to 2.7 * fix: bad test from upgrade * refactor: use `:deep` instead of `/deep/` * refactor: use new slot syntax * refactor: replace `node-sass` with `dart-sass` * chore: update to node16 * fix: sass error from merge * fix: issues with running `npm ci` * chore: inline scss var * refactor: update to Vue CLI 15 * chore: fix issues from merge * fix: eslint and build errors * chore: update tests * chore: add nvmrc file * fix: update latest code to comply * chore: run `npm audit fix` * chore: fix test * refactor: update code to match latest Vue 2.7 requirements * chore: update package-lock * refactor: minor fixes * fix: remove import extensions where not needed * fix: import path * fix: css * chore: fix test * chore: update node and npm to later versions * fix: vue-config-utils.js webpack 5 devserver setup * fix merge conflict * update nvmrc * chore: remove the webpack-theme-resolver-plugin from the NOTICE.txt file * build: build-time script and linter fixes. Update references to node version
1 parent 4a7e16b commit 9512999

File tree

131 files changed

+26025
-13580
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+26025
-13580
lines changed

.eslintrc.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module.exports = {
1818
'@vue/airbnb',
1919
],
2020
parserOptions: {
21-
parser: 'babel-eslint',
21+
parser: '@babel/eslint-parser',
2222
},
2323
rules: {
2424
'no-console': process.env.NODE_ENV === 'production' ? [
@@ -35,6 +35,14 @@ module.exports = {
3535
}],
3636
'template-curly-spacing': 'off',
3737
'vue/experimental-script-setup-vars': 'off',
38+
'vue/multi-word-component-names': 'off',
39+
'function-paren-newline': ['error', 'consistent'],
40+
'function-call-argument-newline': 'off',
41+
'vuejs-accessibility/form-control-has-label': 'off',
42+
'vuejs-accessibility/label-has-for': 'off',
43+
'vuejs-accessibility/aria-role': 'off',
44+
'vuejs-accessibility/click-events-have-key-events': 'off',
45+
'vuejs-accessibility/anchor-has-content': 'off',
3846
},
3947
overrides: [
4048
{

.npmrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
registry = 'https://registry.npmjs.org/'

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.17.4
1+
18.16.1

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ more details.
5050

5151
### Run Steps
5252

53-
> Note: requires [Node.js](https://nodejs.org/en/download/) v14
54-
> and [npm](https://www.npmjs.com/package/npm) v6.14. An easy way to set these up is to install
53+
> Note: requires [Node.js](https://nodejs.org/en/download/) v18
54+
> and [npm](https://www.npmjs.com/package/npm) v9.5. An easy way to set these up is to install
5555
> [nvm](https://github.com/nvm-sh/nvm) and run `nvm install` from within the Swift-DocC-Render
5656
> repository. To use these versions as the default, add `--default` to the installation command.
5757

NOTICE.txt

-9
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,3 @@ This product depends on PortalVue.
7272
* https://github.com/LinusBorg/portal-vue/blob/develop/LICENCE
7373
* HOMEPAGE:
7474
* https://github.com/LinusBorg/portal-vue
75-
76-
---
77-
78-
This product depends on webpack-theme-resolver-plugin.
79-
80-
* LICENSE (MIT):
81-
* https://github.com/russmediadigital/webpack-theme-resolver-plugin/blob/master/LICENSE
82-
* HOMEPAGE
83-
* https://github.com/russmediadigital/webpack-theme-resolver-plugin

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ SPAs are web apps that render dynamically at runtime entirely in the browser, us
77

88
## Getting Started
99

10-
> Note: requires [Node.js](https://nodejs.org/en/download/) v14
11-
> and [npm](https://www.npmjs.com/package/npm) v6.14. An easy way to set these up is to install
10+
> Note: requires [Node.js](https://nodejs.org/en/download/) v18
11+
> and [npm](https://www.npmjs.com/package/npm) v9.5. An easy way to set these up is to install
1212
> [nvm](https://github.com/nvm-sh/nvm) and run `nvm install` from within the Swift-DocC-Render
1313
> repository. To use these versions as the default, add `--default` to the installation command.
1414

SwiftDocCRender.docc/contributing/Internals.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ For the route `/documentation/path/to/something` DocC-Render will try to fetch D
4141
Links to pages in DocC-Render are generated using references coming from the render JSON. You can use `ReferenceUrlProvider` to get the URL and title from a reference.
4242

4343
```html
44-
<ReferenceUrlProvider :reference="someFooReference">
44+
<ReferenceUrlProvider :reference="someFooReference" v-slot="{ url, title }">
4545
<router-link
46-
slot-scope="{ url, title }"
4746
:to="url"
4847
>
4948
{{ title }}

bin/check-source

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ EOF
5252
cat > "$tmp" <<"EOF"
5353
/*!
5454
* This source file is part of the Swift.org open source project
55-
*
55+
*
5656
* Copyright (c) YEARS Apple Inc. and the Swift project authors
5757
* Licensed under Apache License v2.0 with Runtime Library Exception
58-
*
58+
*
5959
* See https://swift.org/LICENSE.txt for license information
6060
* See https://swift.org/CONTRIBUTORS.txt for Swift project authors
6161
EOF

build-script-helper.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ def ensure_npm_is_installed(verbose=False):
7575
fatal_error('-- Error: %s' % error_msg)
7676
try:
7777
node_version = check_output(['node', '--version'], verbose=verbose)
78-
if not node_version.startswith('v14.17.'):
79-
warn_msg = "Unexpected version of 'node' installed. Swift-DocC-Render requires node 14.17.4. "\
78+
if not node_version.startswith('v18.16.'):
79+
warn_msg = "Unexpected version of 'node' installed. Swift-DocC-Render requires node 18.16.1. "\
8080
"See the README.md file for more information about building Swift-DocC-Render."
8181
printerr('-- Warning: %s' % warn_msg)
8282
except:

0 commit comments

Comments
 (0)