BigW Consortium Gitlab

Commit d9352780 by Mike Greiling Committed by Phil Hughes

Fix issues with pdf-js dependencies

parent 4b3011e1
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
</template> </template>
<script> <script>
import pdfjsLib from 'pdfjs-dist'; import pdfjsLib from 'vendor/pdf';
import workerSrc from 'vendor/pdf.worker'; import workerSrc from 'vendor/pdf.worker.min';
import page from './page/index.vue'; import page from './page/index.vue';
......
...@@ -110,9 +110,12 @@ var config = { ...@@ -110,9 +110,12 @@ var config = {
options: { limit: 2048 }, options: { limit: 2048 },
}, },
{ {
test: /\.(worker\.js|pdf|bmpr)$/, test: /\.(worker(\.min)?\.js|pdf|bmpr)$/,
exclude: /node_modules/, exclude: /node_modules/,
loader: 'file-loader', loader: 'file-loader',
options: {
name: '[name].[hash].[ext]',
}
}, },
{ {
test: /locale\/\w+\/(.*)\.js$/, test: /locale\/\w+\/(.*)\.js$/,
......
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
"marked": "^0.3.6", "marked": "^0.3.6",
"mousetrap": "^1.4.6", "mousetrap": "^1.4.6",
"name-all-modules-plugin": "^1.0.1", "name-all-modules-plugin": "^1.0.1",
"pdfjs-dist": "^1.8.252",
"pikaday": "^1.5.1", "pikaday": "^1.5.1",
"prismjs": "^1.6.0", "prismjs": "^1.6.0",
"raphael": "^2.2.7", "raphael": "^2.2.7",
......
/* eslint-disable import/no-unresolved */ /* eslint-disable import/no-unresolved */
import Vue from 'vue'; import Vue from 'vue';
import { PDFJS } from 'pdfjs-dist'; import { PDFJS } from 'vendor/pdf';
import workerSrc from 'vendor/pdf.worker'; import workerSrc from 'vendor/pdf.worker.min';
import PDFLab from '~/pdf/index.vue'; import PDFLab from '~/pdf/index.vue';
import pdf from '../fixtures/blob/pdf/test.pdf'; import pdf from '../fixtures/blob/pdf/test.pdf';
......
/* eslint-disable import/no-unresolved */ /* eslint-disable import/no-unresolved */
import Vue from 'vue'; import Vue from 'vue';
import pdfjsLib from 'pdfjs-dist'; import pdfjsLib from 'vendor/pdf';
import workerSrc from 'vendor/pdf.worker'; import workerSrc from 'vendor/pdf.worker.min';
import PageComponent from '~/pdf/page/index.vue'; import PageComponent from '~/pdf/page/index.vue';
import testPDF from '../fixtures/blob/pdf/test.pdf'; import testPDF from '../fixtures/blob/pdf/test.pdf';
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -3771,10 +3771,6 @@ nested-error-stacks@^1.0.0: ...@@ -3771,10 +3771,6 @@ nested-error-stacks@^1.0.0:
dependencies: dependencies:
inherits "~2.0.1" inherits "~2.0.1"
node-ensure@^0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/node-ensure/-/node-ensure-0.0.0.tgz#ecae764150de99861ec5c810fd5d096b183932a7"
node-libs-browser@^1.0.0: node-libs-browser@^1.0.0:
version "1.1.1" version "1.1.1"
resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-1.1.1.tgz#2a38243abedd7dffcd07a97c9aca5668975a6fea" resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-1.1.1.tgz#2a38243abedd7dffcd07a97c9aca5668975a6fea"
...@@ -4185,13 +4181,6 @@ pbkdf2@^3.0.3: ...@@ -4185,13 +4181,6 @@ pbkdf2@^3.0.3:
dependencies: dependencies:
create-hmac "^1.1.2" create-hmac "^1.1.2"
pdfjs-dist@^1.8.252:
version "1.8.252"
resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-1.8.252.tgz#2477245695341f7fe096824dacf327bc324c0f52"
dependencies:
node-ensure "^0.0.0"
worker-loader "^0.8.0"
pify@^2.0.0: pify@^2.0.0:
version "2.3.0" version "2.3.0"
resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
...@@ -5928,12 +5917,6 @@ wordwrap@~0.0.2: ...@@ -5928,12 +5917,6 @@ wordwrap@~0.0.2:
version "0.0.3" version "0.0.3"
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
worker-loader@^0.8.0:
version "0.8.0"
resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-0.8.0.tgz#13582960dcd7d700dc829d3fd252a7561696167e"
dependencies:
loader-utils "^1.0.2"
wrap-ansi@^2.0.0: wrap-ansi@^2.0.0:
version "2.1.0" version "2.1.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment