Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade Vue.js CLI to 4.x #969

Merged
merged 9 commits into from
Apr 30, 2020
Merged

Upgrade Vue.js CLI to 4.x #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6561bf4
Package updates
lfarrell Apr 28, 2020
962797a
Update for new output names
lfarrell Apr 28, 2020
9899190
Update permissions editor to vue-cli 4.3.x
lfarrell Apr 28, 2020
72b4e4f
Update vue-cdr-access packages
lfarrell Apr 28, 2020
657fc11
Router push needs a catch block, as navigating to same route throws a…
lfarrell Apr 28, 2020
e92e54b
* Update vue-cdr-access packages
lfarrell Apr 28, 2020
51f91db
Fix issue with js build not overwriting previous build
lfarrell Apr 29, 2020
8a7249c
Update vue-test-utils and fix tests. There were breaking changes in 1…
lfarrell Apr 29, 2020
ead0547
Remove unneeded import
lfarrell Apr 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 10 additions & 24 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,13 @@ endif

cat /dev/null > static/js/vue-permissions.js

ifeq ($(DEPLOY_TYPE), prod)
cat static/js/admin/vue-permissions-editor/dist/js/chunk-vendors*.js > static/js/vue-permissions.js
endif
cat static/js/admin/vue-permissions-editor/dist/js/chunk-vendors*js > static/js/vue-permissions.js


# Add new line so app*.js doesn't get commented out
echo >> static/js/vue-permissions.js

ifeq ($(DEPLOY_TYPE), prod)
cat static/js/admin/vue-permissions-editor/dist/js/app*.js >> static/js/vue-permissions.js
else
cat static/js/admin/vue-permissions-editor/dist/app.js >> static/js/vue-permissions.js
endif
cat static/js/admin/vue-permissions-editor/dist/js/app*js >> static/js/vue-permissions.js
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just checking, but is the case now that we don't need to change behaviors depending on the deploy type for the permissions editor js, but do still need to for the css?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct, the JS files should be the same now across deployment types. In the dev build the css still get bundled into the JS files.


cat static/js/lib/jquery.min.js > static/js/cdr-admin.js
echo "define('jquery-ui', ['jquery'], function ($$) {" >> static/js/cdr-admin.js
Expand Down Expand Up @@ -56,7 +51,7 @@ endif
> static/css/cdr_admin.css

ifeq ($(DEPLOY_TYPE), prod)
cat static/js/admin/vue-permissions-editor/dist/css/app*.css >> static/css/cdr_admin.css
cat static/js/admin/vue-permissions-editor/dist/css/app*css >> static/css/cdr_admin.css
endif

ifneq ($(VERSION), "")
Expand All @@ -67,7 +62,7 @@ ifneq ($(VERSION), "")
endif

build-access:
# Build vue application(s) files
# Build vue application(s) files
npm --prefix static/js/vue-cdr-access install

ifeq ($(DEPLOY_TYPE), prod)
Expand All @@ -76,7 +71,8 @@ else
npm --prefix static/js/vue-cdr-access run build-dev
endif

# Make sure file is empty
# Make sure files are empty
cat /dev/null > static/js/vue-access.js
cat /dev/null > static/css/sass/cdr-ui.scss

cat static/css/sass/cdr_homepage.scss \
Expand All @@ -88,24 +84,14 @@ endif
cat static/js/lib/jquery-ui-access.min.js >> static/js/cdr-access.js
echo "});" >> static/js/cdr-access.js

cat /dev/null > static/js/vue-access.js

ifeq ($(DEPLOY_TYPE), prod)
cat static/js/vue-cdr-access/dist/js/chunk-vendors*.js >> static/js/vue-access.js
endif
cat static/js/vue-cdr-access/dist/js/chunk-vendors*js >> static/js/vue-access.js

# Add new line so app*.js doesn't get commented out
echo >> static/js/vue-access.js

ifeq ($(DEPLOY_TYPE), prod)
cat static/js/vue-cdr-access/dist/js/app*.js >> static/js/vue-access.js
else
cat static/js/vue-cdr-access/dist/app.js >> static/js/vue-access.js
endif
cat static/js/vue-cdr-access/dist/js/app*js >> static/js/vue-access.js

cat \
static/js/public/src/*.js \
static/js/vue-access.js \
>> static/js/cdr-access.js

cat static/css/reset.css \
Expand All @@ -118,7 +104,7 @@ endif
> static/css/cdr_access.css

ifeq ($(DEPLOY_TYPE), prod)
cat static/js/vue-cdr-access/dist/css/app*.css >> static/css/cdr_access.css
cat static/js/vue-cdr-access/dist/css/app*css >> static/css/cdr_access.css
endif
SUSPEND = "n"

Expand Down
2 changes: 1 addition & 1 deletion static/js/admin/vue-permissions-editor/babel.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
presets: [
'@vue/app'
'@vue/cli-plugin-babel/preset'
]
}
29 changes: 1 addition & 28 deletions static/js/admin/vue-permissions-editor/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,3 @@
module.exports = {
moduleFileExtensions: [
'js',
'jsx',
'json',
'vue'
],
transform: {
'^.+\\.vue$': 'vue-jest',
'.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
'^.+\\.jsx?$': 'babel-jest'
},
transformIgnorePatterns: [
'/node_modules/'
],
moduleNameMapper: {
'^@/(.*)$': '<rootDir>/src/$1'
},
snapshotSerializers: [
'jest-serializer-vue'
],
testMatch: [
'**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)'
],
testURL: 'http://localhost/',
watchPlugins: [
'jest-watch-typeahead/filename',
'jest-watch-typeahead/testname'
]
preset: '@vue/cli-plugin-unit-jest'
}
Loading