diff options
author | zeroinformatique | 2021-07-02 18:08:13 +0200 |
---|---|---|
committer | GitHub | 2021-07-02 18:08:13 +0200 |
commit | 08ac32103fb5f8cca1861267dfd07a7c0d2faf62 (patch) | |
tree | 6e70da08a58890eac806d98a127551e9f67994a9 | |
parent | 1cf6dd4243a72935d382d62bb2a79ff13186e70d (diff) | |
parent | 90b0994ea7be0052fc6d868c98e1de8c835f2ba1 (diff) | |
download | ldgallery-08ac32103fb5f8cca1861267dfd07a7c0d2faf62.tar.gz |
Merge pull request #299 from ldgallery/oz-yarn
viewer: compilation chain upgrade
-rw-r--r-- | .github/workflows/build.yml | 10 | ||||
-rw-r--r-- | readme.md | 2 | ||||
-rw-r--r-- | scripts/dev_win_compiler_build.cmd (renamed from scripts/dev_win_build_compiler.cmd) | 0 | ||||
-rw-r--r-- | scripts/dev_win_compiler_compile_example.cmd (renamed from scripts/dev_win_compile_example.cmd) | 0 | ||||
-rw-r--r-- | scripts/dev_win_compiler_help.cmd (renamed from scripts/dev_win_help.cmd) | 0 | ||||
-rw-r--r-- | scripts/dev_win_start_vueui.cmd | 44 | ||||
-rw-r--r-- | scripts/dev_win_viewer_deps_install.cmd | 22 | ||||
-rw-r--r-- | viewer/.browserslistrc | 7 | ||||
-rw-r--r-- | viewer/package-lock.json | 14182 | ||||
-rw-r--r-- | viewer/package.json | 58 | ||||
-rw-r--r-- | viewer/readme.md | 19 | ||||
-rw-r--r-- | viewer/src/services/ldzoom.ts | 2 | ||||
-rw-r--r-- | viewer/src/store/galleryStore.ts | 2 | ||||
-rw-r--r-- | viewer/yarn.lock | 9614 |
14 files changed, 9686 insertions, 14276 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9395862..190a0df 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml | |||
@@ -8,14 +8,14 @@ jobs: | |||
8 | - uses: actions/checkout@v2 | 8 | - uses: actions/checkout@v2 |
9 | - uses: actions/setup-node@v1 | 9 | - uses: actions/setup-node@v1 |
10 | with: | 10 | with: |
11 | # Latest version officially tested for Vue | 11 | # Latest version officially tested for Ld |
12 | node-version: 12.16.1 | 12 | node-version: 12.22.2 |
13 | - name: Lint and build Node.js Vue project | 13 | - name: Lint and build Node.js Vue project |
14 | working-directory: viewer | 14 | working-directory: viewer |
15 | run: | | 15 | run: | |
16 | npm install | 16 | yarn |
17 | npm run lint | 17 | yarn run lint |
18 | npm run build | 18 | yarn run build |
19 | - uses: actions/upload-artifact@v2 | 19 | - uses: actions/upload-artifact@v2 |
20 | with: | 20 | with: |
21 | name: viewer-dist | 21 | name: viewer-dist |
@@ -55,10 +55,8 @@ Builds of this software embed and make use of the following libraries: | |||
55 | * fortawesome/free-regular-svg-icons, licensed under the CC-BY-4.0 and MIT Licenses | 55 | * fortawesome/free-regular-svg-icons, licensed under the CC-BY-4.0 and MIT Licenses |
56 | * fortawesome/vue-fontawesome, licensed under the MIT License | 56 | * fortawesome/vue-fontawesome, licensed under the MIT License |
57 | * buefy, licensed under the MIT License | 57 | * buefy, licensed under the MIT License |
58 | * core-js, licensed under the MIT License | ||
59 | * hammerjs, licensed under the MIT License | 58 | * hammerjs, licensed under the MIT License |
60 | * marked, licensed under the MITÂ License | 59 | * marked, licensed under the MITÂ License |
61 | * resize-observer-polyfill, licensed under the MIT License | ||
62 | * v-lazy-image, licensed under the MIT License | 60 | * v-lazy-image, licensed under the MIT License |
63 | * vue, licensed under the MIT License | 61 | * vue, licensed under the MIT License |
64 | * vue-class-component, licensed under the MIT License | 62 | * vue-class-component, licensed under the MIT License |
diff --git a/scripts/dev_win_build_compiler.cmd b/scripts/dev_win_compiler_build.cmd index d88aa5d..d88aa5d 100644 --- a/scripts/dev_win_build_compiler.cmd +++ b/scripts/dev_win_compiler_build.cmd | |||
diff --git a/scripts/dev_win_compile_example.cmd b/scripts/dev_win_compiler_compile_example.cmd index 35134c0..35134c0 100644 --- a/scripts/dev_win_compile_example.cmd +++ b/scripts/dev_win_compiler_compile_example.cmd | |||
diff --git a/scripts/dev_win_help.cmd b/scripts/dev_win_compiler_help.cmd index f0bdb98..f0bdb98 100644 --- a/scripts/dev_win_help.cmd +++ b/scripts/dev_win_compiler_help.cmd | |||
diff --git a/scripts/dev_win_start_vueui.cmd b/scripts/dev_win_start_vueui.cmd deleted file mode 100644 index e1a124d..0000000 --- a/scripts/dev_win_start_vueui.cmd +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | @echo off | ||
2 | set NODE_VERSION=12.16.1 | ||
3 | set VUECLI_VERSION=4.2.3 | ||
4 | cd ..\viewer\ | ||
5 | |||
6 | chcp 65001 | ||
7 | echo. | ||
8 | echo === nvm install === | ||
9 | nvm install %NODE_VERSION% | ||
10 | nvm list | find /i "%NODE_VERSION% (Currently" | ||
11 | if errorlevel 1 ( | ||
12 | echo. | ||
13 | echo === nvm use %NODE_VERSION% === | ||
14 | nvm use %NODE_VERSION% | ||
15 | |||
16 | echo. | ||
17 | echo === npm install @vue/cli@%VUECLI_VERSION% === | ||
18 | ping localhost -n 3 >NUL | ||
19 | cmd /c npm install -g @vue/cli@%VUECLI_VERSION% | ||
20 | ) | ||
21 | echo. | ||
22 | vue --version | find /i "%VUECLI_VERSION%" | ||
23 | if errorlevel 1 ( | ||
24 | echo ====================================================================== | ||
25 | echo Warning: vue/cli doesn't match the requested version: %VUECLI_VERSION% | ||
26 | echo. | ||
27 | echo CTRL+C to quit and update, or press a key to ignore this warning... | ||
28 | echo ====================================================================== | ||
29 | echo. | ||
30 | pause | ||
31 | ) | ||
32 | echo. | ||
33 | echo === npm install === | ||
34 | cmd /c npm install | ||
35 | echo. | ||
36 | echo === npm prune === | ||
37 | cmd /c npm prune | ||
38 | echo. | ||
39 | echo === npm dedupe === | ||
40 | cmd /c npm dedupe | ||
41 | echo. | ||
42 | echo === vue ui === | ||
43 | title Vue UI - server | ||
44 | vue ui | ||
diff --git a/scripts/dev_win_viewer_deps_install.cmd b/scripts/dev_win_viewer_deps_install.cmd new file mode 100644 index 0000000..9e2330d --- /dev/null +++ b/scripts/dev_win_viewer_deps_install.cmd | |||
@@ -0,0 +1,22 @@ | |||
1 | @echo off | ||
2 | set NODE_VERSION=12.22.2 | ||
3 | cd ..\viewer\ | ||
4 | |||
5 | chcp 65001 | ||
6 | echo. | ||
7 | echo === nvm install === | ||
8 | nvm install %NODE_VERSION% | ||
9 | nvm list | find /i "%NODE_VERSION% (Currently" | ||
10 | if errorlevel 1 ( | ||
11 | echo. | ||
12 | echo === nvm use %NODE_VERSION% === | ||
13 | nvm use %NODE_VERSION% | ||
14 | |||
15 | ping localhost -n 3 >NUL | ||
16 | cmd /c npm install -g yarn | ||
17 | ) | ||
18 | echo. | ||
19 | echo === yarn deps === | ||
20 | cmd /c rmdir /s /q .\node_modules\ | ||
21 | cmd /c yarn | ||
22 | echo. | ||
diff --git a/viewer/.browserslistrc b/viewer/.browserslistrc index d6471a3..d9789a7 100644 --- a/viewer/.browserslistrc +++ b/viewer/.browserslistrc | |||
@@ -1,2 +1,5 @@ | |||
1 | > 1% | 1 | # Polyfills for ES2020+ |
2 | last 2 versions | 2 | |
3 | chrome > 78 | ||
4 | firefox > 72 | ||
5 | edge > 78 | ||
diff --git a/viewer/package-lock.json b/viewer/package-lock.json deleted file mode 100644 index 4785b3e..0000000 --- a/viewer/package-lock.json +++ /dev/null | |||
@@ -1,14182 +0,0 @@ | |||
1 | { | ||
2 | "name": "ldgallery-viewer", | ||
3 | "version": "2.0.0", | ||
4 | "lockfileVersion": 1, | ||
5 | "requires": true, | ||
6 | "dependencies": { | ||
7 | "@babel/code-frame": { | ||
8 | "version": "7.5.5", | ||
9 | "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz", | ||
10 | "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==", | ||
11 | "dev": true, | ||
12 | "requires": { | ||
13 | "@babel/highlight": "^7.0.0" | ||
14 | } | ||
15 | }, | ||
16 | "@babel/compat-data": { | ||
17 | "version": "7.10.3", | ||
18 | "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.3.tgz", | ||
19 | "integrity": "sha512-BDIfJ9uNZuI0LajPfoYV28lX8kyCPMHY6uY4WH1lJdcicmAfxCK5ASzaeV0D/wsUaRH/cLk+amuxtC37sZ8TUg==", | ||
20 | "dev": true, | ||
21 | "requires": { | ||
22 | "browserslist": "^4.12.0", | ||
23 | "invariant": "^2.2.4", | ||
24 | "semver": "^5.5.0" | ||
25 | }, | ||
26 | "dependencies": { | ||
27 | "browserslist": { | ||
28 | "version": "4.12.2", | ||
29 | "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.2.tgz", | ||
30 | "integrity": "sha512-MfZaeYqR8StRZdstAK9hCKDd2StvePCYp5rHzQCPicUjfFliDgmuaBNPHYUTpAywBN8+Wc/d7NYVFkO0aqaBUw==", | ||
31 | "dev": true, | ||
32 | "requires": { | ||
33 | "caniuse-lite": "^1.0.30001088", | ||
34 | "electron-to-chromium": "^1.3.483", | ||
35 | "escalade": "^3.0.1", | ||
36 | "node-releases": "^1.1.58" | ||
37 | } | ||
38 | }, | ||
39 | "caniuse-lite": { | ||
40 | "version": "1.0.30001090", | ||
41 | "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001090.tgz", | ||
42 | "integrity": "sha512-QzPRKDCyp7RhjczTPZaqK3CjPA5Ht2UnXhZhCI4f7QiB5JK6KEuZBxIzyWnB3wO4hgAj4GMRxAhuiacfw0Psjg==", | ||
43 | "dev": true | ||
44 | }, | ||
45 | "electron-to-chromium": { | ||
46 | "version": "1.3.483", | ||
47 | "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.483.tgz", | ||
48 | "integrity": "sha512-+05RF8S9rk8S0G8eBCqBRBaRq7+UN3lDs2DAvnG8SBSgQO3hjy0+qt4CmRk5eiuGbTcaicgXfPmBi31a+BD3lg==", | ||
49 | "dev": true | ||
50 | }, | ||
51 | "node-releases": { | ||
52 | "version": "1.1.58", | ||
53 | "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz", | ||
54 | "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==", | ||
55 | "dev": true | ||
56 | } | ||
57 | } | ||
58 | }, | ||
59 | "@babel/core": { | ||
60 | "version": "7.10.3", | ||
61 | "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.3.tgz", | ||
62 | "integrity": "sha512-5YqWxYE3pyhIi84L84YcwjeEgS+fa7ZjK6IBVGTjDVfm64njkR2lfDhVR5OudLk8x2GK59YoSyVv+L/03k1q9w==", | ||
63 | "dev": true, | ||
64 | "requires": { | ||
65 | "@babel/code-frame": "^7.10.3", | ||
66 | "@babel/generator": "^7.10.3", | ||
67 | "@babel/helper-module-transforms": "^7.10.1", | ||
68 | "@babel/helpers": "^7.10.1", | ||
69 | "@babel/parser": "^7.10.3", | ||
70 | "@babel/template": "^7.10.3", | ||
71 | "@babel/traverse": "^7.10.3", | ||
72 | "@babel/types": "^7.10.3", | ||
73 | "convert-source-map": "^1.7.0", | ||
74 | "debug": "^4.1.0", | ||
75 | "gensync": "^1.0.0-beta.1", | ||
76 | "json5": "^2.1.2", | ||
77 | "lodash": "^4.17.13", | ||
78 | "resolve": "^1.3.2", | ||
79 | "semver": "^5.4.1", | ||
80 | "source-map": "^0.5.0" | ||
81 | }, | ||
82 | "dependencies": { | ||
83 | "@babel/code-frame": { | ||
84 | "version": "7.10.3", | ||
85 | "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz", | ||
86 | "integrity": "sha512-fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==", | ||
87 | "dev": true, | ||